From 4e8e3066f847cc0fa11539f4d9ab8a63f70ca475 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 20 Jan 2016 21:42:13 +0100 Subject: reverting: SHA-1: 1f90ceab075c4869298e963bf0a14a0aac2f1caa * tags are now strings (nw) fix start project for custom builds in Visual Studio (nw) --- src/devices/bus/a1bus/a1bus.cpp | 28 +- src/devices/bus/a1bus/a1bus.h | 24 +- src/devices/bus/a1bus/a1cassette.cpp | 4 +- src/devices/bus/a1bus/a1cassette.h | 4 +- src/devices/bus/a1bus/a1cffa.cpp | 4 +- src/devices/bus/a1bus/a1cffa.h | 4 +- src/devices/bus/a2bus/a2alfam2.cpp | 6 +- src/devices/bus/a2bus/a2alfam2.h | 6 +- src/devices/bus/a2bus/a2applicard.cpp | 4 +- src/devices/bus/a2bus/a2applicard.h | 4 +- src/devices/bus/a2bus/a2arcadebd.cpp | 4 +- src/devices/bus/a2bus/a2arcadebd.h | 4 +- src/devices/bus/a2bus/a2bus.cpp | 26 +- src/devices/bus/a2bus/a2bus.h | 22 +- src/devices/bus/a2bus/a2cffa.cpp | 6 +- src/devices/bus/a2bus/a2cffa.h | 6 +- src/devices/bus/a2bus/a2corvus.cpp | 4 +- src/devices/bus/a2bus/a2corvus.h | 4 +- src/devices/bus/a2bus/a2diskii.cpp | 6 +- src/devices/bus/a2bus/a2diskii.h | 6 +- src/devices/bus/a2bus/a2diskiing.cpp | 2 +- src/devices/bus/a2bus/a2diskiing.h | 2 +- src/devices/bus/a2bus/a2dx1.cpp | 4 +- src/devices/bus/a2bus/a2dx1.h | 4 +- src/devices/bus/a2bus/a2eauxslot.cpp | 26 +- src/devices/bus/a2bus/a2eauxslot.h | 22 +- src/devices/bus/a2bus/a2echoii.cpp | 4 +- src/devices/bus/a2bus/a2echoii.h | 4 +- src/devices/bus/a2bus/a2eext80col.cpp | 4 +- src/devices/bus/a2bus/a2eext80col.h | 4 +- src/devices/bus/a2bus/a2eramworks3.cpp | 4 +- src/devices/bus/a2bus/a2eramworks3.h | 4 +- src/devices/bus/a2bus/a2estd80col.cpp | 4 +- src/devices/bus/a2bus/a2estd80col.h | 4 +- src/devices/bus/a2bus/a2hsscsi.cpp | 4 +- src/devices/bus/a2bus/a2hsscsi.h | 4 +- src/devices/bus/a2bus/a2lang.cpp | 4 +- src/devices/bus/a2bus/a2lang.h | 4 +- src/devices/bus/a2bus/a2mcms.cpp | 10 +- src/devices/bus/a2bus/a2mcms.h | 10 +- src/devices/bus/a2bus/a2memexp.cpp | 6 +- src/devices/bus/a2bus/a2memexp.h | 6 +- src/devices/bus/a2bus/a2midi.cpp | 4 +- src/devices/bus/a2bus/a2midi.h | 4 +- src/devices/bus/a2bus/a2mockingboard.cpp | 8 +- src/devices/bus/a2bus/a2mockingboard.h | 8 +- src/devices/bus/a2bus/a2pic.cpp | 4 +- src/devices/bus/a2bus/a2pic.h | 4 +- src/devices/bus/a2bus/a2sam.cpp | 4 +- src/devices/bus/a2bus/a2sam.h | 4 +- src/devices/bus/a2bus/a2scsi.cpp | 4 +- src/devices/bus/a2bus/a2scsi.h | 4 +- src/devices/bus/a2bus/a2softcard.cpp | 4 +- src/devices/bus/a2bus/a2softcard.h | 4 +- src/devices/bus/a2bus/a2ssc.cpp | 4 +- src/devices/bus/a2bus/a2ssc.h | 4 +- src/devices/bus/a2bus/a2swyft.cpp | 4 +- src/devices/bus/a2bus/a2swyft.h | 4 +- src/devices/bus/a2bus/a2themill.cpp | 4 +- src/devices/bus/a2bus/a2themill.h | 4 +- src/devices/bus/a2bus/a2thunderclock.cpp | 4 +- src/devices/bus/a2bus/a2thunderclock.h | 4 +- src/devices/bus/a2bus/a2ultraterm.cpp | 6 +- src/devices/bus/a2bus/a2ultraterm.h | 6 +- src/devices/bus/a2bus/a2videoterm.cpp | 14 +- src/devices/bus/a2bus/a2videoterm.h | 14 +- src/devices/bus/a2bus/a2vulcan.cpp | 6 +- src/devices/bus/a2bus/a2vulcan.h | 6 +- src/devices/bus/a2bus/a2zipdrive.cpp | 4 +- src/devices/bus/a2bus/a2zipdrive.h | 4 +- src/devices/bus/a2bus/corvfdc01.cpp | 4 +- src/devices/bus/a2bus/corvfdc01.h | 4 +- src/devices/bus/a2bus/corvfdc02.cpp | 4 +- src/devices/bus/a2bus/corvfdc02.h | 4 +- src/devices/bus/a2bus/ezcgi.cpp | 12 +- src/devices/bus/a2bus/ezcgi.h | 12 +- src/devices/bus/a2bus/laser128.cpp | 4 +- src/devices/bus/a2bus/laser128.h | 4 +- src/devices/bus/a2bus/mouse.cpp | 4 +- src/devices/bus/a2bus/mouse.h | 4 +- src/devices/bus/a2bus/ramcard128k.cpp | 4 +- src/devices/bus/a2bus/ramcard128k.h | 4 +- src/devices/bus/a2bus/ramcard16k.cpp | 4 +- src/devices/bus/a2bus/ramcard16k.h | 4 +- src/devices/bus/a2bus/timemasterho.cpp | 4 +- src/devices/bus/a2bus/timemasterho.h | 4 +- src/devices/bus/a7800/a78_slot.cpp | 4 +- src/devices/bus/a7800/a78_slot.h | 4 +- src/devices/bus/a7800/cpuwiz.cpp | 8 +- src/devices/bus/a7800/cpuwiz.h | 8 +- src/devices/bus/a7800/hiscore.cpp | 2 +- src/devices/bus/a7800/hiscore.h | 2 +- src/devices/bus/a7800/rom.cpp | 34 +- src/devices/bus/a7800/rom.h | 34 +- src/devices/bus/a7800/xboard.cpp | 6 +- src/devices/bus/a7800/xboard.h | 6 +- src/devices/bus/a800/a800_slot.cpp | 10 +- src/devices/bus/a800/a800_slot.h | 10 +- src/devices/bus/a800/a8sio.cpp | 17 +- src/devices/bus/a800/a8sio.h | 20 +- src/devices/bus/a800/cassette.cpp | 4 +- src/devices/bus/a800/cassette.h | 4 +- src/devices/bus/a800/oss.cpp | 8 +- src/devices/bus/a800/oss.h | 8 +- src/devices/bus/a800/rom.cpp | 22 +- src/devices/bus/a800/rom.h | 24 +- src/devices/bus/a800/sparta.cpp | 2 +- src/devices/bus/a800/sparta.h | 2 +- src/devices/bus/abcbus/abc890.cpp | 14 +- src/devices/bus/abcbus/abc890.h | 14 +- src/devices/bus/abcbus/abcbus.cpp | 2 +- src/devices/bus/abcbus/abcbus.h | 2 +- src/devices/bus/abcbus/fd2.cpp | 2 +- src/devices/bus/abcbus/fd2.h | 2 +- src/devices/bus/abcbus/hdc.cpp | 2 +- src/devices/bus/abcbus/hdc.h | 2 +- src/devices/bus/abcbus/lux10828.cpp | 2 +- src/devices/bus/abcbus/lux10828.h | 2 +- src/devices/bus/abcbus/lux21046.cpp | 14 +- src/devices/bus/abcbus/lux21046.h | 14 +- src/devices/bus/abcbus/lux21056.cpp | 2 +- src/devices/bus/abcbus/lux21056.h | 2 +- src/devices/bus/abcbus/lux4105.cpp | 2 +- src/devices/bus/abcbus/lux4105.h | 2 +- src/devices/bus/abcbus/memcard.cpp | 2 +- src/devices/bus/abcbus/memcard.h | 2 +- src/devices/bus/abcbus/ram.cpp | 2 +- src/devices/bus/abcbus/ram.h | 2 +- src/devices/bus/abcbus/sio.cpp | 2 +- src/devices/bus/abcbus/sio.h | 2 +- src/devices/bus/abcbus/slutprov.cpp | 2 +- src/devices/bus/abcbus/slutprov.h | 2 +- src/devices/bus/abcbus/turbo.cpp | 2 +- src/devices/bus/abcbus/turbo.h | 2 +- src/devices/bus/abcbus/uni800.cpp | 2 +- src/devices/bus/abcbus/uni800.h | 2 +- src/devices/bus/abckb/abc77.cpp | 6 +- src/devices/bus/abckb/abc77.h | 6 +- src/devices/bus/abckb/abc800kb.cpp | 2 +- src/devices/bus/abckb/abc800kb.h | 2 +- src/devices/bus/abckb/abc99.cpp | 2 +- src/devices/bus/abckb/abc99.h | 2 +- src/devices/bus/abckb/abckb.cpp | 2 +- src/devices/bus/abckb/abckb.h | 2 +- src/devices/bus/adam/adamlink.cpp | 2 +- src/devices/bus/adam/adamlink.h | 2 +- src/devices/bus/adam/exp.cpp | 2 +- src/devices/bus/adam/exp.h | 2 +- src/devices/bus/adam/ide.cpp | 2 +- src/devices/bus/adam/ide.h | 2 +- src/devices/bus/adam/ram.cpp | 2 +- src/devices/bus/adam/ram.h | 2 +- src/devices/bus/adamnet/adamnet.cpp | 6 +- src/devices/bus/adamnet/adamnet.h | 4 +- src/devices/bus/adamnet/ddp.cpp | 2 +- src/devices/bus/adamnet/ddp.h | 2 +- src/devices/bus/adamnet/fdc.cpp | 2 +- src/devices/bus/adamnet/fdc.h | 2 +- src/devices/bus/adamnet/kb.cpp | 2 +- src/devices/bus/adamnet/kb.h | 2 +- src/devices/bus/adamnet/printer.cpp | 2 +- src/devices/bus/adamnet/printer.h | 2 +- src/devices/bus/adamnet/spi.cpp | 2 +- src/devices/bus/adamnet/spi.h | 2 +- src/devices/bus/amiga/zorro/a2052.cpp | 2 +- src/devices/bus/amiga/zorro/a2052.h | 2 +- src/devices/bus/amiga/zorro/a2232.cpp | 2 +- src/devices/bus/amiga/zorro/a2232.h | 2 +- src/devices/bus/amiga/zorro/a590.cpp | 6 +- src/devices/bus/amiga/zorro/a590.h | 6 +- src/devices/bus/amiga/zorro/action_replay.cpp | 8 +- src/devices/bus/amiga/zorro/action_replay.h | 8 +- src/devices/bus/amiga/zorro/buddha.cpp | 2 +- src/devices/bus/amiga/zorro/buddha.h | 2 +- src/devices/bus/amiga/zorro/zorro.cpp | 25 +- src/devices/bus/amiga/zorro/zorro.h | 22 +- src/devices/bus/apf/rom.cpp | 8 +- src/devices/bus/apf/rom.h | 8 +- src/devices/bus/apf/slot.cpp | 4 +- src/devices/bus/apf/slot.h | 4 +- src/devices/bus/apricot/expansion.cpp | 12 +- src/devices/bus/apricot/expansion.h | 14 +- src/devices/bus/apricot/ram.cpp | 6 +- src/devices/bus/apricot/ram.h | 6 +- src/devices/bus/arcadia/rom.cpp | 6 +- src/devices/bus/arcadia/rom.h | 6 +- src/devices/bus/arcadia/slot.cpp | 4 +- src/devices/bus/arcadia/slot.h | 4 +- src/devices/bus/astrocde/exp.cpp | 2 +- src/devices/bus/astrocde/exp.h | 2 +- src/devices/bus/astrocde/ram.cpp | 14 +- src/devices/bus/astrocde/ram.h | 14 +- src/devices/bus/astrocde/rom.cpp | 8 +- src/devices/bus/astrocde/rom.h | 8 +- src/devices/bus/astrocde/slot.cpp | 4 +- src/devices/bus/astrocde/slot.h | 4 +- src/devices/bus/bml3/bml3bus.cpp | 26 +- src/devices/bus/bml3/bml3bus.h | 22 +- src/devices/bus/bml3/bml3kanji.cpp | 2 +- src/devices/bus/bml3/bml3kanji.h | 2 +- src/devices/bus/bml3/bml3mp1802.cpp | 2 +- src/devices/bus/bml3/bml3mp1802.h | 2 +- src/devices/bus/bml3/bml3mp1805.cpp | 2 +- src/devices/bus/bml3/bml3mp1805.h | 2 +- src/devices/bus/bw2/exp.cpp | 2 +- src/devices/bus/bw2/exp.h | 2 +- src/devices/bus/bw2/ramcard.cpp | 2 +- src/devices/bus/bw2/ramcard.h | 2 +- src/devices/bus/c64/16kb.cpp | 2 +- src/devices/bus/c64/16kb.h | 2 +- src/devices/bus/c64/4dxh.cpp | 2 +- src/devices/bus/c64/4dxh.h | 2 +- src/devices/bus/c64/4ksa.cpp | 2 +- src/devices/bus/c64/4ksa.h | 2 +- src/devices/bus/c64/4tba.cpp | 2 +- src/devices/bus/c64/4tba.h | 2 +- src/devices/bus/c64/bn1541.cpp | 4 +- src/devices/bus/c64/bn1541.h | 2 +- src/devices/bus/c64/c128_comal80.cpp | 2 +- src/devices/bus/c64/c128_comal80.h | 2 +- src/devices/bus/c64/c128_partner.cpp | 2 +- src/devices/bus/c64/c128_partner.h | 2 +- src/devices/bus/c64/comal80.cpp | 2 +- src/devices/bus/c64/comal80.h | 2 +- src/devices/bus/c64/cpm.cpp | 2 +- src/devices/bus/c64/cpm.h | 2 +- src/devices/bus/c64/currah_speech.cpp | 2 +- src/devices/bus/c64/currah_speech.h | 2 +- src/devices/bus/c64/dela_ep256.cpp | 2 +- src/devices/bus/c64/dela_ep256.h | 2 +- src/devices/bus/c64/dela_ep64.cpp | 2 +- src/devices/bus/c64/dela_ep64.h | 2 +- src/devices/bus/c64/dela_ep7x8.cpp | 2 +- src/devices/bus/c64/dela_ep7x8.h | 2 +- src/devices/bus/c64/dinamic.cpp | 2 +- src/devices/bus/c64/dinamic.h | 2 +- src/devices/bus/c64/dqbb.cpp | 2 +- src/devices/bus/c64/dqbb.h | 2 +- src/devices/bus/c64/easy_calc_result.cpp | 2 +- src/devices/bus/c64/easy_calc_result.h | 2 +- src/devices/bus/c64/easyflash.cpp | 2 +- src/devices/bus/c64/easyflash.h | 2 +- src/devices/bus/c64/epyx_fast_load.cpp | 2 +- src/devices/bus/c64/epyx_fast_load.h | 2 +- src/devices/bus/c64/exos.cpp | 2 +- src/devices/bus/c64/exos.h | 2 +- src/devices/bus/c64/exp.cpp | 2 +- src/devices/bus/c64/exp.h | 2 +- src/devices/bus/c64/fcc.cpp | 2 +- src/devices/bus/c64/fcc.h | 2 +- src/devices/bus/c64/final.cpp | 2 +- src/devices/bus/c64/final.h | 2 +- src/devices/bus/c64/final3.cpp | 2 +- src/devices/bus/c64/final3.h | 2 +- src/devices/bus/c64/fun_play.cpp | 2 +- src/devices/bus/c64/fun_play.h | 2 +- src/devices/bus/c64/geocable.cpp | 2 +- src/devices/bus/c64/geocable.h | 2 +- src/devices/bus/c64/georam.cpp | 2 +- src/devices/bus/c64/georam.h | 2 +- src/devices/bus/c64/ide64.cpp | 2 +- src/devices/bus/c64/ide64.h | 2 +- src/devices/bus/c64/ieee488.cpp | 2 +- src/devices/bus/c64/ieee488.h | 2 +- src/devices/bus/c64/kingsoft.cpp | 2 +- src/devices/bus/c64/kingsoft.h | 2 +- src/devices/bus/c64/mach5.cpp | 2 +- src/devices/bus/c64/mach5.h | 2 +- src/devices/bus/c64/magic_desk.cpp | 2 +- src/devices/bus/c64/magic_desk.h | 2 +- src/devices/bus/c64/magic_formel.cpp | 2 +- src/devices/bus/c64/magic_formel.h | 2 +- src/devices/bus/c64/magic_voice.cpp | 2 +- src/devices/bus/c64/magic_voice.h | 2 +- src/devices/bus/c64/midi_maplin.cpp | 2 +- src/devices/bus/c64/midi_maplin.h | 2 +- src/devices/bus/c64/midi_namesoft.cpp | 2 +- src/devices/bus/c64/midi_namesoft.h | 2 +- src/devices/bus/c64/midi_passport.cpp | 2 +- src/devices/bus/c64/midi_passport.h | 2 +- src/devices/bus/c64/midi_sci.cpp | 2 +- src/devices/bus/c64/midi_sci.h | 2 +- src/devices/bus/c64/midi_siel.cpp | 2 +- src/devices/bus/c64/midi_siel.h | 2 +- src/devices/bus/c64/mikro_assembler.cpp | 2 +- src/devices/bus/c64/mikro_assembler.h | 2 +- src/devices/bus/c64/multiscreen.cpp | 2 +- src/devices/bus/c64/multiscreen.h | 2 +- src/devices/bus/c64/music64.cpp | 2 +- src/devices/bus/c64/music64.h | 2 +- src/devices/bus/c64/neoram.cpp | 2 +- src/devices/bus/c64/neoram.h | 2 +- src/devices/bus/c64/ocean.cpp | 2 +- src/devices/bus/c64/ocean.h | 2 +- src/devices/bus/c64/pagefox.cpp | 2 +- src/devices/bus/c64/pagefox.h | 2 +- src/devices/bus/c64/partner.cpp | 2 +- src/devices/bus/c64/partner.h | 2 +- src/devices/bus/c64/prophet64.cpp | 2 +- src/devices/bus/c64/prophet64.h | 2 +- src/devices/bus/c64/ps64.cpp | 2 +- src/devices/bus/c64/ps64.h | 2 +- src/devices/bus/c64/reu.cpp | 8 +- src/devices/bus/c64/reu.h | 8 +- src/devices/bus/c64/rex.cpp | 2 +- src/devices/bus/c64/rex.h | 2 +- src/devices/bus/c64/rex_ep256.cpp | 2 +- src/devices/bus/c64/rex_ep256.h | 2 +- src/devices/bus/c64/ross.cpp | 2 +- src/devices/bus/c64/ross.h | 2 +- src/devices/bus/c64/sfx_sound_expander.cpp | 2 +- src/devices/bus/c64/sfx_sound_expander.h | 2 +- src/devices/bus/c64/silverrock.cpp | 2 +- src/devices/bus/c64/silverrock.h | 2 +- src/devices/bus/c64/simons_basic.cpp | 2 +- src/devices/bus/c64/simons_basic.h | 2 +- src/devices/bus/c64/stardos.cpp | 2 +- src/devices/bus/c64/stardos.h | 2 +- src/devices/bus/c64/std.cpp | 2 +- src/devices/bus/c64/std.h | 2 +- src/devices/bus/c64/structured_basic.cpp | 2 +- src/devices/bus/c64/structured_basic.h | 2 +- src/devices/bus/c64/super_explode.cpp | 2 +- src/devices/bus/c64/super_explode.h | 2 +- src/devices/bus/c64/super_games.cpp | 2 +- src/devices/bus/c64/super_games.h | 2 +- src/devices/bus/c64/supercpu.cpp | 2 +- src/devices/bus/c64/supercpu.h | 2 +- src/devices/bus/c64/sw8k.cpp | 2 +- src/devices/bus/c64/sw8k.h | 2 +- src/devices/bus/c64/swiftlink.cpp | 2 +- src/devices/bus/c64/swiftlink.h | 2 +- src/devices/bus/c64/system3.cpp | 2 +- src/devices/bus/c64/system3.h | 2 +- src/devices/bus/c64/tdos.cpp | 2 +- src/devices/bus/c64/tdos.h | 2 +- src/devices/bus/c64/turbo232.cpp | 2 +- src/devices/bus/c64/turbo232.h | 2 +- src/devices/bus/c64/vizastar.cpp | 2 +- src/devices/bus/c64/vizastar.h | 2 +- src/devices/bus/c64/vw64.cpp | 2 +- src/devices/bus/c64/vw64.h | 2 +- src/devices/bus/c64/warp_speed.cpp | 2 +- src/devices/bus/c64/warp_speed.h | 2 +- src/devices/bus/c64/westermann.cpp | 2 +- src/devices/bus/c64/westermann.h | 2 +- src/devices/bus/c64/xl80.cpp | 2 +- src/devices/bus/c64/xl80.h | 2 +- src/devices/bus/c64/zaxxon.cpp | 2 +- src/devices/bus/c64/zaxxon.h | 2 +- src/devices/bus/cbm2/24k.cpp | 2 +- src/devices/bus/cbm2/24k.h | 2 +- src/devices/bus/cbm2/exp.cpp | 2 +- src/devices/bus/cbm2/exp.h | 2 +- src/devices/bus/cbm2/hrg.cpp | 6 +- src/devices/bus/cbm2/hrg.h | 6 +- src/devices/bus/cbm2/std.cpp | 2 +- src/devices/bus/cbm2/std.h | 2 +- src/devices/bus/cbm2/user.cpp | 2 +- src/devices/bus/cbm2/user.h | 2 +- src/devices/bus/cbmiec/c1526.cpp | 6 +- src/devices/bus/cbmiec/c1526.h | 6 +- src/devices/bus/cbmiec/c1541.cpp | 26 +- src/devices/bus/cbmiec/c1541.h | 26 +- src/devices/bus/cbmiec/c1571.cpp | 10 +- src/devices/bus/cbmiec/c1571.h | 10 +- src/devices/bus/cbmiec/c1581.cpp | 6 +- src/devices/bus/cbmiec/c1581.h | 6 +- src/devices/bus/cbmiec/c64_nl10.cpp | 2 +- src/devices/bus/cbmiec/c64_nl10.h | 2 +- src/devices/bus/cbmiec/cbmiec.cpp | 10 +- src/devices/bus/cbmiec/cbmiec.h | 4 +- src/devices/bus/cbmiec/cmdhd.cpp | 2 +- src/devices/bus/cbmiec/cmdhd.h | 2 +- src/devices/bus/cbmiec/diag264_lb_iec.cpp | 2 +- src/devices/bus/cbmiec/diag264_lb_iec.h | 2 +- src/devices/bus/cbmiec/fd2000.cpp | 6 +- src/devices/bus/cbmiec/fd2000.h | 6 +- src/devices/bus/cbmiec/interpod.cpp | 2 +- src/devices/bus/cbmiec/interpod.h | 2 +- src/devices/bus/cbmiec/serialbox.cpp | 2 +- src/devices/bus/cbmiec/serialbox.h | 2 +- src/devices/bus/cbmiec/vic1515.cpp | 2 +- src/devices/bus/cbmiec/vic1515.h | 2 +- src/devices/bus/cbmiec/vic1520.cpp | 2 +- src/devices/bus/cbmiec/vic1520.h | 2 +- src/devices/bus/centronics/comxpl80.cpp | 2 +- src/devices/bus/centronics/comxpl80.h | 2 +- src/devices/bus/centronics/covox.cpp | 4 +- src/devices/bus/centronics/covox.h | 4 +- src/devices/bus/centronics/ctronics.cpp | 2 +- src/devices/bus/centronics/ctronics.h | 2 +- src/devices/bus/centronics/digiblst.cpp | 2 +- src/devices/bus/centronics/digiblst.h | 2 +- src/devices/bus/centronics/dsjoy.cpp | 2 +- src/devices/bus/centronics/dsjoy.h | 2 +- src/devices/bus/centronics/epson_ex800.cpp | 2 +- src/devices/bus/centronics/epson_ex800.h | 2 +- src/devices/bus/centronics/epson_lx800.cpp | 4 +- src/devices/bus/centronics/epson_lx800.h | 4 +- src/devices/bus/centronics/epson_lx810l.cpp | 6 +- src/devices/bus/centronics/epson_lx810l.h | 6 +- src/devices/bus/centronics/nec_p72.cpp | 4 +- src/devices/bus/centronics/nec_p72.h | 4 +- src/devices/bus/centronics/printer.cpp | 2 +- src/devices/bus/centronics/printer.h | 2 +- src/devices/bus/cgenie/expansion/expansion.cpp | 2 +- src/devices/bus/cgenie/expansion/expansion.h | 2 +- src/devices/bus/cgenie/expansion/floppy.cpp | 2 +- src/devices/bus/cgenie/expansion/floppy.h | 2 +- src/devices/bus/cgenie/parallel/joystick.cpp | 6 +- src/devices/bus/cgenie/parallel/joystick.h | 2 +- src/devices/bus/cgenie/parallel/parallel.cpp | 2 +- src/devices/bus/cgenie/parallel/parallel.h | 2 +- src/devices/bus/cgenie/parallel/printer.cpp | 6 +- src/devices/bus/cgenie/parallel/printer.h | 2 +- src/devices/bus/chanf/rom.cpp | 14 +- src/devices/bus/chanf/rom.h | 14 +- src/devices/bus/chanf/slot.cpp | 4 +- src/devices/bus/chanf/slot.h | 4 +- src/devices/bus/coco/coco_232.cpp | 2 +- src/devices/bus/coco/coco_232.h | 2 +- src/devices/bus/coco/coco_dwsock.cpp | 2 +- src/devices/bus/coco/coco_dwsock.h | 2 +- src/devices/bus/coco/coco_fdc.cpp | 16 +- src/devices/bus/coco/coco_fdc.h | 16 +- src/devices/bus/coco/coco_multi.cpp | 2 +- src/devices/bus/coco/coco_multi.h | 2 +- src/devices/bus/coco/coco_orch90.cpp | 2 +- src/devices/bus/coco/coco_orch90.h | 2 +- src/devices/bus/coco/coco_pak.cpp | 6 +- src/devices/bus/coco/coco_pak.h | 6 +- src/devices/bus/coco/cococart.cpp | 2 +- src/devices/bus/coco/cococart.h | 2 +- src/devices/bus/coleco/ctrl.cpp | 2 +- src/devices/bus/coleco/ctrl.h | 2 +- src/devices/bus/coleco/exp.cpp | 2 +- src/devices/bus/coleco/exp.h | 2 +- src/devices/bus/coleco/hand.cpp | 2 +- src/devices/bus/coleco/hand.h | 2 +- src/devices/bus/coleco/sac.cpp | 2 +- src/devices/bus/coleco/sac.h | 2 +- src/devices/bus/coleco/std.cpp | 2 +- src/devices/bus/coleco/std.h | 2 +- src/devices/bus/coleco/xin1.cpp | 2 +- src/devices/bus/coleco/xin1.h | 2 +- src/devices/bus/compucolor/floppy.cpp | 4 +- src/devices/bus/compucolor/floppy.h | 4 +- src/devices/bus/comx35/clm.cpp | 2 +- src/devices/bus/comx35/clm.h | 2 +- src/devices/bus/comx35/eprom.cpp | 2 +- src/devices/bus/comx35/eprom.h | 2 +- src/devices/bus/comx35/exp.cpp | 2 +- src/devices/bus/comx35/exp.h | 2 +- src/devices/bus/comx35/expbox.cpp | 2 +- src/devices/bus/comx35/expbox.h | 2 +- src/devices/bus/comx35/fdc.cpp | 2 +- src/devices/bus/comx35/fdc.h | 2 +- src/devices/bus/comx35/joycard.cpp | 2 +- src/devices/bus/comx35/joycard.h | 2 +- src/devices/bus/comx35/printer.cpp | 2 +- src/devices/bus/comx35/printer.h | 2 +- src/devices/bus/comx35/ram.cpp | 2 +- src/devices/bus/comx35/ram.h | 2 +- src/devices/bus/comx35/thermal.cpp | 2 +- src/devices/bus/comx35/thermal.h | 2 +- src/devices/bus/cpc/amdrum.cpp | 2 +- src/devices/bus/cpc/amdrum.h | 2 +- src/devices/bus/cpc/brunword4.cpp | 2 +- src/devices/bus/cpc/brunword4.h | 2 +- src/devices/bus/cpc/cpc_pds.cpp | 2 +- src/devices/bus/cpc/cpc_pds.h | 2 +- src/devices/bus/cpc/cpc_rom.cpp | 4 +- src/devices/bus/cpc/cpc_rom.h | 4 +- src/devices/bus/cpc/cpc_rs232.cpp | 6 +- src/devices/bus/cpc/cpc_rs232.h | 6 +- src/devices/bus/cpc/cpc_ssa1.cpp | 4 +- src/devices/bus/cpc/cpc_ssa1.h | 4 +- src/devices/bus/cpc/cpcexp.cpp | 2 +- src/devices/bus/cpc/cpcexp.h | 2 +- src/devices/bus/cpc/ddi1.cpp | 2 +- src/devices/bus/cpc/ddi1.h | 2 +- src/devices/bus/cpc/doubler.cpp | 2 +- src/devices/bus/cpc/doubler.h | 2 +- src/devices/bus/cpc/hd20.cpp | 2 +- src/devices/bus/cpc/hd20.h | 2 +- src/devices/bus/cpc/magicsound.cpp | 2 +- src/devices/bus/cpc/magicsound.h | 2 +- src/devices/bus/cpc/mface2.cpp | 2 +- src/devices/bus/cpc/mface2.h | 2 +- src/devices/bus/cpc/playcity.cpp | 2 +- src/devices/bus/cpc/playcity.h | 2 +- src/devices/bus/cpc/smartwatch.cpp | 2 +- src/devices/bus/cpc/smartwatch.h | 2 +- src/devices/bus/cpc/symbfac2.cpp | 2 +- src/devices/bus/cpc/symbfac2.h | 2 +- src/devices/bus/cpc/transtape.cpp | 2 +- src/devices/bus/cpc/transtape.h | 2 +- src/devices/bus/crvision/rom.cpp | 16 +- src/devices/bus/crvision/rom.h | 16 +- src/devices/bus/crvision/slot.cpp | 4 +- src/devices/bus/crvision/slot.h | 4 +- src/devices/bus/dmv/dmvbus.cpp | 2 +- src/devices/bus/dmv/dmvbus.h | 2 +- src/devices/bus/dmv/k210.cpp | 2 +- src/devices/bus/dmv/k210.h | 2 +- src/devices/bus/dmv/k220.cpp | 2 +- src/devices/bus/dmv/k220.h | 2 +- src/devices/bus/dmv/k230.cpp | 10 +- src/devices/bus/dmv/k230.h | 10 +- src/devices/bus/dmv/k233.cpp | 2 +- src/devices/bus/dmv/k233.h | 2 +- src/devices/bus/dmv/k801.cpp | 12 +- src/devices/bus/dmv/k801.h | 12 +- src/devices/bus/dmv/k803.cpp | 2 +- src/devices/bus/dmv/k803.h | 2 +- src/devices/bus/dmv/k806.cpp | 2 +- src/devices/bus/dmv/k806.h | 2 +- src/devices/bus/dmv/ram.cpp | 8 +- src/devices/bus/dmv/ram.h | 8 +- src/devices/bus/ecbbus/ecbbus.cpp | 8 +- src/devices/bus/ecbbus/ecbbus.h | 8 +- src/devices/bus/ecbbus/grip.cpp | 2 +- src/devices/bus/ecbbus/grip.h | 2 +- src/devices/bus/econet/e01.cpp | 6 +- src/devices/bus/econet/e01.h | 6 +- src/devices/bus/econet/econet.cpp | 10 +- src/devices/bus/econet/econet.h | 4 +- src/devices/bus/ep64/exdos.cpp | 2 +- src/devices/bus/ep64/exdos.h | 2 +- src/devices/bus/ep64/exp.cpp | 2 +- src/devices/bus/ep64/exp.h | 4 +- src/devices/bus/epson_sio/epson_sio.cpp | 2 +- src/devices/bus/epson_sio/epson_sio.h | 2 +- src/devices/bus/epson_sio/pf10.cpp | 16 +- src/devices/bus/epson_sio/pf10.h | 2 +- src/devices/bus/epson_sio/tf20.cpp | 4 +- src/devices/bus/epson_sio/tf20.h | 2 +- src/devices/bus/gameboy/gb_slot.cpp | 8 +- src/devices/bus/gameboy/gb_slot.h | 8 +- src/devices/bus/gameboy/mbc.cpp | 42 +- src/devices/bus/gameboy/mbc.h | 42 +- src/devices/bus/gameboy/rom.cpp | 18 +- src/devices/bus/gameboy/rom.h | 18 +- src/devices/bus/gamegear/ggext.cpp | 2 +- src/devices/bus/gamegear/ggext.h | 2 +- src/devices/bus/gamegear/smsctrladp.cpp | 2 +- src/devices/bus/gamegear/smsctrladp.h | 2 +- src/devices/bus/gba/gba_slot.cpp | 4 +- src/devices/bus/gba/gba_slot.h | 4 +- src/devices/bus/gba/rom.cpp | 14 +- src/devices/bus/gba/rom.h | 14 +- src/devices/bus/generic/ram.cpp | 16 +- src/devices/bus/generic/ram.h | 16 +- src/devices/bus/generic/rom.cpp | 10 +- src/devices/bus/generic/rom.h | 10 +- src/devices/bus/generic/slot.cpp | 4 +- src/devices/bus/generic/slot.h | 4 +- src/devices/bus/ieee488/c2031.cpp | 2 +- src/devices/bus/ieee488/c2031.h | 2 +- src/devices/bus/ieee488/c2040.cpp | 8 +- src/devices/bus/ieee488/c2040.h | 8 +- src/devices/bus/ieee488/c2040fdc.cpp | 2 +- src/devices/bus/ieee488/c2040fdc.h | 2 +- src/devices/bus/ieee488/c8050.cpp | 10 +- src/devices/bus/ieee488/c8050.h | 10 +- src/devices/bus/ieee488/c8050fdc.cpp | 2 +- src/devices/bus/ieee488/c8050fdc.h | 2 +- src/devices/bus/ieee488/c8280.cpp | 2 +- src/devices/bus/ieee488/c8280.h | 2 +- src/devices/bus/ieee488/d9060.cpp | 6 +- src/devices/bus/ieee488/d9060.h | 6 +- src/devices/bus/ieee488/hardbox.cpp | 2 +- src/devices/bus/ieee488/hardbox.h | 2 +- src/devices/bus/ieee488/ieee488.cpp | 16 +- src/devices/bus/ieee488/ieee488.h | 4 +- src/devices/bus/ieee488/shark.cpp | 2 +- src/devices/bus/ieee488/shark.h | 2 +- src/devices/bus/ieee488/softbox.cpp | 2 +- src/devices/bus/ieee488/softbox.h | 2 +- src/devices/bus/imi7000/imi5000h.cpp | 2 +- src/devices/bus/imi7000/imi5000h.h | 2 +- src/devices/bus/imi7000/imi7000.cpp | 4 +- src/devices/bus/imi7000/imi7000.h | 4 +- src/devices/bus/intv/ecs.cpp | 2 +- src/devices/bus/intv/ecs.h | 2 +- src/devices/bus/intv/rom.cpp | 10 +- src/devices/bus/intv/rom.h | 10 +- src/devices/bus/intv/slot.cpp | 4 +- src/devices/bus/intv/slot.h | 4 +- src/devices/bus/intv/voice.cpp | 2 +- src/devices/bus/intv/voice.h | 2 +- src/devices/bus/iq151/disc2.cpp | 2 +- src/devices/bus/iq151/disc2.h | 2 +- src/devices/bus/iq151/grafik.cpp | 2 +- src/devices/bus/iq151/grafik.h | 2 +- src/devices/bus/iq151/iq151.cpp | 2 +- src/devices/bus/iq151/iq151.h | 2 +- src/devices/bus/iq151/minigraf.cpp | 2 +- src/devices/bus/iq151/minigraf.h | 2 +- src/devices/bus/iq151/ms151a.cpp | 2 +- src/devices/bus/iq151/ms151a.h | 2 +- src/devices/bus/iq151/rom.cpp | 12 +- src/devices/bus/iq151/rom.h | 12 +- src/devices/bus/iq151/staper.cpp | 2 +- src/devices/bus/iq151/staper.h | 2 +- src/devices/bus/iq151/video32.cpp | 2 +- src/devices/bus/iq151/video32.h | 2 +- src/devices/bus/iq151/video64.cpp | 2 +- src/devices/bus/iq151/video64.h | 2 +- src/devices/bus/isa/3c503.cpp | 2 +- src/devices/bus/isa/3c503.h | 2 +- src/devices/bus/isa/3c505.cpp | 8 +- src/devices/bus/isa/3c505.h | 4 +- src/devices/bus/isa/adlib.cpp | 2 +- src/devices/bus/isa/adlib.h | 2 +- src/devices/bus/isa/aga.cpp | 6 +- src/devices/bus/isa/aga.h | 6 +- src/devices/bus/isa/aha1542.cpp | 2 +- src/devices/bus/isa/aha1542.h | 2 +- src/devices/bus/isa/cga.cpp | 24 +- src/devices/bus/isa/cga.h | 24 +- src/devices/bus/isa/com.cpp | 6 +- src/devices/bus/isa/com.h | 6 +- src/devices/bus/isa/dectalk.cpp | 2 +- src/devices/bus/isa/dectalk.h | 2 +- src/devices/bus/isa/ega.cpp | 4 +- src/devices/bus/isa/ega.h | 4 +- src/devices/bus/isa/fdc.cpp | 12 +- src/devices/bus/isa/fdc.h | 12 +- src/devices/bus/isa/finalchs.cpp | 2 +- src/devices/bus/isa/finalchs.h | 2 +- src/devices/bus/isa/gblaster.cpp | 2 +- src/devices/bus/isa/gblaster.h | 2 +- src/devices/bus/isa/gus.cpp | 4 +- src/devices/bus/isa/gus.h | 4 +- src/devices/bus/isa/hdc.cpp | 14 +- src/devices/bus/isa/hdc.h | 14 +- src/devices/bus/isa/ibm_mfc.cpp | 2 +- src/devices/bus/isa/ibm_mfc.h | 2 +- src/devices/bus/isa/ide.cpp | 2 +- src/devices/bus/isa/ide.h | 2 +- src/devices/bus/isa/isa.cpp | 27 +- src/devices/bus/isa/isa.h | 20 +- src/devices/bus/isa/lpt.cpp | 2 +- src/devices/bus/isa/lpt.h | 2 +- src/devices/bus/isa/mach32.cpp | 16 +- src/devices/bus/isa/mach32.h | 16 +- src/devices/bus/isa/mc1502_fdc.cpp | 2 +- src/devices/bus/isa/mc1502_fdc.h | 2 +- src/devices/bus/isa/mc1502_rom.cpp | 2 +- src/devices/bus/isa/mc1502_rom.h | 2 +- src/devices/bus/isa/mda.cpp | 8 +- src/devices/bus/isa/mda.h | 8 +- src/devices/bus/isa/mpu401.cpp | 2 +- src/devices/bus/isa/mpu401.h | 2 +- src/devices/bus/isa/mufdc.cpp | 6 +- src/devices/bus/isa/mufdc.h | 6 +- src/devices/bus/isa/ne1000.cpp | 2 +- src/devices/bus/isa/ne1000.h | 2 +- src/devices/bus/isa/ne2000.cpp | 2 +- src/devices/bus/isa/ne2000.h | 2 +- src/devices/bus/isa/num9rev.cpp | 2 +- src/devices/bus/isa/num9rev.h | 2 +- src/devices/bus/isa/omti8621.cpp | 18 +- src/devices/bus/isa/omti8621.h | 6 +- src/devices/bus/isa/p1_fdc.cpp | 2 +- src/devices/bus/isa/p1_fdc.h | 2 +- src/devices/bus/isa/p1_hdc.cpp | 2 +- src/devices/bus/isa/p1_hdc.h | 2 +- src/devices/bus/isa/p1_rom.cpp | 2 +- src/devices/bus/isa/p1_rom.h | 2 +- src/devices/bus/isa/pc1640_iga.cpp | 2 +- src/devices/bus/isa/pc1640_iga.h | 2 +- src/devices/bus/isa/pds.cpp | 2 +- src/devices/bus/isa/pds.h | 2 +- src/devices/bus/isa/pgc.cpp | 4 +- src/devices/bus/isa/pgc.h | 4 +- src/devices/bus/isa/s3virge.cpp | 10 +- src/devices/bus/isa/s3virge.h | 10 +- src/devices/bus/isa/sb16.cpp | 2 +- src/devices/bus/isa/sb16.h | 2 +- src/devices/bus/isa/sblaster.cpp | 12 +- src/devices/bus/isa/sblaster.h | 12 +- src/devices/bus/isa/sc499.cpp | 6 +- src/devices/bus/isa/sc499.h | 4 +- src/devices/bus/isa/side116.cpp | 2 +- src/devices/bus/isa/side116.h | 2 +- src/devices/bus/isa/ssi2001.cpp | 2 +- src/devices/bus/isa/ssi2001.h | 2 +- src/devices/bus/isa/stereo_fx.cpp | 2 +- src/devices/bus/isa/stereo_fx.h | 2 +- src/devices/bus/isa/svga_cirrus.cpp | 4 +- src/devices/bus/isa/svga_cirrus.h | 4 +- src/devices/bus/isa/svga_s3.cpp | 8 +- src/devices/bus/isa/svga_s3.h | 8 +- src/devices/bus/isa/svga_trident.cpp | 2 +- src/devices/bus/isa/svga_trident.h | 2 +- src/devices/bus/isa/svga_tseng.cpp | 2 +- src/devices/bus/isa/svga_tseng.h | 2 +- src/devices/bus/isa/trident.cpp | 2 +- src/devices/bus/isa/trident.h | 2 +- src/devices/bus/isa/vga.cpp | 2 +- src/devices/bus/isa/vga.h | 2 +- src/devices/bus/isa/vga_ati.cpp | 6 +- src/devices/bus/isa/vga_ati.h | 6 +- src/devices/bus/isa/wd1002a_wx1.cpp | 2 +- src/devices/bus/isa/wd1002a_wx1.h | 2 +- src/devices/bus/isa/wdxt_gen.cpp | 2 +- src/devices/bus/isa/wdxt_gen.h | 2 +- src/devices/bus/isa/xtide.cpp | 2 +- src/devices/bus/isa/xtide.h | 2 +- src/devices/bus/isbx/compis_fdc.cpp | 2 +- src/devices/bus/isbx/compis_fdc.h | 2 +- src/devices/bus/isbx/isbc_218a.cpp | 2 +- src/devices/bus/isbx/isbc_218a.h | 2 +- src/devices/bus/isbx/isbx.cpp | 2 +- src/devices/bus/isbx/isbx.h | 2 +- src/devices/bus/kc/d002.cpp | 2 +- src/devices/bus/kc/d002.h | 2 +- src/devices/bus/kc/d004.cpp | 10 +- src/devices/bus/kc/d004.h | 6 +- src/devices/bus/kc/kc.cpp | 18 +- src/devices/bus/kc/kc.h | 10 +- src/devices/bus/kc/ram.cpp | 16 +- src/devices/bus/kc/ram.h | 14 +- src/devices/bus/kc/rom.cpp | 8 +- src/devices/bus/kc/rom.h | 8 +- src/devices/bus/lpci/cirrus.cpp | 2 +- src/devices/bus/lpci/cirrus.h | 2 +- src/devices/bus/lpci/i82371ab.cpp | 2 +- src/devices/bus/lpci/i82371ab.h | 2 +- src/devices/bus/lpci/i82371sb.cpp | 2 +- src/devices/bus/lpci/i82371sb.h | 2 +- src/devices/bus/lpci/i82439tx.cpp | 4 +- src/devices/bus/lpci/i82439tx.h | 10 +- src/devices/bus/lpci/mpc105.cpp | 3 +- src/devices/bus/lpci/mpc105.h | 6 +- src/devices/bus/lpci/northbridge.cpp | 2 +- src/devices/bus/lpci/northbridge.h | 2 +- src/devices/bus/lpci/pci.cpp | 8 +- src/devices/bus/lpci/pci.h | 8 +- src/devices/bus/lpci/southbridge.cpp | 2 +- src/devices/bus/lpci/southbridge.h | 2 +- src/devices/bus/lpci/vt82c505.cpp | 12 +- src/devices/bus/lpci/vt82c505.h | 2 +- src/devices/bus/macpds/macpds.cpp | 34 +- src/devices/bus/macpds/macpds.h | 26 +- src/devices/bus/macpds/pds_tpdfpd.cpp | 4 +- src/devices/bus/macpds/pds_tpdfpd.h | 4 +- src/devices/bus/megadrive/eeprom.cpp | 16 +- src/devices/bus/megadrive/eeprom.h | 16 +- src/devices/bus/megadrive/ggenie.cpp | 2 +- src/devices/bus/megadrive/ggenie.h | 2 +- src/devices/bus/megadrive/jcart.cpp | 10 +- src/devices/bus/megadrive/jcart.h | 10 +- src/devices/bus/megadrive/md_slot.cpp | 10 +- src/devices/bus/megadrive/md_slot.h | 10 +- src/devices/bus/megadrive/rom.cpp | 68 ++-- src/devices/bus/megadrive/rom.h | 68 ++-- src/devices/bus/megadrive/sk.cpp | 4 +- src/devices/bus/megadrive/sk.h | 4 +- src/devices/bus/megadrive/stm95.cpp | 4 +- src/devices/bus/megadrive/stm95.h | 4 +- src/devices/bus/megadrive/svp.cpp | 4 +- src/devices/bus/megadrive/svp.h | 4 +- src/devices/bus/midi/midi.cpp | 2 +- src/devices/bus/midi/midi.h | 2 +- src/devices/bus/midi/midiinport.cpp | 2 +- src/devices/bus/midi/midiinport.h | 2 +- src/devices/bus/midi/midioutport.cpp | 2 +- src/devices/bus/midi/midioutport.h | 2 +- src/devices/bus/msx_cart/arc.cpp | 2 +- src/devices/bus/msx_cart/arc.h | 2 +- src/devices/bus/msx_cart/ascii.cpp | 10 +- src/devices/bus/msx_cart/ascii.h | 10 +- src/devices/bus/msx_cart/bm_012.cpp | 2 +- src/devices/bus/msx_cart/bm_012.h | 2 +- src/devices/bus/msx_cart/crossblaim.cpp | 2 +- src/devices/bus/msx_cart/crossblaim.h | 2 +- src/devices/bus/msx_cart/disk.cpp | 18 +- src/devices/bus/msx_cart/disk.h | 18 +- src/devices/bus/msx_cart/dooly.cpp | 2 +- src/devices/bus/msx_cart/dooly.h | 2 +- src/devices/bus/msx_cart/fmpac.cpp | 2 +- src/devices/bus/msx_cart/fmpac.h | 2 +- src/devices/bus/msx_cart/fs_sr022.cpp | 2 +- src/devices/bus/msx_cart/fs_sr022.h | 2 +- src/devices/bus/msx_cart/halnote.cpp | 2 +- src/devices/bus/msx_cart/halnote.h | 2 +- src/devices/bus/msx_cart/hfox.cpp | 2 +- src/devices/bus/msx_cart/hfox.h | 2 +- src/devices/bus/msx_cart/holy_quran.cpp | 2 +- src/devices/bus/msx_cart/holy_quran.h | 2 +- src/devices/bus/msx_cart/konami.cpp | 16 +- src/devices/bus/msx_cart/konami.h | 16 +- src/devices/bus/msx_cart/korean.cpp | 6 +- src/devices/bus/msx_cart/korean.h | 6 +- src/devices/bus/msx_cart/majutsushi.cpp | 2 +- src/devices/bus/msx_cart/majutsushi.h | 2 +- src/devices/bus/msx_cart/moonsound.cpp | 2 +- src/devices/bus/msx_cart/moonsound.h | 2 +- src/devices/bus/msx_cart/msx_audio.cpp | 6 +- src/devices/bus/msx_cart/msx_audio.h | 6 +- src/devices/bus/msx_cart/msx_audio_kb.cpp | 6 +- src/devices/bus/msx_cart/msx_audio_kb.h | 2 +- src/devices/bus/msx_cart/msxdos2.cpp | 2 +- src/devices/bus/msx_cart/msxdos2.h | 2 +- src/devices/bus/msx_cart/nomapper.cpp | 2 +- src/devices/bus/msx_cart/nomapper.h | 2 +- src/devices/bus/msx_cart/rtype.cpp | 2 +- src/devices/bus/msx_cart/rtype.h | 2 +- src/devices/bus/msx_cart/super_swangi.cpp | 2 +- src/devices/bus/msx_cart/super_swangi.h | 2 +- src/devices/bus/msx_cart/superloderunner.cpp | 2 +- src/devices/bus/msx_cart/superloderunner.h | 2 +- src/devices/bus/msx_cart/yamaha.cpp | 6 +- src/devices/bus/msx_cart/yamaha.h | 6 +- src/devices/bus/msx_slot/bunsetsu.cpp | 9 +- src/devices/bus/msx_slot/bunsetsu.h | 6 +- src/devices/bus/msx_slot/cartridge.cpp | 6 +- src/devices/bus/msx_slot/cartridge.h | 6 +- src/devices/bus/msx_slot/disk.cpp | 37 +- src/devices/bus/msx_slot/disk.h | 38 +- src/devices/bus/msx_slot/fs4600.cpp | 4 +- src/devices/bus/msx_slot/fs4600.h | 2 +- src/devices/bus/msx_slot/music.cpp | 7 +- src/devices/bus/msx_slot/music.h | 6 +- src/devices/bus/msx_slot/panasonic08.cpp | 4 +- src/devices/bus/msx_slot/panasonic08.h | 2 +- src/devices/bus/msx_slot/ram.cpp | 2 +- src/devices/bus/msx_slot/ram.h | 2 +- src/devices/bus/msx_slot/ram_mm.cpp | 2 +- src/devices/bus/msx_slot/ram_mm.h | 2 +- src/devices/bus/msx_slot/rom.cpp | 8 +- src/devices/bus/msx_slot/rom.h | 4 +- src/devices/bus/msx_slot/sony08.cpp | 4 +- src/devices/bus/msx_slot/sony08.h | 2 +- src/devices/bus/nasbus/avc.cpp | 2 +- src/devices/bus/nasbus/avc.h | 2 +- src/devices/bus/nasbus/floppy.cpp | 2 +- src/devices/bus/nasbus/floppy.h | 2 +- src/devices/bus/nasbus/nasbus.cpp | 14 +- src/devices/bus/nasbus/nasbus.h | 10 +- src/devices/bus/neogeo/banked_cart.cpp | 2 +- src/devices/bus/neogeo/banked_cart.h | 2 +- src/devices/bus/neogeo/bootleg_cart.cpp | 32 +- src/devices/bus/neogeo/bootleg_cart.h | 32 +- src/devices/bus/neogeo/bootleg_hybrid_cart.cpp | 26 +- src/devices/bus/neogeo/bootleg_hybrid_cart.h | 26 +- src/devices/bus/neogeo/bootleg_prot.cpp | 2 +- src/devices/bus/neogeo/bootleg_prot.h | 2 +- src/devices/bus/neogeo/cmc_cart.cpp | 26 +- src/devices/bus/neogeo/cmc_cart.h | 26 +- src/devices/bus/neogeo/cmc_prot.cpp | 2 +- src/devices/bus/neogeo/cmc_prot.h | 2 +- src/devices/bus/neogeo/fatfury2_cart.cpp | 4 +- src/devices/bus/neogeo/fatfury2_cart.h | 4 +- src/devices/bus/neogeo/fatfury2_prot.cpp | 2 +- src/devices/bus/neogeo/fatfury2_prot.h | 2 +- src/devices/bus/neogeo/kof2002_cart.cpp | 14 +- src/devices/bus/neogeo/kof2002_cart.h | 14 +- src/devices/bus/neogeo/kof2002_prot.cpp | 2 +- src/devices/bus/neogeo/kof2002_prot.h | 2 +- src/devices/bus/neogeo/kof98_cart.cpp | 4 +- src/devices/bus/neogeo/kof98_cart.h | 4 +- src/devices/bus/neogeo/kof98_prot.cpp | 2 +- src/devices/bus/neogeo/kof98_prot.h | 2 +- src/devices/bus/neogeo/kog_prot.cpp | 2 +- src/devices/bus/neogeo/kog_prot.h | 2 +- src/devices/bus/neogeo/mslugx_cart.cpp | 4 +- src/devices/bus/neogeo/mslugx_cart.h | 4 +- src/devices/bus/neogeo/mslugx_prot.cpp | 2 +- src/devices/bus/neogeo/mslugx_prot.h | 2 +- src/devices/bus/neogeo/neogeo_slot.cpp | 2 +- src/devices/bus/neogeo/neogeo_slot.h | 2 +- src/devices/bus/neogeo/pcm2_cart.cpp | 12 +- src/devices/bus/neogeo/pcm2_cart.h | 12 +- src/devices/bus/neogeo/pcm2_prot.cpp | 2 +- src/devices/bus/neogeo/pcm2_prot.h | 2 +- src/devices/bus/neogeo/pvc_cart.cpp | 12 +- src/devices/bus/neogeo/pvc_cart.h | 12 +- src/devices/bus/neogeo/pvc_prot.cpp | 2 +- src/devices/bus/neogeo/pvc_prot.h | 2 +- src/devices/bus/neogeo/rom.cpp | 4 +- src/devices/bus/neogeo/rom.h | 4 +- src/devices/bus/neogeo/sbp_prot.cpp | 2 +- src/devices/bus/neogeo/sbp_prot.h | 2 +- src/devices/bus/neogeo/sma_cart.cpp | 14 +- src/devices/bus/neogeo/sma_cart.h | 14 +- src/devices/bus/neogeo/sma_prot.cpp | 2 +- src/devices/bus/neogeo/sma_prot.h | 2 +- src/devices/bus/nes/2a03pur.cpp | 2 +- src/devices/bus/nes/2a03pur.h | 2 +- src/devices/bus/nes/act53.cpp | 2 +- src/devices/bus/nes/act53.h | 2 +- src/devices/bus/nes/aladdin.cpp | 10 +- src/devices/bus/nes/aladdin.h | 10 +- src/devices/bus/nes/ave.cpp | 6 +- src/devices/bus/nes/ave.h | 6 +- src/devices/bus/nes/bandai.cpp | 18 +- src/devices/bus/nes/bandai.h | 18 +- src/devices/bus/nes/benshieng.cpp | 2 +- src/devices/bus/nes/benshieng.h | 2 +- src/devices/bus/nes/bootleg.cpp | 40 +- src/devices/bus/nes/bootleg.h | 40 +- src/devices/bus/nes/camerica.cpp | 6 +- src/devices/bus/nes/camerica.h | 6 +- src/devices/bus/nes/cne.cpp | 6 +- src/devices/bus/nes/cne.h | 6 +- src/devices/bus/nes/cony.cpp | 6 +- src/devices/bus/nes/cony.h | 6 +- src/devices/bus/nes/datach.cpp | 10 +- src/devices/bus/nes/datach.h | 10 +- src/devices/bus/nes/discrete.cpp | 8 +- src/devices/bus/nes/discrete.h | 8 +- src/devices/bus/nes/disksys.cpp | 2 +- src/devices/bus/nes/disksys.h | 2 +- src/devices/bus/nes/event.cpp | 2 +- src/devices/bus/nes/event.h | 2 +- src/devices/bus/nes/ggenie.cpp | 2 +- src/devices/bus/nes/ggenie.h | 2 +- src/devices/bus/nes/henggedianzi.cpp | 6 +- src/devices/bus/nes/henggedianzi.h | 6 +- src/devices/bus/nes/hes.cpp | 2 +- src/devices/bus/nes/hes.h | 2 +- src/devices/bus/nes/hosenkan.cpp | 2 +- src/devices/bus/nes/hosenkan.h | 2 +- src/devices/bus/nes/irem.cpp | 10 +- src/devices/bus/nes/irem.h | 10 +- src/devices/bus/nes/jaleco.cpp | 32 +- src/devices/bus/nes/jaleco.h | 32 +- src/devices/bus/nes/jy.cpp | 10 +- src/devices/bus/nes/jy.h | 10 +- src/devices/bus/nes/kaiser.cpp | 18 +- src/devices/bus/nes/kaiser.h | 18 +- src/devices/bus/nes/karastudio.cpp | 6 +- src/devices/bus/nes/karastudio.h | 6 +- src/devices/bus/nes/konami.cpp | 14 +- src/devices/bus/nes/konami.h | 14 +- src/devices/bus/nes/legacy.cpp | 8 +- src/devices/bus/nes/legacy.h | 8 +- src/devices/bus/nes/mmc1.cpp | 10 +- src/devices/bus/nes/mmc1.h | 10 +- src/devices/bus/nes/mmc2.cpp | 6 +- src/devices/bus/nes/mmc2.h | 6 +- src/devices/bus/nes/mmc3.cpp | 14 +- src/devices/bus/nes/mmc3.h | 14 +- src/devices/bus/nes/mmc3_clones.cpp | 70 ++-- src/devices/bus/nes/mmc3_clones.h | 70 ++-- src/devices/bus/nes/mmc5.cpp | 2 +- src/devices/bus/nes/mmc5.h | 2 +- src/devices/bus/nes/multigame.cpp | 94 ++--- src/devices/bus/nes/multigame.h | 94 ++--- src/devices/bus/nes/namcot.cpp | 16 +- src/devices/bus/nes/namcot.h | 16 +- src/devices/bus/nes/nanjing.cpp | 2 +- src/devices/bus/nes/nanjing.h | 2 +- src/devices/bus/nes/nes_pcb.inc | 6 +- src/devices/bus/nes/nes_slot.cpp | 6 +- src/devices/bus/nes/nes_slot.h | 6 +- src/devices/bus/nes/ntdec.cpp | 4 +- src/devices/bus/nes/ntdec.h | 4 +- src/devices/bus/nes/nxrom.cpp | 28 +- src/devices/bus/nes/nxrom.h | 28 +- src/devices/bus/nes/pirate.cpp | 34 +- src/devices/bus/nes/pirate.h | 36 +- src/devices/bus/nes/pt554.cpp | 2 +- src/devices/bus/nes/pt554.h | 2 +- src/devices/bus/nes/racermate.cpp | 2 +- src/devices/bus/nes/racermate.h | 2 +- src/devices/bus/nes/rcm.cpp | 10 +- src/devices/bus/nes/rcm.h | 10 +- src/devices/bus/nes/rexsoft.cpp | 4 +- src/devices/bus/nes/rexsoft.h | 4 +- src/devices/bus/nes/sachen.cpp | 32 +- src/devices/bus/nes/sachen.h | 32 +- src/devices/bus/nes/somari.cpp | 2 +- src/devices/bus/nes/somari.h | 2 +- src/devices/bus/nes/sunsoft.cpp | 16 +- src/devices/bus/nes/sunsoft.h | 16 +- src/devices/bus/nes/sunsoft_dcs.cpp | 6 +- src/devices/bus/nes/sunsoft_dcs.h | 6 +- src/devices/bus/nes/taito.cpp | 10 +- src/devices/bus/nes/taito.h | 10 +- src/devices/bus/nes/tengen.cpp | 8 +- src/devices/bus/nes/tengen.h | 8 +- src/devices/bus/nes/txc.cpp | 12 +- src/devices/bus/nes/txc.h | 12 +- src/devices/bus/nes/waixing.cpp | 46 +-- src/devices/bus/nes/waixing.h | 46 +-- src/devices/bus/nes_ctrl/4score.cpp | 6 +- src/devices/bus/nes_ctrl/4score.h | 6 +- src/devices/bus/nes_ctrl/arkpaddle.cpp | 6 +- src/devices/bus/nes_ctrl/arkpaddle.h | 6 +- src/devices/bus/nes_ctrl/bcbattle.cpp | 2 +- src/devices/bus/nes_ctrl/bcbattle.h | 2 +- src/devices/bus/nes_ctrl/ctrl.cpp | 2 +- src/devices/bus/nes_ctrl/ctrl.h | 2 +- src/devices/bus/nes_ctrl/fckeybrd.cpp | 2 +- src/devices/bus/nes_ctrl/fckeybrd.h | 2 +- src/devices/bus/nes_ctrl/ftrainer.cpp | 2 +- src/devices/bus/nes_ctrl/ftrainer.h | 2 +- src/devices/bus/nes_ctrl/hori.cpp | 4 +- src/devices/bus/nes_ctrl/hori.h | 4 +- src/devices/bus/nes_ctrl/joypad.cpp | 12 +- src/devices/bus/nes_ctrl/joypad.h | 12 +- src/devices/bus/nes_ctrl/konamihs.cpp | 2 +- src/devices/bus/nes_ctrl/konamihs.h | 2 +- src/devices/bus/nes_ctrl/miracle.cpp | 2 +- src/devices/bus/nes_ctrl/miracle.h | 2 +- src/devices/bus/nes_ctrl/mjpanel.cpp | 2 +- src/devices/bus/nes_ctrl/mjpanel.h | 2 +- src/devices/bus/nes_ctrl/pachinko.cpp | 2 +- src/devices/bus/nes_ctrl/pachinko.h | 2 +- src/devices/bus/nes_ctrl/partytap.cpp | 2 +- src/devices/bus/nes_ctrl/partytap.h | 2 +- src/devices/bus/nes_ctrl/powerpad.cpp | 2 +- src/devices/bus/nes_ctrl/powerpad.h | 2 +- src/devices/bus/nes_ctrl/suborkey.cpp | 2 +- src/devices/bus/nes_ctrl/suborkey.h | 2 +- src/devices/bus/nes_ctrl/zapper.cpp | 2 +- src/devices/bus/nes_ctrl/zapper.h | 2 +- src/devices/bus/nubus/nubus.cpp | 48 ++- src/devices/bus/nubus/nubus.h | 26 +- src/devices/bus/nubus/nubus_48gc.cpp | 6 +- src/devices/bus/nubus/nubus_48gc.h | 6 +- src/devices/bus/nubus/nubus_asntmc3b.cpp | 6 +- src/devices/bus/nubus/nubus_asntmc3b.h | 6 +- src/devices/bus/nubus/nubus_cb264.cpp | 4 +- src/devices/bus/nubus/nubus_cb264.h | 4 +- src/devices/bus/nubus/nubus_image.cpp | 8 +- src/devices/bus/nubus/nubus_image.h | 4 +- src/devices/bus/nubus/nubus_m2hires.cpp | 4 +- src/devices/bus/nubus/nubus_m2hires.h | 4 +- src/devices/bus/nubus/nubus_m2video.cpp | 4 +- src/devices/bus/nubus/nubus_m2video.h | 4 +- src/devices/bus/nubus/nubus_radiustpd.cpp | 4 +- src/devices/bus/nubus/nubus_radiustpd.h | 4 +- src/devices/bus/nubus/nubus_spec8.cpp | 4 +- src/devices/bus/nubus/nubus_spec8.h | 4 +- src/devices/bus/nubus/nubus_specpdq.cpp | 4 +- src/devices/bus/nubus/nubus_specpdq.h | 4 +- src/devices/bus/nubus/nubus_vikbw.cpp | 4 +- src/devices/bus/nubus/nubus_vikbw.h | 4 +- src/devices/bus/nubus/nubus_wsportrait.cpp | 4 +- src/devices/bus/nubus/nubus_wsportrait.h | 4 +- src/devices/bus/nubus/pds30_30hr.cpp | 4 +- src/devices/bus/nubus/pds30_30hr.h | 4 +- src/devices/bus/nubus/pds30_cb264.cpp | 4 +- src/devices/bus/nubus/pds30_cb264.h | 4 +- src/devices/bus/nubus/pds30_mc30.cpp | 4 +- src/devices/bus/nubus/pds30_mc30.h | 4 +- src/devices/bus/nubus/pds30_procolor816.cpp | 4 +- src/devices/bus/nubus/pds30_procolor816.h | 4 +- src/devices/bus/nubus/pds30_sigmalview.cpp | 4 +- src/devices/bus/nubus/pds30_sigmalview.h | 4 +- src/devices/bus/odyssey2/chess.cpp | 2 +- src/devices/bus/odyssey2/chess.h | 2 +- src/devices/bus/odyssey2/rom.cpp | 8 +- src/devices/bus/odyssey2/rom.h | 8 +- src/devices/bus/odyssey2/slot.cpp | 4 +- src/devices/bus/odyssey2/slot.h | 4 +- src/devices/bus/odyssey2/voice.cpp | 2 +- src/devices/bus/odyssey2/voice.h | 2 +- src/devices/bus/oricext/jasmin.cpp | 2 +- src/devices/bus/oricext/jasmin.h | 2 +- src/devices/bus/oricext/microdisc.cpp | 2 +- src/devices/bus/oricext/microdisc.h | 2 +- src/devices/bus/oricext/oricext.cpp | 14 +- src/devices/bus/oricext/oricext.h | 12 +- src/devices/bus/pc_joy/pc_joy.cpp | 4 +- src/devices/bus/pc_joy/pc_joy.h | 4 +- src/devices/bus/pc_joy/pc_joy_sw.cpp | 2 +- src/devices/bus/pc_joy/pc_joy_sw.h | 2 +- src/devices/bus/pc_kbd/ec1841.cpp | 16 +- src/devices/bus/pc_kbd/ec1841.h | 2 +- src/devices/bus/pc_kbd/iskr1030.cpp | 22 +- src/devices/bus/pc_kbd/iskr1030.h | 2 +- src/devices/bus/pc_kbd/keytro.cpp | 2 +- src/devices/bus/pc_kbd/keytro.h | 4 +- src/devices/bus/pc_kbd/msnat.cpp | 4 +- src/devices/bus/pc_kbd/msnat.h | 2 +- src/devices/bus/pc_kbd/pc83.cpp | 2 +- src/devices/bus/pc_kbd/pc83.h | 2 +- src/devices/bus/pc_kbd/pc_kbdc.cpp | 6 +- src/devices/bus/pc_kbd/pc_kbdc.h | 6 +- src/devices/bus/pc_kbd/pcat84.cpp | 6 +- src/devices/bus/pc_kbd/pcat84.h | 6 +- src/devices/bus/pc_kbd/pcxt83.cpp | 2 +- src/devices/bus/pc_kbd/pcxt83.h | 2 +- src/devices/bus/pce/pce_rom.cpp | 10 +- src/devices/bus/pce/pce_rom.h | 10 +- src/devices/bus/pce/pce_slot.cpp | 4 +- src/devices/bus/pce/pce_slot.h | 4 +- src/devices/bus/pet/64k.cpp | 2 +- src/devices/bus/pet/64k.h | 2 +- src/devices/bus/pet/c2n.cpp | 8 +- src/devices/bus/pet/c2n.h | 8 +- src/devices/bus/pet/cass.cpp | 2 +- src/devices/bus/pet/cass.h | 2 +- src/devices/bus/pet/cb2snd.cpp | 2 +- src/devices/bus/pet/cb2snd.h | 2 +- src/devices/bus/pet/diag.cpp | 2 +- src/devices/bus/pet/diag.h | 2 +- src/devices/bus/pet/diag264_lb_tape.cpp | 2 +- src/devices/bus/pet/diag264_lb_tape.h | 2 +- src/devices/bus/pet/exp.cpp | 2 +- src/devices/bus/pet/exp.h | 2 +- src/devices/bus/pet/hsg.cpp | 6 +- src/devices/bus/pet/hsg.h | 6 +- src/devices/bus/pet/petuja.cpp | 2 +- src/devices/bus/pet/petuja.h | 2 +- src/devices/bus/pet/superpet.cpp | 2 +- src/devices/bus/pet/superpet.h | 2 +- src/devices/bus/pet/user.cpp | 2 +- src/devices/bus/pet/user.h | 2 +- src/devices/bus/plus4/c1551.cpp | 2 +- src/devices/bus/plus4/c1551.h | 2 +- src/devices/bus/plus4/diag264_lb_user.cpp | 2 +- src/devices/bus/plus4/diag264_lb_user.h | 2 +- src/devices/bus/plus4/exp.cpp | 2 +- src/devices/bus/plus4/exp.h | 2 +- src/devices/bus/plus4/sid.cpp | 2 +- src/devices/bus/plus4/sid.h | 2 +- src/devices/bus/plus4/std.cpp | 2 +- src/devices/bus/plus4/std.h | 2 +- src/devices/bus/psx/analogue.cpp | 6 +- src/devices/bus/psx/analogue.h | 6 +- src/devices/bus/psx/ctlrport.cpp | 6 +- src/devices/bus/psx/ctlrport.h | 6 +- src/devices/bus/psx/memcard.cpp | 2 +- src/devices/bus/psx/memcard.h | 2 +- src/devices/bus/psx/multitap.cpp | 2 +- src/devices/bus/psx/multitap.h | 2 +- src/devices/bus/ql/cst_q_plus4.cpp | 2 +- src/devices/bus/ql/cst_q_plus4.h | 2 +- src/devices/bus/ql/cst_qdisc.cpp | 2 +- src/devices/bus/ql/cst_qdisc.h | 2 +- src/devices/bus/ql/cumana_fdi.cpp | 2 +- src/devices/bus/ql/cumana_fdi.h | 2 +- src/devices/bus/ql/exp.cpp | 2 +- src/devices/bus/ql/exp.h | 2 +- src/devices/bus/ql/kempston_di.cpp | 2 +- src/devices/bus/ql/kempston_di.h | 2 +- src/devices/bus/ql/miracle_gold_card.cpp | 2 +- src/devices/bus/ql/miracle_gold_card.h | 2 +- src/devices/bus/ql/miracle_hd.cpp | 2 +- src/devices/bus/ql/miracle_hd.h | 2 +- src/devices/bus/ql/mp_fdi.cpp | 2 +- src/devices/bus/ql/mp_fdi.h | 2 +- src/devices/bus/ql/opd_basic_master.cpp | 2 +- src/devices/bus/ql/opd_basic_master.h | 2 +- src/devices/bus/ql/pcml_qdisk.cpp | 2 +- src/devices/bus/ql/pcml_qdisk.h | 2 +- src/devices/bus/ql/qubide.cpp | 2 +- src/devices/bus/ql/qubide.h | 2 +- src/devices/bus/ql/rom.cpp | 2 +- src/devices/bus/ql/rom.h | 2 +- src/devices/bus/ql/sandy_superdisk.cpp | 2 +- src/devices/bus/ql/sandy_superdisk.h | 2 +- src/devices/bus/ql/sandy_superqboard.cpp | 10 +- src/devices/bus/ql/sandy_superqboard.h | 10 +- src/devices/bus/ql/std.cpp | 2 +- src/devices/bus/ql/std.h | 2 +- src/devices/bus/ql/trumpcard.cpp | 10 +- src/devices/bus/ql/trumpcard.h | 10 +- src/devices/bus/rs232/keyboard.cpp | 4 +- src/devices/bus/rs232/keyboard.h | 4 +- src/devices/bus/rs232/loopback.cpp | 2 +- src/devices/bus/rs232/loopback.h | 2 +- src/devices/bus/rs232/null_modem.cpp | 2 +- src/devices/bus/rs232/null_modem.h | 2 +- src/devices/bus/rs232/printer.cpp | 2 +- src/devices/bus/rs232/printer.h | 2 +- src/devices/bus/rs232/pty.cpp | 2 +- src/devices/bus/rs232/pty.h | 2 +- src/devices/bus/rs232/rs232.cpp | 4 +- src/devices/bus/rs232/rs232.h | 4 +- src/devices/bus/rs232/ser_mouse.cpp | 6 +- src/devices/bus/rs232/ser_mouse.h | 6 +- src/devices/bus/rs232/terminal.cpp | 2 +- src/devices/bus/rs232/terminal.h | 2 +- src/devices/bus/rs232/xvd701.cpp | 2 +- src/devices/bus/rs232/xvd701.h | 2 +- src/devices/bus/s100/dj2db.cpp | 2 +- src/devices/bus/s100/dj2db.h | 2 +- src/devices/bus/s100/djdma.cpp | 2 +- src/devices/bus/s100/djdma.h | 2 +- src/devices/bus/s100/mm65k16s.cpp | 2 +- src/devices/bus/s100/mm65k16s.h | 2 +- src/devices/bus/s100/nsmdsa.cpp | 2 +- src/devices/bus/s100/nsmdsa.h | 2 +- src/devices/bus/s100/nsmdsad.cpp | 2 +- src/devices/bus/s100/nsmdsad.h | 2 +- src/devices/bus/s100/s100.cpp | 4 +- src/devices/bus/s100/s100.h | 4 +- src/devices/bus/s100/wunderbus.cpp | 2 +- src/devices/bus/s100/wunderbus.h | 2 +- src/devices/bus/saturn/bram.cpp | 10 +- src/devices/bus/saturn/bram.h | 10 +- src/devices/bus/saturn/dram.cpp | 6 +- src/devices/bus/saturn/dram.h | 6 +- src/devices/bus/saturn/rom.cpp | 4 +- src/devices/bus/saturn/rom.h | 4 +- src/devices/bus/saturn/sat_slot.cpp | 4 +- src/devices/bus/saturn/sat_slot.h | 4 +- src/devices/bus/scsi/acb4070.cpp | 2 +- src/devices/bus/scsi/acb4070.h | 2 +- src/devices/bus/scsi/cdu76s.cpp | 2 +- src/devices/bus/scsi/cdu76s.h | 2 +- src/devices/bus/scsi/d9060hd.cpp | 2 +- src/devices/bus/scsi/d9060hd.h | 2 +- src/devices/bus/scsi/omti5100.cpp | 2 +- src/devices/bus/scsi/omti5100.h | 2 +- src/devices/bus/scsi/pc9801_sasi.cpp | 2 +- src/devices/bus/scsi/pc9801_sasi.h | 2 +- src/devices/bus/scsi/s1410.cpp | 2 +- src/devices/bus/scsi/s1410.h | 2 +- src/devices/bus/scsi/sa1403d.cpp | 2 +- src/devices/bus/scsi/sa1403d.h | 2 +- src/devices/bus/scsi/scsi.cpp | 4 +- src/devices/bus/scsi/scsi.h | 4 +- src/devices/bus/scsi/scsicd.cpp | 4 +- src/devices/bus/scsi/scsicd.h | 4 +- src/devices/bus/scsi/scsihd.cpp | 4 +- src/devices/bus/scsi/scsihd.h | 4 +- src/devices/bus/scsi/scsihle.cpp | 4 +- src/devices/bus/scsi/scsihle.h | 2 +- src/devices/bus/scv/rom.cpp | 16 +- src/devices/bus/scv/rom.h | 16 +- src/devices/bus/scv/slot.cpp | 4 +- src/devices/bus/scv/slot.h | 4 +- src/devices/bus/sega8/ccatch.cpp | 2 +- src/devices/bus/sega8/ccatch.h | 2 +- src/devices/bus/sega8/mgear.cpp | 2 +- src/devices/bus/sega8/mgear.h | 2 +- src/devices/bus/sega8/rom.cpp | 38 +- src/devices/bus/sega8/rom.h | 38 +- src/devices/bus/sega8/sega8_slot.cpp | 8 +- src/devices/bus/sega8/sega8_slot.h | 8 +- src/devices/bus/sms_ctrl/graphic.cpp | 2 +- src/devices/bus/sms_ctrl/graphic.h | 2 +- src/devices/bus/sms_ctrl/joypad.cpp | 2 +- src/devices/bus/sms_ctrl/joypad.h | 2 +- src/devices/bus/sms_ctrl/lphaser.cpp | 2 +- src/devices/bus/sms_ctrl/lphaser.h | 2 +- src/devices/bus/sms_ctrl/multitap.cpp | 2 +- src/devices/bus/sms_ctrl/multitap.h | 2 +- src/devices/bus/sms_ctrl/paddle.cpp | 2 +- src/devices/bus/sms_ctrl/paddle.h | 2 +- src/devices/bus/sms_ctrl/rfu.cpp | 2 +- src/devices/bus/sms_ctrl/rfu.h | 2 +- src/devices/bus/sms_ctrl/smsctrl.cpp | 2 +- src/devices/bus/sms_ctrl/smsctrl.h | 2 +- src/devices/bus/sms_ctrl/sports.cpp | 2 +- src/devices/bus/sms_ctrl/sports.h | 2 +- src/devices/bus/sms_ctrl/sportsjp.cpp | 2 +- src/devices/bus/sms_ctrl/sportsjp.h | 2 +- src/devices/bus/sms_exp/gender.cpp | 2 +- src/devices/bus/sms_exp/gender.h | 2 +- src/devices/bus/sms_exp/smsexp.cpp | 2 +- src/devices/bus/sms_exp/smsexp.h | 2 +- src/devices/bus/snes/bsx.cpp | 10 +- src/devices/bus/snes/bsx.h | 10 +- src/devices/bus/snes/event.cpp | 2 +- src/devices/bus/snes/event.h | 2 +- src/devices/bus/snes/rom.cpp | 22 +- src/devices/bus/snes/rom.h | 22 +- src/devices/bus/snes/rom21.cpp | 6 +- src/devices/bus/snes/rom21.h | 6 +- src/devices/bus/snes/sa1.cpp | 2 +- src/devices/bus/snes/sa1.h | 2 +- src/devices/bus/snes/sdd1.cpp | 4 +- src/devices/bus/snes/sdd1.h | 4 +- src/devices/bus/snes/sfx.cpp | 2 +- src/devices/bus/snes/sfx.h | 2 +- src/devices/bus/snes/sgb.cpp | 2 +- src/devices/bus/snes/sgb.h | 2 +- src/devices/bus/snes/snes_slot.cpp | 10 +- src/devices/bus/snes/snes_slot.h | 10 +- src/devices/bus/snes/spc7110.cpp | 6 +- src/devices/bus/snes/spc7110.h | 6 +- src/devices/bus/snes/sufami.cpp | 4 +- src/devices/bus/snes/sufami.h | 4 +- src/devices/bus/snes/upd.cpp | 30 +- src/devices/bus/snes/upd.h | 30 +- src/devices/bus/snes_ctrl/bcbattle.cpp | 2 +- src/devices/bus/snes_ctrl/bcbattle.h | 2 +- src/devices/bus/snes_ctrl/ctrl.cpp | 2 +- src/devices/bus/snes_ctrl/ctrl.h | 2 +- src/devices/bus/snes_ctrl/joypad.cpp | 2 +- src/devices/bus/snes_ctrl/joypad.h | 2 +- src/devices/bus/snes_ctrl/miracle.cpp | 2 +- src/devices/bus/snes_ctrl/miracle.h | 2 +- src/devices/bus/snes_ctrl/mouse.cpp | 2 +- src/devices/bus/snes_ctrl/mouse.h | 2 +- src/devices/bus/snes_ctrl/multitap.cpp | 2 +- src/devices/bus/snes_ctrl/multitap.h | 2 +- src/devices/bus/snes_ctrl/pachinko.cpp | 2 +- src/devices/bus/snes_ctrl/pachinko.h | 2 +- src/devices/bus/snes_ctrl/sscope.cpp | 2 +- src/devices/bus/snes_ctrl/sscope.h | 2 +- src/devices/bus/snes_ctrl/twintap.cpp | 2 +- src/devices/bus/snes_ctrl/twintap.h | 2 +- src/devices/bus/spc1000/exp.cpp | 2 +- src/devices/bus/spc1000/exp.h | 2 +- src/devices/bus/spc1000/fdd.cpp | 2 +- src/devices/bus/spc1000/fdd.h | 2 +- src/devices/bus/spc1000/vdp.cpp | 2 +- src/devices/bus/spc1000/vdp.h | 2 +- src/devices/bus/ti99_peb/bwg.cpp | 2 +- src/devices/bus/ti99_peb/bwg.h | 2 +- src/devices/bus/ti99_peb/evpc.cpp | 2 +- src/devices/bus/ti99_peb/evpc.h | 2 +- src/devices/bus/ti99_peb/hfdc.cpp | 98 ++--- src/devices/bus/ti99_peb/hfdc.h | 2 +- src/devices/bus/ti99_peb/horizon.cpp | 2 +- src/devices/bus/ti99_peb/horizon.h | 2 +- src/devices/bus/ti99_peb/hsgpl.cpp | 80 ++-- src/devices/bus/ti99_peb/hsgpl.h | 2 +- src/devices/bus/ti99_peb/memex.cpp | 2 +- src/devices/bus/ti99_peb/memex.h | 2 +- src/devices/bus/ti99_peb/myarcmem.cpp | 2 +- src/devices/bus/ti99_peb/myarcmem.h | 2 +- src/devices/bus/ti99_peb/pcode.cpp | 2 +- src/devices/bus/ti99_peb/pcode.h | 2 +- src/devices/bus/ti99_peb/peribox.cpp | 28 +- src/devices/bus/ti99_peb/peribox.h | 16 +- src/devices/bus/ti99_peb/samsmem.cpp | 2 +- src/devices/bus/ti99_peb/samsmem.h | 2 +- src/devices/bus/ti99_peb/spchsyn.cpp | 2 +- src/devices/bus/ti99_peb/spchsyn.h | 2 +- src/devices/bus/ti99_peb/ti_32kmem.cpp | 2 +- src/devices/bus/ti99_peb/ti_32kmem.h | 2 +- src/devices/bus/ti99_peb/ti_fdc.cpp | 2 +- src/devices/bus/ti99_peb/ti_fdc.h | 2 +- src/devices/bus/ti99_peb/ti_rs232.cpp | 8 +- src/devices/bus/ti99_peb/ti_rs232.h | 6 +- src/devices/bus/ti99_peb/tn_ide.cpp | 2 +- src/devices/bus/ti99_peb/tn_ide.h | 2 +- src/devices/bus/ti99_peb/tn_usbsm.cpp | 2 +- src/devices/bus/ti99_peb/tn_usbsm.h | 2 +- src/devices/bus/ti99x/990_dk.cpp | 2 +- src/devices/bus/ti99x/990_dk.h | 2 +- src/devices/bus/ti99x/990_hd.cpp | 10 +- src/devices/bus/ti99x/990_hd.h | 2 +- src/devices/bus/ti99x/990_tap.cpp | 14 +- src/devices/bus/ti99x/990_tap.h | 2 +- src/devices/bus/ti99x/998board.cpp | 130 +++---- src/devices/bus/ti99x/998board.h | 6 +- src/devices/bus/ti99x/datamux.cpp | 2 +- src/devices/bus/ti99x/datamux.h | 2 +- src/devices/bus/ti99x/genboard.cpp | 142 +++---- src/devices/bus/ti99x/genboard.h | 6 +- src/devices/bus/ti99x/grom.cpp | 2 +- src/devices/bus/ti99x/grom.h | 2 +- src/devices/bus/ti99x/gromport.cpp | 102 ++--- src/devices/bus/ti99x/gromport.h | 18 +- src/devices/bus/ti99x/handset.cpp | 4 +- src/devices/bus/ti99x/handset.h | 4 +- src/devices/bus/ti99x/joyport.cpp | 2 +- src/devices/bus/ti99x/joyport.h | 4 +- src/devices/bus/ti99x/mecmouse.cpp | 2 +- src/devices/bus/ti99x/mecmouse.h | 2 +- src/devices/bus/ti99x/ti99defs.h | 4 +- src/devices/bus/ti99x/videowrp.cpp | 10 +- src/devices/bus/ti99x/videowrp.h | 12 +- src/devices/bus/tiki100/8088.cpp | 2 +- src/devices/bus/tiki100/8088.h | 2 +- src/devices/bus/tiki100/exp.cpp | 4 +- src/devices/bus/tiki100/exp.h | 4 +- src/devices/bus/tiki100/hdc.cpp | 2 +- src/devices/bus/tiki100/hdc.h | 2 +- src/devices/bus/tvc/hbf.cpp | 4 +- src/devices/bus/tvc/hbf.h | 2 +- src/devices/bus/tvc/tvc.cpp | 2 +- src/devices/bus/tvc/tvc.h | 2 +- src/devices/bus/vboy/rom.cpp | 6 +- src/devices/bus/vboy/rom.h | 6 +- src/devices/bus/vboy/slot.cpp | 4 +- src/devices/bus/vboy/slot.h | 4 +- src/devices/bus/vc4000/rom.cpp | 10 +- src/devices/bus/vc4000/rom.h | 10 +- src/devices/bus/vc4000/slot.cpp | 6 +- src/devices/bus/vc4000/slot.h | 6 +- src/devices/bus/vcs/compumat.cpp | 2 +- src/devices/bus/vcs/compumat.h | 2 +- src/devices/bus/vcs/dpc.cpp | 4 +- src/devices/bus/vcs/dpc.h | 4 +- src/devices/bus/vcs/harmony_melody.cpp | 2 +- src/devices/bus/vcs/harmony_melody.h | 2 +- src/devices/bus/vcs/rom.cpp | 48 +-- src/devices/bus/vcs/rom.h | 48 +-- src/devices/bus/vcs/scharger.cpp | 2 +- src/devices/bus/vcs/scharger.h | 2 +- src/devices/bus/vcs/vcs_slot.cpp | 4 +- src/devices/bus/vcs/vcs_slot.h | 4 +- src/devices/bus/vcs_ctrl/ctrl.cpp | 2 +- src/devices/bus/vcs_ctrl/ctrl.h | 2 +- src/devices/bus/vcs_ctrl/joybooster.cpp | 2 +- src/devices/bus/vcs_ctrl/joybooster.h | 2 +- src/devices/bus/vcs_ctrl/joystick.cpp | 2 +- src/devices/bus/vcs_ctrl/joystick.h | 2 +- src/devices/bus/vcs_ctrl/keypad.cpp | 2 +- src/devices/bus/vcs_ctrl/keypad.h | 2 +- src/devices/bus/vcs_ctrl/lightpen.cpp | 2 +- src/devices/bus/vcs_ctrl/lightpen.h | 2 +- src/devices/bus/vcs_ctrl/paddles.cpp | 2 +- src/devices/bus/vcs_ctrl/paddles.h | 2 +- src/devices/bus/vcs_ctrl/wheel.cpp | 2 +- src/devices/bus/vcs_ctrl/wheel.h | 2 +- src/devices/bus/vectrex/rom.cpp | 8 +- src/devices/bus/vectrex/rom.h | 8 +- src/devices/bus/vectrex/slot.cpp | 4 +- src/devices/bus/vectrex/slot.h | 4 +- src/devices/bus/vic10/exp.cpp | 2 +- src/devices/bus/vic10/exp.h | 2 +- src/devices/bus/vic10/std.cpp | 2 +- src/devices/bus/vic10/std.h | 2 +- src/devices/bus/vic20/4cga.cpp | 2 +- src/devices/bus/vic20/4cga.h | 2 +- src/devices/bus/vic20/exp.cpp | 2 +- src/devices/bus/vic20/exp.h | 2 +- src/devices/bus/vic20/fe3.cpp | 2 +- src/devices/bus/vic20/fe3.h | 2 +- src/devices/bus/vic20/megacart.cpp | 2 +- src/devices/bus/vic20/megacart.h | 2 +- src/devices/bus/vic20/std.cpp | 2 +- src/devices/bus/vic20/std.h | 2 +- src/devices/bus/vic20/vic1010.cpp | 2 +- src/devices/bus/vic20/vic1010.h | 2 +- src/devices/bus/vic20/vic1011.cpp | 2 +- src/devices/bus/vic20/vic1011.h | 2 +- src/devices/bus/vic20/vic1110.cpp | 2 +- src/devices/bus/vic20/vic1110.h | 2 +- src/devices/bus/vic20/vic1111.cpp | 2 +- src/devices/bus/vic20/vic1111.h | 2 +- src/devices/bus/vic20/vic1112.cpp | 2 +- src/devices/bus/vic20/vic1112.h | 2 +- src/devices/bus/vic20/vic1210.cpp | 2 +- src/devices/bus/vic20/vic1210.h | 2 +- src/devices/bus/vidbrain/exp.cpp | 2 +- src/devices/bus/vidbrain/exp.h | 2 +- src/devices/bus/vidbrain/money_minder.cpp | 2 +- src/devices/bus/vidbrain/money_minder.h | 2 +- src/devices/bus/vidbrain/std.cpp | 2 +- src/devices/bus/vidbrain/std.h | 2 +- src/devices/bus/vidbrain/timeshare.cpp | 2 +- src/devices/bus/vidbrain/timeshare.h | 2 +- src/devices/bus/vip/byteio.cpp | 2 +- src/devices/bus/vip/byteio.h | 2 +- src/devices/bus/vip/exp.cpp | 2 +- src/devices/bus/vip/exp.h | 2 +- src/devices/bus/vip/vp550.cpp | 14 +- src/devices/bus/vip/vp550.h | 2 +- src/devices/bus/vip/vp570.cpp | 2 +- src/devices/bus/vip/vp570.h | 2 +- src/devices/bus/vip/vp575.cpp | 2 +- src/devices/bus/vip/vp575.h | 2 +- src/devices/bus/vip/vp585.cpp | 2 +- src/devices/bus/vip/vp585.h | 2 +- src/devices/bus/vip/vp590.cpp | 2 +- src/devices/bus/vip/vp590.h | 2 +- src/devices/bus/vip/vp595.cpp | 2 +- src/devices/bus/vip/vp595.h | 2 +- src/devices/bus/vip/vp620.cpp | 2 +- src/devices/bus/vip/vp620.h | 2 +- src/devices/bus/vip/vp700.cpp | 2 +- src/devices/bus/vip/vp700.h | 2 +- src/devices/bus/vtech/ioexp/ioexp.cpp | 2 +- src/devices/bus/vtech/ioexp/ioexp.h | 2 +- src/devices/bus/vtech/ioexp/joystick.cpp | 2 +- src/devices/bus/vtech/ioexp/joystick.h | 2 +- src/devices/bus/vtech/ioexp/printer.cpp | 2 +- src/devices/bus/vtech/ioexp/printer.h | 2 +- src/devices/bus/vtech/memexp/floppy.cpp | 2 +- src/devices/bus/vtech/memexp/floppy.h | 2 +- src/devices/bus/vtech/memexp/memexp.cpp | 2 +- src/devices/bus/vtech/memexp/memexp.h | 2 +- src/devices/bus/vtech/memexp/memory.cpp | 8 +- src/devices/bus/vtech/memexp/memory.h | 8 +- src/devices/bus/vtech/memexp/rs232.cpp | 2 +- src/devices/bus/vtech/memexp/rs232.h | 2 +- src/devices/bus/vtech/memexp/wordpro.cpp | 2 +- src/devices/bus/vtech/memexp/wordpro.h | 2 +- src/devices/bus/wangpc/emb.cpp | 2 +- src/devices/bus/wangpc/emb.h | 2 +- src/devices/bus/wangpc/lic.cpp | 2 +- src/devices/bus/wangpc/lic.h | 2 +- src/devices/bus/wangpc/lvc.cpp | 2 +- src/devices/bus/wangpc/lvc.h | 2 +- src/devices/bus/wangpc/mcc.cpp | 2 +- src/devices/bus/wangpc/mcc.h | 2 +- src/devices/bus/wangpc/mvc.cpp | 2 +- src/devices/bus/wangpc/mvc.h | 2 +- src/devices/bus/wangpc/rtc.cpp | 2 +- src/devices/bus/wangpc/rtc.h | 2 +- src/devices/bus/wangpc/tig.cpp | 2 +- src/devices/bus/wangpc/tig.h | 2 +- src/devices/bus/wangpc/wangpc.cpp | 4 +- src/devices/bus/wangpc/wangpc.h | 4 +- src/devices/bus/wangpc/wdc.cpp | 2 +- src/devices/bus/wangpc/wdc.h | 2 +- src/devices/bus/wswan/rom.cpp | 8 +- src/devices/bus/wswan/rom.h | 8 +- src/devices/bus/wswan/slot.cpp | 4 +- src/devices/bus/wswan/slot.h | 4 +- src/devices/bus/x68k/x68k_neptunex.cpp | 2 +- src/devices/bus/x68k/x68k_neptunex.h | 2 +- src/devices/bus/x68k/x68k_scsiext.cpp | 2 +- src/devices/bus/x68k/x68k_scsiext.h | 2 +- src/devices/bus/x68k/x68kexp.cpp | 2 +- src/devices/bus/x68k/x68kexp.h | 2 +- src/devices/bus/z88/flash.cpp | 2 +- src/devices/bus/z88/flash.h | 2 +- src/devices/bus/z88/ram.cpp | 12 +- src/devices/bus/z88/ram.h | 10 +- src/devices/bus/z88/rom.cpp | 10 +- src/devices/bus/z88/rom.h | 8 +- src/devices/bus/z88/z88.cpp | 2 +- src/devices/bus/z88/z88.h | 2 +- src/devices/cpu/8x300/8x300.cpp | 2 +- src/devices/cpu/8x300/8x300.h | 2 +- src/devices/cpu/adsp2100/adsp2100.cpp | 16 +- src/devices/cpu/adsp2100/adsp2100.h | 16 +- src/devices/cpu/alph8201/alph8201.cpp | 6 +- src/devices/cpu/alph8201/alph8201.h | 6 +- src/devices/cpu/alto2/alto2cpu.cpp | 2 +- src/devices/cpu/alto2/alto2cpu.h | 2 +- src/devices/cpu/am29000/am29000.cpp | 2 +- src/devices/cpu/am29000/am29000.h | 2 +- src/devices/cpu/amis2000/amis2000.cpp | 6 +- src/devices/cpu/amis2000/amis2000.h | 8 +- src/devices/cpu/amis2000/amis2000op.cpp | 6 +- src/devices/cpu/apexc/apexc.cpp | 2 +- src/devices/cpu/apexc/apexc.h | 2 +- src/devices/cpu/arc/arc.cpp | 2 +- src/devices/cpu/arc/arc.h | 2 +- src/devices/cpu/arcompact/arcompact.cpp | 2 +- src/devices/cpu/arcompact/arcompact.h | 2 +- src/devices/cpu/arm/arm.cpp | 6 +- src/devices/cpu/arm/arm.h | 6 +- src/devices/cpu/arm7/arm7.cpp | 16 +- src/devices/cpu/arm7/arm7.h | 16 +- src/devices/cpu/arm7/lpc210x.cpp | 2 +- src/devices/cpu/arm7/lpc210x.h | 2 +- src/devices/cpu/asap/asap.cpp | 2 +- src/devices/cpu/asap/asap.h | 2 +- src/devices/cpu/avr8/avr8.cpp | 11 +- src/devices/cpu/avr8/avr8.h | 14 +- src/devices/cpu/ccpu/ccpu.cpp | 2 +- src/devices/cpu/ccpu/ccpu.h | 2 +- src/devices/cpu/cop400/cop400.cpp | 28 +- src/devices/cpu/cop400/cop400.h | 28 +- src/devices/cpu/cosmac/cosmac.cpp | 8 +- src/devices/cpu/cosmac/cosmac.h | 6 +- src/devices/cpu/cp1610/cp1610.cpp | 2 +- src/devices/cpu/cp1610/cp1610.h | 2 +- src/devices/cpu/cubeqcpu/cubeqcpu.cpp | 9 +- src/devices/cpu/cubeqcpu/cubeqcpu.h | 10 +- src/devices/cpu/dsp16/dsp16.cpp | 2 +- src/devices/cpu/dsp16/dsp16.h | 2 +- src/devices/cpu/dsp32/dsp32.cpp | 2 +- src/devices/cpu/dsp32/dsp32.h | 2 +- src/devices/cpu/dsp56k/dsp56k.cpp | 2 +- src/devices/cpu/dsp56k/dsp56k.h | 2 +- src/devices/cpu/dsp56k/dsp56pcu.cpp | 6 +- src/devices/cpu/dsp56k/dsp56pcu.h | 2 +- src/devices/cpu/e0c6200/e0c6200.cpp | 2 +- src/devices/cpu/e0c6200/e0c6200.h | 2 +- src/devices/cpu/e0c6200/e0c6s46.cpp | 12 +- src/devices/cpu/e0c6200/e0c6s46.h | 2 +- src/devices/cpu/e132xs/e132xs.cpp | 30 +- src/devices/cpu/e132xs/e132xs.h | 30 +- src/devices/cpu/es5510/es5510.cpp | 2 +- src/devices/cpu/es5510/es5510.h | 2 +- src/devices/cpu/esrip/esrip.cpp | 2 +- src/devices/cpu/esrip/esrip.h | 2 +- src/devices/cpu/f8/f8.cpp | 2 +- src/devices/cpu/f8/f8.h | 2 +- src/devices/cpu/g65816/g65816.cpp | 6 +- src/devices/cpu/g65816/g65816.h | 6 +- src/devices/cpu/h6280/h6280.cpp | 2 +- src/devices/cpu/h6280/h6280.h | 2 +- src/devices/cpu/h8/h8.cpp | 8 +- src/devices/cpu/h8/h8.h | 2 +- src/devices/cpu/h8/h83002.cpp | 4 +- src/devices/cpu/h8/h83002.h | 2 +- src/devices/cpu/h8/h83006.cpp | 8 +- src/devices/cpu/h8/h83006.h | 6 +- src/devices/cpu/h8/h83008.cpp | 4 +- src/devices/cpu/h8/h83008.h | 2 +- src/devices/cpu/h8/h83048.cpp | 12 +- src/devices/cpu/h8/h83048.h | 10 +- src/devices/cpu/h8/h83337.cpp | 16 +- src/devices/cpu/h8/h83337.h | 8 +- src/devices/cpu/h8/h8_adc.cpp | 38 +- src/devices/cpu/h8/h8_adc.h | 18 +- src/devices/cpu/h8/h8_intc.cpp | 30 +- src/devices/cpu/h8/h8_intc.h | 10 +- src/devices/cpu/h8/h8_port.cpp | 18 +- src/devices/cpu/h8/h8_port.h | 2 +- src/devices/cpu/h8/h8_sci.cpp | 76 ++-- src/devices/cpu/h8/h8_sci.h | 6 +- src/devices/cpu/h8/h8_timer16.cpp | 104 ++--- src/devices/cpu/h8/h8_timer16.h | 21 +- src/devices/cpu/h8/h8_timer8.cpp | 38 +- src/devices/cpu/h8/h8_timer8.h | 13 +- src/devices/cpu/h8/h8h.cpp | 2 +- src/devices/cpu/h8/h8h.h | 2 +- src/devices/cpu/h8/h8s2000.cpp | 2 +- src/devices/cpu/h8/h8s2000.h | 2 +- src/devices/cpu/h8/h8s2245.cpp | 12 +- src/devices/cpu/h8/h8s2245.h | 10 +- src/devices/cpu/h8/h8s2320.cpp | 22 +- src/devices/cpu/h8/h8s2320.h | 20 +- src/devices/cpu/h8/h8s2357.cpp | 16 +- src/devices/cpu/h8/h8s2357.h | 14 +- src/devices/cpu/h8/h8s2600.cpp | 2 +- src/devices/cpu/h8/h8s2600.h | 2 +- src/devices/cpu/h8/h8s2655.cpp | 8 +- src/devices/cpu/h8/h8s2655.h | 6 +- src/devices/cpu/hcd62121/hcd62121.cpp | 2 +- src/devices/cpu/hcd62121/hcd62121.h | 2 +- src/devices/cpu/hd61700/hd61700.cpp | 2 +- src/devices/cpu/hd61700/hd61700.h | 2 +- src/devices/cpu/hmcs40/hmcs40.cpp | 44 +-- src/devices/cpu/hmcs40/hmcs40.h | 32 +- src/devices/cpu/hmcs40/hmcs40op.cpp | 2 +- src/devices/cpu/hphybrid/hphybrid.cpp | 6 +- src/devices/cpu/hphybrid/hphybrid.h | 6 +- src/devices/cpu/i386/i386.cpp | 24 +- src/devices/cpu/i386/i386.h | 24 +- src/devices/cpu/i4004/i4004.cpp | 2 +- src/devices/cpu/i4004/i4004.h | 2 +- src/devices/cpu/i8008/i8008.cpp | 2 +- src/devices/cpu/i8008/i8008.h | 2 +- src/devices/cpu/i8085/i8085.cpp | 8 +- src/devices/cpu/i8085/i8085.h | 8 +- src/devices/cpu/i8089/i8089.cpp | 2 +- src/devices/cpu/i8089/i8089.h | 2 +- src/devices/cpu/i8089/i8089_channel.cpp | 64 ++-- src/devices/cpu/i8089/i8089_channel.h | 2 +- src/devices/cpu/i8089/i8089_ops.cpp | 2 +- src/devices/cpu/i86/i186.cpp | 12 +- src/devices/cpu/i86/i186.h | 6 +- src/devices/cpu/i86/i286.cpp | 14 +- src/devices/cpu/i86/i286.h | 2 +- src/devices/cpu/i86/i86.cpp | 24 +- src/devices/cpu/i86/i86.h | 8 +- src/devices/cpu/i860/i860.cpp | 2 +- src/devices/cpu/i860/i860.h | 2 +- src/devices/cpu/i860/i860dec.inc | 4 +- src/devices/cpu/i960/i960.cpp | 2 +- src/devices/cpu/i960/i960.h | 2 +- src/devices/cpu/ie15/ie15.cpp | 2 +- src/devices/cpu/ie15/ie15.h | 2 +- src/devices/cpu/jaguar/jaguar.cpp | 6 +- src/devices/cpu/jaguar/jaguar.h | 6 +- src/devices/cpu/lc8670/lc8670.cpp | 26 +- src/devices/cpu/lc8670/lc8670.h | 2 +- src/devices/cpu/lh5801/lh5801.cpp | 2 +- src/devices/cpu/lh5801/lh5801.h | 2 +- src/devices/cpu/lr35902/lr35902.cpp | 2 +- src/devices/cpu/lr35902/lr35902.h | 2 +- src/devices/cpu/m37710/m37710.cpp | 10 +- src/devices/cpu/m37710/m37710.h | 10 +- src/devices/cpu/m6502/deco16.cpp | 2 +- src/devices/cpu/m6502/deco16.h | 2 +- src/devices/cpu/m6502/m3745x.cpp | 6 +- src/devices/cpu/m6502/m3745x.h | 6 +- src/devices/cpu/m6502/m4510.cpp | 2 +- src/devices/cpu/m6502/m4510.h | 2 +- src/devices/cpu/m6502/m5074x.cpp | 10 +- src/devices/cpu/m6502/m5074x.h | 10 +- src/devices/cpu/m6502/m6502.cpp | 4 +- src/devices/cpu/m6502/m6502.h | 4 +- src/devices/cpu/m6502/m6504.cpp | 2 +- src/devices/cpu/m6502/m6504.h | 2 +- src/devices/cpu/m6502/m6507.cpp | 2 +- src/devices/cpu/m6502/m6507.h | 2 +- src/devices/cpu/m6502/m6509.cpp | 2 +- src/devices/cpu/m6502/m6509.h | 2 +- src/devices/cpu/m6502/m6510.cpp | 4 +- src/devices/cpu/m6502/m6510.h | 4 +- src/devices/cpu/m6502/m6510t.cpp | 2 +- src/devices/cpu/m6502/m6510t.h | 2 +- src/devices/cpu/m6502/m65c02.cpp | 4 +- src/devices/cpu/m6502/m65c02.h | 4 +- src/devices/cpu/m6502/m65ce02.cpp | 4 +- src/devices/cpu/m6502/m65ce02.h | 4 +- src/devices/cpu/m6502/m65sc02.cpp | 2 +- src/devices/cpu/m6502/m65sc02.h | 2 +- src/devices/cpu/m6502/m740.cpp | 4 +- src/devices/cpu/m6502/m740.h | 4 +- src/devices/cpu/m6502/m7501.cpp | 2 +- src/devices/cpu/m6502/m7501.h | 2 +- src/devices/cpu/m6502/m8502.cpp | 2 +- src/devices/cpu/m6502/m8502.h | 2 +- src/devices/cpu/m6502/n2a03.cpp | 2 +- src/devices/cpu/m6502/n2a03.h | 2 +- src/devices/cpu/m6502/odeco16.lst | 20 +- src/devices/cpu/m6502/r65c02.cpp | 4 +- src/devices/cpu/m6502/r65c02.h | 4 +- src/devices/cpu/m6800/m6800.cpp | 72 ++-- src/devices/cpu/m6800/m6800.h | 28 +- src/devices/cpu/m68000/m68000.h | 48 +-- src/devices/cpu/m68000/m68kcpu.cpp | 48 +-- src/devices/cpu/m68000/m68kops.cpp | 28 +- src/devices/cpu/m6805/m6805.cpp | 2 +- src/devices/cpu/m6805/m6805.h | 10 +- src/devices/cpu/m6809/hd6309.cpp | 2 +- src/devices/cpu/m6809/hd6309.h | 2 +- src/devices/cpu/m6809/konami.cpp | 2 +- src/devices/cpu/m6809/konami.h | 2 +- src/devices/cpu/m6809/m6809.cpp | 6 +- src/devices/cpu/m6809/m6809.h | 6 +- src/devices/cpu/mb86233/mb86233.cpp | 2 +- src/devices/cpu/mb86233/mb86233.h | 2 +- src/devices/cpu/mb86235/mb86235.cpp | 2 +- src/devices/cpu/mb86235/mb86235.h | 2 +- src/devices/cpu/mb88xx/mb88xx.cpp | 16 +- src/devices/cpu/mb88xx/mb88xx.h | 16 +- src/devices/cpu/mc68hc11/mc68hc11.cpp | 2 +- src/devices/cpu/mc68hc11/mc68hc11.h | 2 +- src/devices/cpu/mcs48/mcs48.cpp | 42 +- src/devices/cpu/mcs48/mcs48.h | 42 +- src/devices/cpu/mcs51/mcs51.cpp | 46 +-- src/devices/cpu/mcs51/mcs51.h | 36 +- src/devices/cpu/mcs51/mcs51ops.inc | 2 +- src/devices/cpu/mcs96/i8x9x.cpp | 66 ++-- src/devices/cpu/mcs96/i8x9x.h | 6 +- src/devices/cpu/mcs96/i8xc196.cpp | 8 +- src/devices/cpu/mcs96/i8xc196.h | 2 +- src/devices/cpu/mcs96/mcs96.cpp | 38 +- src/devices/cpu/mcs96/mcs96.h | 2 +- src/devices/cpu/melps4/m58846.cpp | 2 +- src/devices/cpu/melps4/m58846.h | 2 +- src/devices/cpu/melps4/melps4.h | 2 +- src/devices/cpu/melps4/melps4op.cpp | 2 +- src/devices/cpu/minx/minx.cpp | 2 +- src/devices/cpu/minx/minx.h | 2 +- src/devices/cpu/mips/mips3.cpp | 2 +- src/devices/cpu/mips/mips3.h | 34 +- src/devices/cpu/mips/r3000.cpp | 12 +- src/devices/cpu/mips/r3000.h | 12 +- src/devices/cpu/mn10200/mn10200.cpp | 2 +- src/devices/cpu/mn10200/mn10200.h | 4 +- src/devices/cpu/nec/nec.cpp | 10 +- src/devices/cpu/nec/nec.h | 10 +- src/devices/cpu/nec/v25.cpp | 6 +- src/devices/cpu/nec/v25.h | 6 +- src/devices/cpu/nec/v53.cpp | 6 +- src/devices/cpu/nec/v53.h | 6 +- src/devices/cpu/patinhofeio/patinho_feio.cpp | 2 +- src/devices/cpu/patinhofeio/patinho_feio.h | 2 +- src/devices/cpu/pdp1/pdp1.cpp | 2 +- src/devices/cpu/pdp1/pdp1.h | 2 +- src/devices/cpu/pdp1/tx0.cpp | 6 +- src/devices/cpu/pdp1/tx0.h | 6 +- src/devices/cpu/pdp8/pdp8.cpp | 2 +- src/devices/cpu/pdp8/pdp8.h | 2 +- src/devices/cpu/pic16c5x/pic16c5x.cpp | 12 +- src/devices/cpu/pic16c5x/pic16c5x.h | 12 +- src/devices/cpu/pic16c62x/pic16c62x.cpp | 14 +- src/devices/cpu/pic16c62x/pic16c62x.h | 16 +- src/devices/cpu/powerpc/ppc.h | 28 +- src/devices/cpu/powerpc/ppccom.cpp | 28 +- src/devices/cpu/pps4/pps4.cpp | 2 +- src/devices/cpu/pps4/pps4.h | 2 +- src/devices/cpu/psx/dma.cpp | 2 +- src/devices/cpu/psx/dma.h | 2 +- src/devices/cpu/psx/irq.cpp | 2 +- src/devices/cpu/psx/irq.h | 2 +- src/devices/cpu/psx/mdec.cpp | 2 +- src/devices/cpu/psx/mdec.h | 2 +- src/devices/cpu/psx/psx.cpp | 14 +- src/devices/cpu/psx/psx.h | 14 +- src/devices/cpu/psx/rcnt.cpp | 2 +- src/devices/cpu/psx/rcnt.h | 2 +- src/devices/cpu/psx/sio.cpp | 32 +- src/devices/cpu/psx/sio.h | 6 +- src/devices/cpu/rsp/rsp.cpp | 2 +- src/devices/cpu/rsp/rsp.h | 2 +- src/devices/cpu/s2650/s2650.cpp | 2 +- src/devices/cpu/s2650/s2650.h | 2 +- src/devices/cpu/saturn/satops.inc | 24 +- src/devices/cpu/saturn/sattable.inc | 8 +- src/devices/cpu/saturn/saturn.cpp | 10 +- src/devices/cpu/saturn/saturn.h | 2 +- src/devices/cpu/sc61860/sc61860.cpp | 2 +- src/devices/cpu/sc61860/sc61860.h | 2 +- src/devices/cpu/scmp/scmp.cpp | 6 +- src/devices/cpu/scmp/scmp.h | 6 +- src/devices/cpu/score/score.cpp | 8 +- src/devices/cpu/score/score.h | 2 +- src/devices/cpu/scudsp/scudsp.cpp | 2 +- src/devices/cpu/scudsp/scudsp.h | 2 +- src/devices/cpu/se3208/se3208.cpp | 2 +- src/devices/cpu/se3208/se3208.h | 2 +- src/devices/cpu/sh2/sh2.cpp | 18 +- src/devices/cpu/sh2/sh2.h | 8 +- src/devices/cpu/sh2/sh2comn.cpp | 18 +- src/devices/cpu/sh4/sh3comn.cpp | 144 +++---- src/devices/cpu/sh4/sh4.cpp | 14 +- src/devices/cpu/sh4/sh4.h | 14 +- src/devices/cpu/sh4/sh4comn.cpp | 22 +- src/devices/cpu/sh4/sh4dmac.cpp | 2 +- src/devices/cpu/sharc/sharc.cpp | 2 +- src/devices/cpu/sharc/sharc.h | 2 +- src/devices/cpu/sm510/sm510.cpp | 2 +- src/devices/cpu/sm510/sm510.h | 10 +- src/devices/cpu/sm510/sm510core.cpp | 2 +- src/devices/cpu/sm510/sm510op.cpp | 2 +- src/devices/cpu/sm510/sm511core.cpp | 6 +- src/devices/cpu/sm8500/sm8500.cpp | 2 +- src/devices/cpu/sm8500/sm8500.h | 2 +- src/devices/cpu/spc700/spc700.cpp | 2 +- src/devices/cpu/spc700/spc700.h | 2 +- src/devices/cpu/ssem/ssem.cpp | 2 +- src/devices/cpu/ssem/ssem.h | 2 +- src/devices/cpu/ssp1601/ssp1601.cpp | 2 +- src/devices/cpu/ssp1601/ssp1601.h | 2 +- src/devices/cpu/superfx/superfx.cpp | 2 +- src/devices/cpu/superfx/superfx.h | 2 +- src/devices/cpu/t11/t11.cpp | 6 +- src/devices/cpu/t11/t11.h | 6 +- src/devices/cpu/tlcs90/tlcs90.cpp | 10 +- src/devices/cpu/tlcs90/tlcs90.h | 10 +- src/devices/cpu/tlcs900/tlcs900.cpp | 6 +- src/devices/cpu/tlcs900/tlcs900.h | 6 +- src/devices/cpu/tms0980/tms0980.cpp | 48 +-- src/devices/cpu/tms0980/tms0980.h | 50 +-- src/devices/cpu/tms32010/tms32010.cpp | 8 +- src/devices/cpu/tms32010/tms32010.h | 8 +- src/devices/cpu/tms32025/tms32025.cpp | 6 +- src/devices/cpu/tms32025/tms32025.h | 6 +- src/devices/cpu/tms32031/tms32031.cpp | 6 +- src/devices/cpu/tms32031/tms32031.h | 6 +- src/devices/cpu/tms32051/tms32051.cpp | 6 +- src/devices/cpu/tms32051/tms32051.h | 6 +- src/devices/cpu/tms32082/tms32082.cpp | 4 +- src/devices/cpu/tms32082/tms32082.h | 4 +- src/devices/cpu/tms34010/tms34010.cpp | 22 +- src/devices/cpu/tms34010/tms34010.h | 6 +- src/devices/cpu/tms57002/tms57002.cpp | 2 +- src/devices/cpu/tms57002/tms57002.h | 2 +- src/devices/cpu/tms7000/tms7000.cpp | 32 +- src/devices/cpu/tms7000/tms7000.h | 30 +- src/devices/cpu/tms7000/tms70op.inc | 2 +- src/devices/cpu/tms9900/ti990_10.cpp | 2 +- src/devices/cpu/tms9900/ti990_10.h | 2 +- src/devices/cpu/tms9900/tms9900.cpp | 4 +- src/devices/cpu/tms9900/tms9900.h | 4 +- src/devices/cpu/tms9900/tms9980a.cpp | 2 +- src/devices/cpu/tms9900/tms9980a.h | 2 +- src/devices/cpu/tms9900/tms9995.cpp | 8 +- src/devices/cpu/tms9900/tms9995.h | 6 +- src/devices/cpu/ucom4/ucom4.cpp | 16 +- src/devices/cpu/ucom4/ucom4.h | 10 +- src/devices/cpu/ucom4/ucom4op.cpp | 10 +- src/devices/cpu/unsp/unsp.cpp | 2 +- src/devices/cpu/unsp/unsp.h | 2 +- src/devices/cpu/upd7725/upd7725.cpp | 6 +- src/devices/cpu/upd7725/upd7725.h | 6 +- src/devices/cpu/upd7810/upd7810.cpp | 14 +- src/devices/cpu/upd7810/upd7810.h | 14 +- src/devices/cpu/upd7810/upd7810_opcodes.cpp | 12 +- src/devices/cpu/v30mz/v30mz.cpp | 64 ++-- src/devices/cpu/v30mz/v30mz.h | 2 +- src/devices/cpu/v60/v60.cpp | 6 +- src/devices/cpu/v60/v60.h | 6 +- src/devices/cpu/v810/v810.cpp | 2 +- src/devices/cpu/v810/v810.h | 2 +- src/devices/cpu/z180/z180.cpp | 298 +++++++-------- src/devices/cpu/z180/z180.h | 2 +- src/devices/cpu/z180/z180dd.inc | 2 +- src/devices/cpu/z180/z180ed.inc | 2 +- src/devices/cpu/z180/z180op.inc | 10 +- src/devices/cpu/z180/z180ops.h | 2 +- src/devices/cpu/z8/z8.cpp | 8 +- src/devices/cpu/z8/z8.h | 8 +- src/devices/cpu/z80/kl5c80a12.cpp | 2 +- src/devices/cpu/z80/kl5c80a12.h | 2 +- src/devices/cpu/z80/tmpz84c011.cpp | 2 +- src/devices/cpu/z80/tmpz84c011.h | 2 +- src/devices/cpu/z80/tmpz84c015.cpp | 2 +- src/devices/cpu/z80/tmpz84c015.h | 2 +- src/devices/cpu/z80/z80.cpp | 24 +- src/devices/cpu/z80/z80.h | 6 +- src/devices/cpu/z8000/z8000.cpp | 22 +- src/devices/cpu/z8000/z8000.h | 6 +- src/devices/cpu/z8000/z8000ops.inc | 30 +- src/devices/imagedev/bitbngr.cpp | 2 +- src/devices/imagedev/bitbngr.h | 2 +- src/devices/imagedev/cassette.cpp | 4 +- src/devices/imagedev/cassette.h | 2 +- src/devices/imagedev/chd_cd.cpp | 6 +- src/devices/imagedev/chd_cd.h | 4 +- src/devices/imagedev/diablo.cpp | 4 +- src/devices/imagedev/diablo.h | 2 +- src/devices/imagedev/flopdrv.cpp | 12 +- src/devices/imagedev/flopdrv.h | 4 +- src/devices/imagedev/floppy.cpp | 70 ++-- src/devices/imagedev/floppy.h | 8 +- src/devices/imagedev/harddriv.cpp | 6 +- src/devices/imagedev/harddriv.h | 4 +- src/devices/imagedev/mfmhd.cpp | 90 ++--- src/devices/imagedev/mfmhd.h | 12 +- src/devices/imagedev/midiin.cpp | 2 +- src/devices/imagedev/midiin.h | 2 +- src/devices/imagedev/midiout.cpp | 2 +- src/devices/imagedev/midiout.h | 2 +- src/devices/imagedev/printer.cpp | 2 +- src/devices/imagedev/printer.h | 2 +- src/devices/imagedev/snapquik.cpp | 6 +- src/devices/imagedev/snapquik.h | 6 +- src/devices/machine/40105.cpp | 2 +- src/devices/machine/40105.h | 2 +- src/devices/machine/53c7xx.cpp | 2 +- src/devices/machine/53c7xx.h | 2 +- src/devices/machine/53c810.cpp | 2 +- src/devices/machine/53c810.h | 2 +- src/devices/machine/64h156.cpp | 2 +- src/devices/machine/64h156.h | 2 +- src/devices/machine/6522via.cpp | 10 +- src/devices/machine/6522via.h | 2 +- src/devices/machine/6525tpi.cpp | 12 +- src/devices/machine/6525tpi.h | 2 +- src/devices/machine/6532riot.cpp | 2 +- src/devices/machine/6532riot.h | 2 +- src/devices/machine/6821pia.cpp | 74 ++-- src/devices/machine/6821pia.h | 2 +- src/devices/machine/68230pit.cpp | 4 +- src/devices/machine/68230pit.h | 4 +- src/devices/machine/68307.cpp | 2 +- src/devices/machine/68307.h | 2 +- src/devices/machine/68340.cpp | 2 +- src/devices/machine/68340.h | 2 +- src/devices/machine/6840ptm.cpp | 36 +- src/devices/machine/6840ptm.h | 2 +- src/devices/machine/6850acia.cpp | 28 +- src/devices/machine/6850acia.h | 4 +- src/devices/machine/68561mpcc.cpp | 2 +- src/devices/machine/68561mpcc.h | 2 +- src/devices/machine/7200fifo.cpp | 6 +- src/devices/machine/7200fifo.h | 2 +- src/devices/machine/74123.cpp | 12 +- src/devices/machine/74123.h | 2 +- src/devices/machine/74145.cpp | 2 +- src/devices/machine/74145.h | 2 +- src/devices/machine/74148.cpp | 2 +- src/devices/machine/74148.h | 7 +- src/devices/machine/74153.cpp | 2 +- src/devices/machine/74153.h | 2 +- src/devices/machine/74181.cpp | 2 +- src/devices/machine/74181.h | 2 +- src/devices/machine/7474.cpp | 2 +- src/devices/machine/7474.h | 2 +- src/devices/machine/8042kbdc.cpp | 2 +- src/devices/machine/8042kbdc.h | 2 +- src/devices/machine/8530scc.cpp | 2 +- src/devices/machine/8530scc.h | 2 +- src/devices/machine/aakart.cpp | 2 +- src/devices/machine/aakart.h | 2 +- src/devices/machine/adc0808.cpp | 2 +- src/devices/machine/adc0808.h | 2 +- src/devices/machine/adc083x.cpp | 44 +-- src/devices/machine/adc083x.h | 10 +- src/devices/machine/adc1038.cpp | 2 +- src/devices/machine/adc1038.h | 2 +- src/devices/machine/adc1213x.cpp | 8 +- src/devices/machine/adc1213x.h | 8 +- src/devices/machine/aicartc.cpp | 2 +- src/devices/machine/aicartc.h | 2 +- src/devices/machine/akiko.cpp | 4 +- src/devices/machine/akiko.h | 6 +- src/devices/machine/am53cf96.cpp | 2 +- src/devices/machine/am53cf96.h | 2 +- src/devices/machine/am9517a.cpp | 36 +- src/devices/machine/am9517a.h | 6 +- src/devices/machine/amigafdc.cpp | 2 +- src/devices/machine/amigafdc.h | 2 +- src/devices/machine/at28c16.cpp | 6 +- src/devices/machine/at28c16.h | 2 +- src/devices/machine/at29x.cpp | 68 ++-- src/devices/machine/at29x.h | 8 +- src/devices/machine/at45dbxx.cpp | 8 +- src/devices/machine/at45dbxx.h | 8 +- src/devices/machine/at_keybc.cpp | 2 +- src/devices/machine/at_keybc.h | 2 +- src/devices/machine/ataflash.cpp | 2 +- src/devices/machine/ataflash.h | 2 +- src/devices/machine/atahle.cpp | 50 +-- src/devices/machine/atahle.h | 2 +- src/devices/machine/ataintf.cpp | 6 +- src/devices/machine/ataintf.h | 6 +- src/devices/machine/atapicdr.cpp | 4 +- src/devices/machine/atapicdr.h | 4 +- src/devices/machine/atapihle.cpp | 2 +- src/devices/machine/atapihle.h | 2 +- src/devices/machine/ay31015.cpp | 6 +- src/devices/machine/ay31015.h | 6 +- src/devices/machine/bankdev.cpp | 2 +- src/devices/machine/bankdev.h | 2 +- src/devices/machine/bcreader.cpp | 2 +- src/devices/machine/bcreader.h | 2 +- src/devices/machine/buffer.cpp | 2 +- src/devices/machine/buffer.h | 2 +- src/devices/machine/cdp1852.cpp | 2 +- src/devices/machine/cdp1852.h | 2 +- src/devices/machine/cdp1871.cpp | 2 +- src/devices/machine/cdp1871.h | 2 +- src/devices/machine/clock.cpp | 2 +- src/devices/machine/clock.h | 2 +- src/devices/machine/com8116.cpp | 6 +- src/devices/machine/com8116.h | 2 +- src/devices/machine/corvushd.cpp | 2 +- src/devices/machine/corvushd.h | 2 +- src/devices/machine/cr511b.cpp | 2 +- src/devices/machine/cr511b.h | 2 +- src/devices/machine/cr589.cpp | 2 +- src/devices/machine/cr589.h | 2 +- src/devices/machine/cs4031.cpp | 10 +- src/devices/machine/cs4031.h | 18 +- src/devices/machine/cs8221.cpp | 8 +- src/devices/machine/cs8221.h | 14 +- src/devices/machine/diablo_hd.cpp | 4 +- src/devices/machine/diablo_hd.h | 2 +- src/devices/machine/dmac.cpp | 2 +- src/devices/machine/dmac.h | 2 +- src/devices/machine/dp8390.cpp | 6 +- src/devices/machine/dp8390.h | 6 +- src/devices/machine/ds1204.cpp | 8 +- src/devices/machine/ds1204.h | 2 +- src/devices/machine/ds128x.cpp | 2 +- src/devices/machine/ds128x.h | 2 +- src/devices/machine/ds1302.cpp | 20 +- src/devices/machine/ds1302.h | 2 +- src/devices/machine/ds1315.cpp | 2 +- src/devices/machine/ds1315.h | 2 +- src/devices/machine/ds2401.cpp | 8 +- src/devices/machine/ds2401.h | 2 +- src/devices/machine/ds2404.cpp | 2 +- src/devices/machine/ds2404.h | 2 +- src/devices/machine/ds75160a.cpp | 2 +- src/devices/machine/ds75160a.h | 2 +- src/devices/machine/ds75161a.cpp | 2 +- src/devices/machine/ds75161a.h | 2 +- src/devices/machine/e0516.cpp | 14 +- src/devices/machine/e0516.h | 2 +- src/devices/machine/e05a03.cpp | 2 +- src/devices/machine/e05a03.h | 2 +- src/devices/machine/e05a30.cpp | 2 +- src/devices/machine/e05a30.h | 2 +- src/devices/machine/eeprom.cpp | 10 +- src/devices/machine/eeprom.h | 2 +- src/devices/machine/eeprompar.cpp | 6 +- src/devices/machine/eeprompar.h | 6 +- src/devices/machine/eepromser.cpp | 10 +- src/devices/machine/eepromser.h | 10 +- src/devices/machine/er2055.cpp | 6 +- src/devices/machine/er2055.h | 2 +- src/devices/machine/f3853.cpp | 2 +- src/devices/machine/f3853.h | 2 +- src/devices/machine/fdc37c665gt.cpp | 2 +- src/devices/machine/fdc37c665gt.h | 2 +- src/devices/machine/gayle.cpp | 2 +- src/devices/machine/gayle.h | 2 +- src/devices/machine/hd63450.cpp | 3 +- src/devices/machine/hd63450.h | 6 +- src/devices/machine/hd64610.cpp | 24 +- src/devices/machine/hd64610.h | 2 +- src/devices/machine/hdc92x4.cpp | 422 ++++++++++----------- src/devices/machine/hdc92x4.h | 6 +- src/devices/machine/i2cmem.cpp | 8 +- src/devices/machine/i2cmem.h | 2 +- src/devices/machine/i6300esb.cpp | 116 +++--- src/devices/machine/i6300esb.h | 4 +- src/devices/machine/i80130.cpp | 2 +- src/devices/machine/i80130.h | 2 +- src/devices/machine/i8155.cpp | 44 +-- src/devices/machine/i8155.h | 2 +- src/devices/machine/i8212.cpp | 10 +- src/devices/machine/i8212.h | 2 +- src/devices/machine/i8214.cpp | 16 +- src/devices/machine/i8214.h | 2 +- src/devices/machine/i8243.cpp | 2 +- src/devices/machine/i8243.h | 2 +- src/devices/machine/i8251.cpp | 6 +- src/devices/machine/i8251.h | 6 +- src/devices/machine/i82541.cpp | 2 +- src/devices/machine/i82541.h | 2 +- src/devices/machine/i8255.cpp | 52 +-- src/devices/machine/i8255.h | 2 +- src/devices/machine/i8257.cpp | 12 +- src/devices/machine/i8257.h | 2 +- src/devices/machine/i8271.cpp | 28 +- src/devices/machine/i8271.h | 2 +- src/devices/machine/i8279.cpp | 8 +- src/devices/machine/i8279.h | 2 +- src/devices/machine/i82875p.cpp | 34 +- src/devices/machine/i82875p.h | 10 +- src/devices/machine/i8355.cpp | 6 +- src/devices/machine/i8355.h | 2 +- src/devices/machine/idectrl.cpp | 14 +- src/devices/machine/idectrl.h | 10 +- src/devices/machine/idehd.cpp | 6 +- src/devices/machine/idehd.h | 6 +- src/devices/machine/im6402.cpp | 22 +- src/devices/machine/im6402.h | 2 +- src/devices/machine/ins8154.cpp | 12 +- src/devices/machine/ins8154.h | 2 +- src/devices/machine/ins8250.cpp | 10 +- src/devices/machine/ins8250.h | 10 +- src/devices/machine/intelfsh.cpp | 71 ++-- src/devices/machine/intelfsh.h | 60 +-- src/devices/machine/jvsdev.cpp | 4 +- src/devices/machine/jvsdev.h | 2 +- src/devices/machine/jvshost.cpp | 2 +- src/devices/machine/jvshost.h | 2 +- src/devices/machine/k033906.cpp | 4 +- src/devices/machine/k033906.h | 6 +- src/devices/machine/k053252.cpp | 7 +- src/devices/machine/k053252.h | 6 +- src/devices/machine/k056230.cpp | 2 +- src/devices/machine/k056230.h | 4 +- src/devices/machine/kb3600.cpp | 2 +- src/devices/machine/kb3600.h | 2 +- src/devices/machine/keyboard.cpp | 4 +- src/devices/machine/keyboard.h | 4 +- src/devices/machine/kr2376.cpp | 2 +- src/devices/machine/kr2376.h | 2 +- src/devices/machine/laserdsc.cpp | 10 +- src/devices/machine/laserdsc.h | 4 +- src/devices/machine/latch.cpp | 2 +- src/devices/machine/latch.h | 2 +- src/devices/machine/latch8.cpp | 18 +- src/devices/machine/latch8.h | 2 +- src/devices/machine/lc89510.cpp | 2 +- src/devices/machine/lc89510.h | 2 +- src/devices/machine/ldpr8210.cpp | 6 +- src/devices/machine/ldpr8210.h | 6 +- src/devices/machine/ldstub.h | 6 +- src/devices/machine/ldv1000.cpp | 2 +- src/devices/machine/ldv1000.h | 2 +- src/devices/machine/ldvp931.cpp | 2 +- src/devices/machine/ldvp931.h | 2 +- src/devices/machine/legscsi.cpp | 14 +- src/devices/machine/legscsi.h | 4 +- src/devices/machine/lh5810.cpp | 2 +- src/devices/machine/lh5810.h | 2 +- src/devices/machine/linflash.cpp | 8 +- src/devices/machine/linflash.h | 8 +- src/devices/machine/lpc-acpi.cpp | 54 +-- src/devices/machine/lpc-acpi.h | 2 +- src/devices/machine/lpc-pit.cpp | 8 +- src/devices/machine/lpc-pit.h | 2 +- src/devices/machine/lpc-rtc.cpp | 6 +- src/devices/machine/lpc-rtc.h | 2 +- src/devices/machine/lpc.cpp | 2 +- src/devices/machine/lpc.h | 2 +- src/devices/machine/lpci.cpp | 9 +- src/devices/machine/lpci.h | 6 +- src/devices/machine/m6m80011ap.cpp | 2 +- src/devices/machine/m6m80011ap.h | 2 +- src/devices/machine/mb14241.cpp | 2 +- src/devices/machine/mb14241.h | 2 +- src/devices/machine/mb3773.cpp | 2 +- src/devices/machine/mb3773.h | 2 +- src/devices/machine/mb8421.cpp | 2 +- src/devices/machine/mb8421.h | 2 +- src/devices/machine/mb87078.cpp | 2 +- src/devices/machine/mb87078.h | 2 +- src/devices/machine/mb8795.cpp | 34 +- src/devices/machine/mb8795.h | 2 +- src/devices/machine/mb89352.cpp | 2 +- src/devices/machine/mb89352.h | 2 +- src/devices/machine/mb89363b.cpp | 2 +- src/devices/machine/mb89363b.h | 2 +- src/devices/machine/mb89371.cpp | 2 +- src/devices/machine/mb89371.h | 2 +- src/devices/machine/mc146818.cpp | 4 +- src/devices/machine/mc146818.h | 4 +- src/devices/machine/mc2661.cpp | 16 +- src/devices/machine/mc2661.h | 2 +- src/devices/machine/mc68328.cpp | 2 +- src/devices/machine/mc68328.h | 4 +- src/devices/machine/mc6843.cpp | 2 +- src/devices/machine/mc6843.h | 2 +- src/devices/machine/mc6846.cpp | 2 +- src/devices/machine/mc6846.h | 2 +- src/devices/machine/mc6852.cpp | 10 +- src/devices/machine/mc6852.h | 2 +- src/devices/machine/mc6854.cpp | 2 +- src/devices/machine/mc6854.h | 2 +- src/devices/machine/mc68681.cpp | 22 +- src/devices/machine/mc68681.h | 4 +- src/devices/machine/mc68901.cpp | 124 +++--- src/devices/machine/mc68901.h | 2 +- src/devices/machine/mccs1850.cpp | 30 +- src/devices/machine/mccs1850.h | 2 +- src/devices/machine/mcf5206e.cpp | 2 +- src/devices/machine/mcf5206e.h | 2 +- src/devices/machine/microtch.cpp | 2 +- src/devices/machine/microtch.h | 2 +- src/devices/machine/mm58167.cpp | 2 +- src/devices/machine/mm58167.h | 2 +- src/devices/machine/mm58274c.cpp | 2 +- src/devices/machine/mm58274c.h | 2 +- src/devices/machine/mm74c922.cpp | 10 +- src/devices/machine/mm74c922.h | 2 +- src/devices/machine/mos6526.cpp | 10 +- src/devices/machine/mos6526.h | 10 +- src/devices/machine/mos6529.cpp | 2 +- src/devices/machine/mos6529.h | 2 +- src/devices/machine/mos6530.cpp | 2 +- src/devices/machine/mos6530.h | 2 +- src/devices/machine/mos6530n.cpp | 36 +- src/devices/machine/mos6530n.h | 6 +- src/devices/machine/mos6551.cpp | 26 +- src/devices/machine/mos6551.h | 2 +- src/devices/machine/mos6702.cpp | 2 +- src/devices/machine/mos6702.h | 2 +- src/devices/machine/mos8706.cpp | 2 +- src/devices/machine/mos8706.h | 2 +- src/devices/machine/mos8722.cpp | 6 +- src/devices/machine/mos8722.h | 2 +- src/devices/machine/mos8726.cpp | 2 +- src/devices/machine/mos8726.h | 2 +- src/devices/machine/mpu401.cpp | 2 +- src/devices/machine/mpu401.h | 2 +- src/devices/machine/msm5832.cpp | 20 +- src/devices/machine/msm5832.h | 2 +- src/devices/machine/msm58321.cpp | 26 +- src/devices/machine/msm58321.h | 2 +- src/devices/machine/msm6242.cpp | 2 +- src/devices/machine/msm6242.h | 2 +- src/devices/machine/ncr5380.cpp | 2 +- src/devices/machine/ncr5380.h | 2 +- src/devices/machine/ncr5380n.cpp | 22 +- src/devices/machine/ncr5380n.h | 2 +- src/devices/machine/ncr5390.cpp | 40 +- src/devices/machine/ncr5390.h | 2 +- src/devices/machine/ncr539x.cpp | 2 +- src/devices/machine/ncr539x.h | 2 +- src/devices/machine/netlist.cpp | 34 +- src/devices/machine/netlist.h | 18 +- src/devices/machine/nmc9306.cpp | 26 +- src/devices/machine/nmc9306.h | 2 +- src/devices/machine/nsc810.cpp | 70 ++-- src/devices/machine/nsc810.h | 2 +- src/devices/machine/nscsi_bus.cpp | 28 +- src/devices/machine/nscsi_bus.h | 8 +- src/devices/machine/nscsi_cb.cpp | 2 +- src/devices/machine/nscsi_cb.h | 2 +- src/devices/machine/nscsi_cd.cpp | 20 +- src/devices/machine/nscsi_cd.h | 2 +- src/devices/machine/nscsi_hd.cpp | 30 +- src/devices/machine/nscsi_hd.h | 4 +- src/devices/machine/nscsi_s1410.cpp | 6 +- src/devices/machine/nscsi_s1410.h | 2 +- src/devices/machine/nvram.cpp | 6 +- src/devices/machine/nvram.h | 2 +- src/devices/machine/pc_fdc.cpp | 12 +- src/devices/machine/pc_fdc.h | 6 +- src/devices/machine/pc_lpt.cpp | 4 +- src/devices/machine/pc_lpt.h | 2 +- src/devices/machine/pccard.cpp | 2 +- src/devices/machine/pccard.h | 2 +- src/devices/machine/pcf8593.cpp | 2 +- src/devices/machine/pcf8593.h | 2 +- src/devices/machine/pci-apic.cpp | 2 +- src/devices/machine/pci-apic.h | 2 +- src/devices/machine/pci-sata.cpp | 2 +- src/devices/machine/pci-sata.h | 2 +- src/devices/machine/pci-smbus.cpp | 34 +- src/devices/machine/pci-smbus.h | 2 +- src/devices/machine/pci-usb.cpp | 4 +- src/devices/machine/pci-usb.h | 4 +- src/devices/machine/pci.cpp | 86 ++--- src/devices/machine/pci.h | 14 +- src/devices/machine/pci9050.cpp | 2 +- src/devices/machine/pci9050.h | 2 +- src/devices/machine/pckeybrd.cpp | 6 +- src/devices/machine/pckeybrd.h | 6 +- src/devices/machine/pdc.cpp | 2 +- src/devices/machine/pdc.h | 2 +- src/devices/machine/pic8259.cpp | 24 +- src/devices/machine/pic8259.h | 2 +- src/devices/machine/pit8253.cpp | 6 +- src/devices/machine/pit8253.h | 6 +- src/devices/machine/pla.cpp | 4 +- src/devices/machine/pla.h | 2 +- src/devices/machine/r10696.cpp | 2 +- src/devices/machine/r10696.h | 2 +- src/devices/machine/r10788.cpp | 2 +- src/devices/machine/r10788.h | 2 +- src/devices/machine/ra17xx.cpp | 2 +- src/devices/machine/ra17xx.h | 2 +- src/devices/machine/ram.cpp | 6 +- src/devices/machine/ram.h | 2 +- src/devices/machine/rf5c296.cpp | 2 +- src/devices/machine/rf5c296.h | 2 +- src/devices/machine/roc10937.cpp | 10 +- src/devices/machine/roc10937.h | 10 +- src/devices/machine/rp5c01.cpp | 24 +- src/devices/machine/rp5c01.h | 2 +- src/devices/machine/rp5c15.cpp | 24 +- src/devices/machine/rp5c15.h | 2 +- src/devices/machine/rp5h01.cpp | 2 +- src/devices/machine/rp5h01.h | 2 +- src/devices/machine/rtc4543.cpp | 12 +- src/devices/machine/rtc4543.h | 2 +- src/devices/machine/rtc65271.cpp | 2 +- src/devices/machine/rtc65271.h | 2 +- src/devices/machine/rtc9701.cpp | 2 +- src/devices/machine/rtc9701.h | 2 +- src/devices/machine/s2636.cpp | 2 +- src/devices/machine/s2636.h | 2 +- src/devices/machine/s3520cf.cpp | 2 +- src/devices/machine/s3520cf.h | 2 +- src/devices/machine/s3c2400.cpp | 4 +- src/devices/machine/s3c2400.h | 4 +- src/devices/machine/s3c2410.cpp | 4 +- src/devices/machine/s3c2410.h | 4 +- src/devices/machine/s3c2440.cpp | 4 +- src/devices/machine/s3c2440.h | 4 +- src/devices/machine/s3c44b0.cpp | 2 +- src/devices/machine/s3c44b0.h | 2 +- src/devices/machine/serflash.cpp | 2 +- src/devices/machine/serflash.h | 2 +- src/devices/machine/smc91c9x.cpp | 6 +- src/devices/machine/smc91c9x.h | 6 +- src/devices/machine/smpc.cpp | 4 +- src/devices/machine/spchrom.cpp | 4 +- src/devices/machine/spchrom.h | 2 +- src/devices/machine/steppers.cpp | 2 +- src/devices/machine/steppers.h | 2 +- src/devices/machine/strata.cpp | 2 +- src/devices/machine/strata.h | 2 +- src/devices/machine/t10mmc.cpp | 2 +- src/devices/machine/t10sbc.cpp | 2 +- src/devices/machine/tc009xlvc.cpp | 6 +- src/devices/machine/tc009xlvc.h | 6 +- src/devices/machine/terminal.cpp | 4 +- src/devices/machine/terminal.h | 4 +- src/devices/machine/timekpr.cpp | 12 +- src/devices/machine/timekpr.h | 12 +- src/devices/machine/tmp68301.cpp | 2 +- src/devices/machine/tmp68301.h | 2 +- src/devices/machine/tms1024.cpp | 6 +- src/devices/machine/tms1024.h | 6 +- src/devices/machine/tms5501.cpp | 20 +- src/devices/machine/tms5501.h | 2 +- src/devices/machine/tms6100.cpp | 6 +- src/devices/machine/tms6100.h | 6 +- src/devices/machine/tms9901.cpp | 30 +- src/devices/machine/tms9901.h | 2 +- src/devices/machine/tms9902.cpp | 2 +- src/devices/machine/tms9902.h | 2 +- src/devices/machine/upd1990a.cpp | 24 +- src/devices/machine/upd1990a.h | 6 +- src/devices/machine/upd4701.cpp | 2 +- src/devices/machine/upd4701.h | 2 +- src/devices/machine/upd4992.cpp | 2 +- src/devices/machine/upd4992.h | 2 +- src/devices/machine/upd7002.cpp | 2 +- src/devices/machine/upd7002.h | 2 +- src/devices/machine/upd71071.cpp | 2 +- src/devices/machine/upd71071.h | 4 +- src/devices/machine/upd765.cpp | 98 ++--- src/devices/machine/upd765.h | 28 +- src/devices/machine/v3021.cpp | 2 +- src/devices/machine/v3021.h | 2 +- src/devices/machine/vrc4373.cpp | 22 +- src/devices/machine/vrc4373.h | 6 +- src/devices/machine/vt82c496.cpp | 4 +- src/devices/machine/vt82c496.h | 10 +- src/devices/machine/vt83c461.cpp | 2 +- src/devices/machine/vt83c461.h | 2 +- src/devices/machine/wd11c00_17.cpp | 28 +- src/devices/machine/wd11c00_17.h | 2 +- src/devices/machine/wd2010.cpp | 44 +-- src/devices/machine/wd2010.h | 2 +- src/devices/machine/wd33c93.cpp | 2 +- src/devices/machine/wd33c93.h | 2 +- src/devices/machine/wd7600.cpp | 36 +- src/devices/machine/wd7600.h | 18 +- src/devices/machine/wd_fdc.cpp | 190 +++++----- src/devices/machine/wd_fdc.h | 52 +-- src/devices/machine/wozfdc.cpp | 6 +- src/devices/machine/wozfdc.h | 6 +- src/devices/machine/x2212.cpp | 10 +- src/devices/machine/x2212.h | 6 +- src/devices/machine/x76f041.cpp | 8 +- src/devices/machine/x76f041.h | 2 +- src/devices/machine/x76f100.cpp | 8 +- src/devices/machine/x76f100.h | 2 +- src/devices/machine/ym2148.cpp | 2 +- src/devices/machine/ym2148.h | 2 +- src/devices/machine/z80ctc.cpp | 2 +- src/devices/machine/z80ctc.h | 2 +- src/devices/machine/z80dart.cpp | 130 +++---- src/devices/machine/z80dart.h | 20 +- src/devices/machine/z80dma.cpp | 80 ++-- src/devices/machine/z80dma.h | 2 +- src/devices/machine/z80pio.cpp | 40 +- src/devices/machine/z80pio.h | 2 +- src/devices/machine/z80scc.cpp | 164 ++++---- src/devices/machine/z80scc.h | 22 +- src/devices/machine/z80sio.cpp | 182 ++++----- src/devices/machine/z80sio.h | 6 +- src/devices/machine/z80sti.cpp | 72 ++-- src/devices/machine/z80sti.h | 2 +- src/devices/machine/z8536.cpp | 140 +++---- src/devices/machine/z8536.h | 2 +- src/devices/sound/2151intf.cpp | 2 +- src/devices/sound/2151intf.h | 2 +- src/devices/sound/2203intf.cpp | 2 +- src/devices/sound/2203intf.h | 2 +- src/devices/sound/2413intf.cpp | 2 +- src/devices/sound/2413intf.h | 2 +- src/devices/sound/2608intf.cpp | 2 +- src/devices/sound/2608intf.h | 2 +- src/devices/sound/2610intf.cpp | 6 +- src/devices/sound/2610intf.h | 6 +- src/devices/sound/2612intf.cpp | 6 +- src/devices/sound/2612intf.h | 6 +- src/devices/sound/262intf.cpp | 2 +- src/devices/sound/262intf.h | 2 +- src/devices/sound/315-5641.cpp | 2 +- src/devices/sound/315-5641.h | 2 +- src/devices/sound/3526intf.cpp | 2 +- src/devices/sound/3526intf.h | 2 +- src/devices/sound/3812intf.cpp | 2 +- src/devices/sound/3812intf.h | 2 +- src/devices/sound/8950intf.cpp | 2 +- src/devices/sound/8950intf.h | 2 +- src/devices/sound/aica.cpp | 2 +- src/devices/sound/aica.h | 2 +- src/devices/sound/amiga.cpp | 2 +- src/devices/sound/amiga.h | 2 +- src/devices/sound/asc.cpp | 2 +- src/devices/sound/asc.h | 2 +- src/devices/sound/astrocde.cpp | 2 +- src/devices/sound/astrocde.h | 2 +- src/devices/sound/awacs.cpp | 2 +- src/devices/sound/awacs.h | 2 +- src/devices/sound/ay8910.cpp | 42 +- src/devices/sound/ay8910.h | 20 +- src/devices/sound/beep.cpp | 2 +- src/devices/sound/beep.h | 2 +- src/devices/sound/bsmt2000.cpp | 2 +- src/devices/sound/bsmt2000.h | 2 +- src/devices/sound/c140.cpp | 2 +- src/devices/sound/c140.h | 2 +- src/devices/sound/c352.cpp | 2 +- src/devices/sound/c352.h | 2 +- src/devices/sound/c6280.cpp | 2 +- src/devices/sound/c6280.h | 4 +- src/devices/sound/cdda.cpp | 2 +- src/devices/sound/cdda.h | 2 +- src/devices/sound/cdp1863.cpp | 2 +- src/devices/sound/cdp1863.h | 2 +- src/devices/sound/cdp1864.cpp | 2 +- src/devices/sound/cdp1864.h | 2 +- src/devices/sound/cdp1869.cpp | 2 +- src/devices/sound/cdp1869.h | 2 +- src/devices/sound/cem3394.cpp | 2 +- src/devices/sound/cem3394.h | 2 +- src/devices/sound/dac.cpp | 2 +- src/devices/sound/dac.h | 2 +- src/devices/sound/digitalk.cpp | 2 +- src/devices/sound/digitalk.h | 2 +- src/devices/sound/disc_sys.inc | 4 +- src/devices/sound/discrete.cpp | 6 +- src/devices/sound/discrete.h | 4 +- src/devices/sound/dmadac.cpp | 2 +- src/devices/sound/dmadac.h | 2 +- src/devices/sound/es1373.cpp | 14 +- src/devices/sound/es1373.h | 6 +- src/devices/sound/es5503.cpp | 2 +- src/devices/sound/es5503.h | 2 +- src/devices/sound/es5506.cpp | 6 +- src/devices/sound/es5506.h | 6 +- src/devices/sound/es8712.cpp | 4 +- src/devices/sound/es8712.h | 2 +- src/devices/sound/esqpump.cpp | 2 +- src/devices/sound/esqpump.h | 2 +- src/devices/sound/flt_rc.cpp | 2 +- src/devices/sound/flt_rc.h | 2 +- src/devices/sound/flt_vol.cpp | 2 +- src/devices/sound/flt_vol.h | 2 +- src/devices/sound/gaelco.cpp | 12 +- src/devices/sound/gaelco.h | 10 +- src/devices/sound/hc55516.cpp | 8 +- src/devices/sound/hc55516.h | 8 +- src/devices/sound/i5000.cpp | 2 +- src/devices/sound/i5000.h | 2 +- src/devices/sound/ics2115.cpp | 2 +- src/devices/sound/ics2115.h | 2 +- src/devices/sound/iremga20.cpp | 2 +- src/devices/sound/iremga20.h | 2 +- src/devices/sound/k005289.cpp | 2 +- src/devices/sound/k005289.h | 2 +- src/devices/sound/k007232.cpp | 2 +- src/devices/sound/k007232.h | 2 +- src/devices/sound/k051649.cpp | 2 +- src/devices/sound/k051649.h | 2 +- src/devices/sound/k053260.cpp | 5 +- src/devices/sound/k053260.h | 6 +- src/devices/sound/k054539.cpp | 2 +- src/devices/sound/k054539.h | 2 +- src/devices/sound/k056800.cpp | 2 +- src/devices/sound/k056800.h | 2 +- src/devices/sound/l7a1045_l6028_dsp_a.cpp | 2 +- src/devices/sound/l7a1045_l6028_dsp_a.h | 2 +- src/devices/sound/lmc1992.cpp | 20 +- src/devices/sound/lmc1992.h | 2 +- src/devices/sound/mas3507d.cpp | 2 +- src/devices/sound/mas3507d.h | 2 +- src/devices/sound/mos6560.cpp | 8 +- src/devices/sound/mos6560.h | 8 +- src/devices/sound/mos6581.cpp | 6 +- src/devices/sound/mos6581.h | 6 +- src/devices/sound/mos7360.cpp | 2 +- src/devices/sound/mos7360.h | 4 +- src/devices/sound/msm5205.cpp | 8 +- src/devices/sound/msm5205.h | 6 +- src/devices/sound/msm5232.cpp | 2 +- src/devices/sound/msm5232.h | 2 +- src/devices/sound/multipcm.cpp | 2 +- src/devices/sound/multipcm.h | 2 +- src/devices/sound/n63701x.cpp | 2 +- src/devices/sound/n63701x.h | 2 +- src/devices/sound/namco.cpp | 8 +- src/devices/sound/namco.h | 8 +- src/devices/sound/nes_apu.cpp | 6 +- src/devices/sound/nes_apu.h | 8 +- src/devices/sound/nile.cpp | 2 +- src/devices/sound/nile.h | 2 +- src/devices/sound/okim6258.cpp | 2 +- src/devices/sound/okim6258.h | 2 +- src/devices/sound/okim6295.cpp | 6 +- src/devices/sound/okim6295.h | 2 +- src/devices/sound/okim6376.cpp | 14 +- src/devices/sound/okim6376.h | 2 +- src/devices/sound/okim9810.cpp | 2 +- src/devices/sound/okim9810.h | 2 +- src/devices/sound/pci-ac97.cpp | 2 +- src/devices/sound/pci-ac97.h | 2 +- src/devices/sound/pokey.cpp | 72 ++-- src/devices/sound/pokey.h | 2 +- src/devices/sound/qs1000.cpp | 2 +- src/devices/sound/qs1000.h | 2 +- src/devices/sound/qsound.cpp | 2 +- src/devices/sound/qsound.h | 2 +- src/devices/sound/rf5c400.cpp | 2 +- src/devices/sound/rf5c400.h | 2 +- src/devices/sound/rf5c68.cpp | 2 +- src/devices/sound/rf5c68.h | 2 +- src/devices/sound/s14001a.cpp | 2 +- src/devices/sound/s14001a.h | 2 +- src/devices/sound/saa1099.cpp | 8 +- src/devices/sound/saa1099.h | 2 +- src/devices/sound/samples.cpp | 6 +- src/devices/sound/samples.h | 4 +- src/devices/sound/sb0400.cpp | 2 +- src/devices/sound/sb0400.h | 2 +- src/devices/sound/scsp.cpp | 4 +- src/devices/sound/scsp.h | 2 +- src/devices/sound/segapcm.cpp | 2 +- src/devices/sound/segapcm.h | 2 +- src/devices/sound/sn76477.cpp | 68 ++-- src/devices/sound/sn76477.h | 2 +- src/devices/sound/sn76496.cpp | 22 +- src/devices/sound/sn76496.h | 22 +- src/devices/sound/snkwave.cpp | 2 +- src/devices/sound/snkwave.h | 2 +- src/devices/sound/sp0250.cpp | 2 +- src/devices/sound/sp0250.h | 2 +- src/devices/sound/sp0256.cpp | 2 +- src/devices/sound/sp0256.h | 2 +- src/devices/sound/speaker.cpp | 2 +- src/devices/sound/speaker.h | 2 +- src/devices/sound/spu.cpp | 2 +- src/devices/sound/spu.h | 2 +- src/devices/sound/st0016.cpp | 2 +- src/devices/sound/st0016.h | 2 +- src/devices/sound/t6721a.cpp | 2 +- src/devices/sound/t6721a.h | 2 +- src/devices/sound/t6w28.cpp | 2 +- src/devices/sound/t6w28.h | 2 +- src/devices/sound/tc8830f.cpp | 2 +- src/devices/sound/tc8830f.h | 2 +- src/devices/sound/tiaintf.cpp | 2 +- src/devices/sound/tiaintf.h | 2 +- src/devices/sound/tms3615.cpp | 2 +- src/devices/sound/tms3615.h | 2 +- src/devices/sound/tms36xx.cpp | 2 +- src/devices/sound/tms36xx.h | 2 +- src/devices/sound/tms5110.cpp | 22 +- src/devices/sound/tms5110.h | 22 +- src/devices/sound/tms5220.cpp | 22 +- src/devices/sound/tms5220.h | 16 +- src/devices/sound/upd7752.cpp | 2 +- src/devices/sound/upd7752.h | 2 +- src/devices/sound/upd7759.cpp | 8 +- src/devices/sound/upd7759.h | 8 +- src/devices/sound/vlm5030.cpp | 2 +- src/devices/sound/vlm5030.h | 2 +- src/devices/sound/votrax.cpp | 2 +- src/devices/sound/votrax.h | 2 +- src/devices/sound/vrc6.cpp | 2 +- src/devices/sound/vrc6.h | 2 +- src/devices/sound/vrender0.cpp | 2 +- src/devices/sound/vrender0.h | 2 +- src/devices/sound/wave.cpp | 2 +- src/devices/sound/wave.h | 2 +- src/devices/sound/x1_010.cpp | 2 +- src/devices/sound/x1_010.h | 2 +- src/devices/sound/ymf271.cpp | 2 +- src/devices/sound/ymf271.h | 2 +- src/devices/sound/ymf278b.cpp | 2 +- src/devices/sound/ymf278b.h | 2 +- src/devices/sound/ymz280b.cpp | 2 +- src/devices/sound/ymz280b.h | 2 +- src/devices/sound/ymz770.cpp | 2 +- src/devices/sound/ymz770.h | 2 +- src/devices/sound/zsg2.cpp | 2 +- src/devices/sound/zsg2.h | 2 +- src/devices/video/315_5124.cpp | 10 +- src/devices/video/315_5124.h | 8 +- src/devices/video/315_5313.cpp | 4 +- src/devices/video/315_5313.h | 4 +- src/devices/video/bufsprite.h | 10 +- src/devices/video/cdp1861.cpp | 2 +- src/devices/video/cdp1861.h | 2 +- src/devices/video/cdp1862.cpp | 2 +- src/devices/video/cdp1862.h | 2 +- src/devices/video/clgd542x.cpp | 6 +- src/devices/video/clgd542x.h | 6 +- src/devices/video/crt9007.cpp | 110 +++--- src/devices/video/crt9007.h | 2 +- src/devices/video/crt9021.cpp | 6 +- src/devices/video/crt9021.h | 2 +- src/devices/video/crt9212.cpp | 2 +- src/devices/video/crt9212.h | 2 +- src/devices/video/crtc_ega.cpp | 2 +- src/devices/video/crtc_ega.h | 2 +- src/devices/video/dl1416.cpp | 6 +- src/devices/video/dl1416.h | 6 +- src/devices/video/dm9368.cpp | 6 +- src/devices/video/dm9368.h | 2 +- src/devices/video/ef9340_1.cpp | 2 +- src/devices/video/ef9340_1.h | 2 +- src/devices/video/ef9345.cpp | 4 +- src/devices/video/ef9345.h | 4 +- src/devices/video/ef9365.cpp | 6 +- src/devices/video/ef9365.h | 4 +- src/devices/video/epic12.cpp | 2 +- src/devices/video/epic12.h | 2 +- src/devices/video/fixfreq.cpp | 4 +- src/devices/video/fixfreq.h | 4 +- src/devices/video/gf4500.cpp | 2 +- src/devices/video/gf4500.h | 2 +- src/devices/video/gf7600gs.cpp | 2 +- src/devices/video/gf7600gs.h | 2 +- src/devices/video/h63484.cpp | 66 ++-- src/devices/video/h63484.h | 2 +- src/devices/video/hd44102.cpp | 16 +- src/devices/video/hd44102.h | 2 +- src/devices/video/hd44352.cpp | 2 +- src/devices/video/hd44352.h | 2 +- src/devices/video/hd44780.cpp | 32 +- src/devices/video/hd44780.h | 6 +- src/devices/video/hd61830.cpp | 46 +-- src/devices/video/hd61830.h | 2 +- src/devices/video/hd63484.cpp | 2 +- src/devices/video/hd63484.h | 2 +- src/devices/video/hd66421.cpp | 2 +- src/devices/video/hd66421.h | 2 +- src/devices/video/huc6202.cpp | 2 +- src/devices/video/huc6202.h | 2 +- src/devices/video/huc6260.cpp | 2 +- src/devices/video/huc6260.h | 2 +- src/devices/video/huc6261.cpp | 8 +- src/devices/video/huc6261.h | 10 +- src/devices/video/huc6270.cpp | 2 +- src/devices/video/huc6270.h | 2 +- src/devices/video/huc6272.cpp | 2 +- src/devices/video/huc6272.h | 2 +- src/devices/video/i8244.cpp | 6 +- src/devices/video/i8244.h | 6 +- src/devices/video/i82730.cpp | 6 +- src/devices/video/i82730.h | 6 +- src/devices/video/i8275.cpp | 42 +- src/devices/video/i8275.h | 2 +- src/devices/video/m50458.cpp | 2 +- src/devices/video/m50458.h | 2 +- src/devices/video/mb90082.cpp | 2 +- src/devices/video/mb90082.h | 2 +- src/devices/video/mb_vcu.cpp | 4 +- src/devices/video/mb_vcu.h | 6 +- src/devices/video/mc6845.cpp | 30 +- src/devices/video/mc6845.h | 30 +- src/devices/video/mc6847.cpp | 22 +- src/devices/video/mc6847.h | 20 +- src/devices/video/mos6566.cpp | 20 +- src/devices/video/mos6566.h | 22 +- src/devices/video/msm6222b.cpp | 6 +- src/devices/video/msm6222b.h | 6 +- src/devices/video/msm6255.cpp | 2 +- src/devices/video/msm6255.h | 2 +- src/devices/video/pc_vga.cpp | 26 +- src/devices/video/pc_vga.h | 28 +- src/devices/video/psx.cpp | 14 +- src/devices/video/psx.h | 14 +- src/devices/video/ramdac.cpp | 4 +- src/devices/video/ramdac.h | 4 +- src/devices/video/saa5050.cpp | 18 +- src/devices/video/saa5050.h | 18 +- src/devices/video/scn2674.cpp | 2 +- src/devices/video/scn2674.h | 2 +- src/devices/video/sed1200.cpp | 10 +- src/devices/video/sed1200.h | 10 +- src/devices/video/sed1330.cpp | 124 +++--- src/devices/video/sed1330.h | 2 +- src/devices/video/sed1520.cpp | 4 +- src/devices/video/sed1520.h | 2 +- src/devices/video/snes_ppu.cpp | 2 +- src/devices/video/snes_ppu.h | 2 +- src/devices/video/stvvdp1.cpp | 2 +- src/devices/video/t6a04.cpp | 2 +- src/devices/video/t6a04.h | 2 +- src/devices/video/tea1002.cpp | 2 +- src/devices/video/tea1002.h | 2 +- src/devices/video/tlc34076.cpp | 2 +- src/devices/video/tlc34076.h | 2 +- src/devices/video/tms34061.cpp | 2 +- src/devices/video/tms34061.h | 2 +- src/devices/video/tms3556.cpp | 2 +- src/devices/video/tms3556.h | 2 +- src/devices/video/tms9927.cpp | 14 +- src/devices/video/tms9927.h | 14 +- src/devices/video/tms9928a.cpp | 24 +- src/devices/video/tms9928a.h | 18 +- src/devices/video/upd3301.cpp | 66 ++-- src/devices/video/upd3301.h | 2 +- src/devices/video/upd7220.cpp | 94 ++--- src/devices/video/upd7220.h | 2 +- src/devices/video/upd7227.cpp | 2 +- src/devices/video/upd7227.h | 2 +- src/devices/video/v9938.cpp | 6 +- src/devices/video/v9938.h | 6 +- src/devices/video/vic4567.cpp | 2 +- src/devices/video/vic4567.h | 4 +- src/devices/video/voodoo.cpp | 18 +- src/devices/video/voodoo.h | 20 +- src/devices/video/voodoo_pci.cpp | 8 +- src/devices/video/voodoo_pci.h | 6 +- src/emu/addrmap.cpp | 36 +- src/emu/addrmap.h | 27 +- src/emu/clifront.cpp | 21 +- src/emu/debug/debugcmd.cpp | 42 +- src/emu/debug/debugcpu.cpp | 10 +- src/emu/debug/dvbpoints.cpp | 4 +- src/emu/debug/dvdisasm.cpp | 2 +- src/emu/debug/dvmemory.cpp | 2 +- src/emu/debug/dvstate.cpp | 2 +- src/emu/debug/dvwpoints.cpp | 4 +- src/emu/devcb.cpp | 26 +- src/emu/devcb.h | 32 +- src/emu/devcpu.cpp | 2 +- src/emu/devcpu.h | 2 +- src/emu/devdelegate.cpp | 4 +- src/emu/devdelegate.h | 22 +- src/emu/devfind.cpp | 14 +- src/emu/devfind.h | 78 ++-- src/emu/device.cpp | 35 +- src/emu/device.h | 54 +-- src/emu/diexec.cpp | 39 +- src/emu/diexec.h | 4 +- src/emu/digfx.cpp | 24 +- src/emu/digfx.h | 4 +- src/emu/diimage.cpp | 10 +- src/emu/diimage.h | 6 +- src/emu/dimemory.cpp | 4 +- src/emu/dimemory.h | 2 +- src/emu/diserial.cpp | 2 +- src/emu/dislot.cpp | 10 +- src/emu/disound.cpp | 8 +- src/emu/dispatch.cpp | 10 +- src/emu/dispatch.h | 2 +- src/emu/distate.cpp | 2 +- src/emu/divideo.cpp | 24 +- src/emu/divideo.h | 4 +- src/emu/drawgfx.cpp | 2 +- src/emu/drawgfx.h | 2 +- src/emu/driver.cpp | 4 +- src/emu/driver.h | 4 +- src/emu/drivers/empty.cpp | 2 +- src/emu/drivers/testcpu.cpp | 2 +- src/emu/emucore.cpp | 2 +- src/emu/emuopts.cpp | 4 +- src/emu/emupal.cpp | 2 +- src/emu/emupal.h | 2 +- src/emu/info.cpp | 18 +- src/emu/ioport.cpp | 20 +- src/emu/ioport.h | 24 +- src/emu/machine.cpp | 6 +- src/emu/machine.h | 8 +- src/emu/mconfig.cpp | 25 +- src/emu/mconfig.h | 12 +- src/emu/memory.cpp | 90 ++--- src/emu/memory.h | 24 +- src/emu/network.cpp | 4 +- src/emu/profiler.cpp | 2 +- src/emu/romload.cpp | 4 +- src/emu/save.cpp | 14 +- src/emu/save.h | 28 +- src/emu/schedule.cpp | 8 +- src/emu/screen.cpp | 10 +- src/emu/screen.h | 4 +- src/emu/softlist.cpp | 2 +- src/emu/softlist.h | 2 +- src/emu/sound.cpp | 6 +- src/emu/speaker.cpp | 4 +- src/emu/speaker.h | 2 +- src/emu/sprite.h | 2 +- src/emu/tilemap.cpp | 30 +- src/emu/tilemap.h | 4 +- src/emu/timer.cpp | 13 +- src/emu/timer.h | 6 +- src/emu/ui/devopt.cpp | 8 +- src/emu/ui/filemngr.cpp | 4 +- src/emu/ui/info_pty.cpp | 2 +- src/emu/ui/inputmap.cpp | 12 +- src/emu/ui/miscmenu.cpp | 10 +- src/emu/ui/slotopt.cpp | 6 +- src/emu/ui/ui.cpp | 12 +- src/emu/ui/viewgfx.cpp | 4 +- src/emu/validity.cpp | 10 +- src/emu/video/vector.cpp | 4 +- src/emu/video/vector.h | 4 +- src/ldplayer/ldplayer.cpp | 6 +- src/lib/formats/mfm_hd.cpp | 38 +- src/lib/formats/mfm_hd.h | 2 +- src/lib/util/tagmap.h | 12 +- src/mame/audio/alesis.cpp | 10 +- src/mame/audio/arcadia.cpp | 2 +- src/mame/audio/arcadia.h | 2 +- src/mame/audio/atarijsa.cpp | 14 +- src/mame/audio/atarijsa.h | 14 +- src/mame/audio/beezer.cpp | 2 +- src/mame/audio/cage.cpp | 6 +- src/mame/audio/cage.h | 6 +- src/mame/audio/cclimber.cpp | 2 +- src/mame/audio/cclimber.h | 2 +- src/mame/audio/channelf.cpp | 2 +- src/mame/audio/channelf.h | 2 +- src/mame/audio/cps3.cpp | 2 +- src/mame/audio/cps3.h | 2 +- src/mame/audio/dai_snd.cpp | 2 +- src/mame/audio/dai_snd.h | 2 +- src/mame/audio/dave.cpp | 2 +- src/mame/audio/dave.h | 2 +- src/mame/audio/dcs.cpp | 20 +- src/mame/audio/dcs.h | 20 +- src/mame/audio/decobsmt.cpp | 2 +- src/mame/audio/decobsmt.h | 2 +- src/mame/audio/dsbz80.cpp | 2 +- src/mame/audio/dsbz80.h | 2 +- src/mame/audio/exidy.cpp | 8 +- src/mame/audio/exidy.h | 8 +- src/mame/audio/exidy440.cpp | 2 +- src/mame/audio/exidy440.h | 2 +- src/mame/audio/flower.cpp | 2 +- src/mame/audio/galaxian.cpp | 2 +- src/mame/audio/galaxian.h | 2 +- src/mame/audio/gamate.cpp | 2 +- src/mame/audio/gb.cpp | 2 +- src/mame/audio/gb.h | 2 +- src/mame/audio/geebee.cpp | 2 +- src/mame/audio/gomoku.cpp | 2 +- src/mame/audio/gottlieb.cpp | 10 +- src/mame/audio/gottlieb.h | 10 +- src/mame/audio/gridlee.cpp | 2 +- src/mame/audio/harddriv.cpp | 2 +- src/mame/audio/hyprolyb.cpp | 2 +- src/mame/audio/hyprolyb.h | 2 +- src/mame/audio/irem.cpp | 8 +- src/mame/audio/irem.h | 8 +- src/mame/audio/leland.cpp | 10 +- src/mame/audio/lynx.cpp | 6 +- src/mame/audio/lynx.h | 6 +- src/mame/audio/m72.cpp | 2 +- src/mame/audio/m72.h | 2 +- src/mame/audio/mac.cpp | 2 +- src/mame/audio/mea8000.cpp | 2 +- src/mame/audio/mea8000.h | 4 +- src/mame/audio/micro3d.cpp | 2 +- src/mame/audio/midway.cpp | 10 +- src/mame/audio/midway.h | 10 +- src/mame/audio/namco52.cpp | 2 +- src/mame/audio/namco52.h | 4 +- src/mame/audio/namco54.cpp | 2 +- src/mame/audio/namco54.h | 4 +- src/mame/audio/phoenix.cpp | 2 +- src/mame/audio/pleiads.cpp | 8 +- src/mame/audio/pleiads.h | 8 +- src/mame/audio/polepos.cpp | 2 +- src/mame/audio/redbaron.cpp | 2 +- src/mame/audio/redbaron.h | 2 +- src/mame/audio/s11c_bg.cpp | 4 +- src/mame/audio/s11c_bg.h | 6 +- src/mame/audio/segag80r.cpp | 2 +- src/mame/audio/segam1audio.cpp | 2 +- src/mame/audio/segam1audio.h | 2 +- src/mame/audio/segasnd.cpp | 8 +- src/mame/audio/segasnd.h | 8 +- src/mame/audio/seibu.cpp | 7 +- src/mame/audio/seibu.h | 8 +- src/mame/audio/snes_snd.cpp | 2 +- src/mame/audio/snes_snd.h | 2 +- src/mame/audio/snk6502.cpp | 2 +- src/mame/audio/socrates.cpp | 2 +- src/mame/audio/socrates.h | 2 +- src/mame/audio/specimx_snd.cpp | 2 +- src/mame/audio/specimx_snd.h | 2 +- src/mame/audio/svis_snd.cpp | 2 +- src/mame/audio/svis_snd.h | 2 +- src/mame/audio/t5182.cpp | 2 +- src/mame/audio/t5182.h | 2 +- src/mame/audio/taito_en.cpp | 2 +- src/mame/audio/taito_en.h | 2 +- src/mame/audio/taito_zm.cpp | 2 +- src/mame/audio/taito_zm.h | 2 +- src/mame/audio/taitosnd.cpp | 2 +- src/mame/audio/taitosnd.h | 6 +- src/mame/audio/tiamc1.cpp | 2 +- src/mame/audio/timeplt.cpp | 2 +- src/mame/audio/timeplt.h | 2 +- src/mame/audio/trackfld.cpp | 2 +- src/mame/audio/trackfld.h | 2 +- src/mame/audio/turrett.cpp | 2 +- src/mame/audio/tvc_snd.cpp | 2 +- src/mame/audio/tvc_snd.h | 2 +- src/mame/audio/tx1.cpp | 6 +- src/mame/audio/upd1771.cpp | 2 +- src/mame/audio/upd1771.h | 2 +- src/mame/audio/vboy.cpp | 2 +- src/mame/audio/vboy.h | 2 +- src/mame/audio/vc4000snd.cpp | 2 +- src/mame/audio/vc4000snd.h | 2 +- src/mame/audio/warpwarp.cpp | 2 +- src/mame/audio/warpwarp.h | 4 +- src/mame/audio/williams.cpp | 6 +- src/mame/audio/williams.h | 6 +- src/mame/audio/wiping.cpp | 2 +- src/mame/audio/wiping.h | 2 +- src/mame/audio/wpcsnd.cpp | 4 +- src/mame/audio/wpcsnd.h | 6 +- src/mame/audio/wswan_snd.cpp | 2 +- src/mame/audio/wswan_snd.h | 2 +- src/mame/drivers/1945kiii.cpp | 2 +- src/mame/drivers/24cdjuke.cpp | 2 +- src/mame/drivers/2mindril.cpp | 2 +- src/mame/drivers/30test.cpp | 2 +- src/mame/drivers/39in1.cpp | 2 +- src/mame/drivers/3x3puzzl.cpp | 2 +- src/mame/drivers/4004clk.cpp | 2 +- src/mame/drivers/4dpi.cpp | 2 +- src/mame/drivers/4enlinea.cpp | 6 +- src/mame/drivers/4roses.cpp | 2 +- src/mame/drivers/5clown.cpp | 2 +- src/mame/drivers/68ksbc.cpp | 2 +- src/mame/drivers/a1supply.cpp | 2 +- src/mame/drivers/a2600.cpp | 2 +- src/mame/drivers/a310.cpp | 2 +- src/mame/drivers/a5105.cpp | 2 +- src/mame/drivers/a51xx.cpp | 2 +- src/mame/drivers/a6809.cpp | 2 +- src/mame/drivers/a7150.cpp | 2 +- src/mame/drivers/a7800.cpp | 2 +- src/mame/drivers/ace.cpp | 2 +- src/mame/drivers/acefruit.cpp | 2 +- src/mame/drivers/aces1.cpp | 2 +- src/mame/drivers/acesp.cpp | 2 +- src/mame/drivers/acommand.cpp | 2 +- src/mame/drivers/acrnsys1.cpp | 2 +- src/mame/drivers/adp.cpp | 2 +- src/mame/drivers/age_candy.cpp | 2 +- src/mame/drivers/aim65_40.cpp | 2 +- src/mame/drivers/albazc.cpp | 2 +- src/mame/drivers/albazg.cpp | 2 +- src/mame/drivers/aleck64.cpp | 2 +- src/mame/drivers/aleisttl.cpp | 2 +- src/mame/drivers/alg.cpp | 2 +- src/mame/drivers/alien.cpp | 2 +- src/mame/drivers/alinvade.cpp | 2 +- src/mame/drivers/allied.cpp | 2 +- src/mame/drivers/alphasma.cpp | 4 +- src/mame/drivers/alphatro.cpp | 2 +- src/mame/drivers/altair.cpp | 2 +- src/mame/drivers/alto2.cpp | 2 +- src/mame/drivers/altos5.cpp | 2 +- src/mame/drivers/alvg.cpp | 2 +- src/mame/drivers/amaticmg.cpp | 2 +- src/mame/drivers/amerihok.cpp | 2 +- src/mame/drivers/amico2k.cpp | 2 +- src/mame/drivers/amiga.cpp | 20 +- src/mame/drivers/ampro.cpp | 2 +- src/mame/drivers/amstr_pc.cpp | 2 +- src/mame/drivers/amusco.cpp | 2 +- src/mame/drivers/amust.cpp | 2 +- src/mame/drivers/apc.cpp | 2 +- src/mame/drivers/apexc.cpp | 14 +- src/mame/drivers/apf.cpp | 2 +- src/mame/drivers/apogee.cpp | 2 +- src/mame/drivers/apollo.cpp | 2 +- src/mame/drivers/apple2.cpp | 2 +- src/mame/drivers/apple2e.cpp | 2 +- src/mame/drivers/applix.cpp | 2 +- src/mame/drivers/apricot.cpp | 2 +- src/mame/drivers/apricotf.cpp | 2 +- src/mame/drivers/apricotp.cpp | 2 +- src/mame/drivers/arachnid.cpp | 2 +- src/mame/drivers/argo.cpp | 2 +- src/mame/drivers/aristmk4.cpp | 2 +- src/mame/drivers/aristmk5.cpp | 2 +- src/mame/drivers/aristmk6.cpp | 2 +- src/mame/drivers/arsystems.cpp | 6 +- src/mame/drivers/asst128.cpp | 4 +- src/mame/drivers/astinvad.cpp | 2 +- src/mame/drivers/astrafr.cpp | 2 +- src/mame/drivers/astrcorp.cpp | 2 +- src/mame/drivers/astrohome.cpp | 2 +- src/mame/drivers/astropc.cpp | 2 +- src/mame/drivers/atari400.cpp | 2 +- src/mame/drivers/atari_s1.cpp | 2 +- src/mame/drivers/atari_s2.cpp | 2 +- src/mame/drivers/atarisy4.cpp | 2 +- src/mame/drivers/atarittl.cpp | 2 +- src/mame/drivers/atlantis.cpp | 2 +- src/mame/drivers/atm.cpp | 2 +- src/mame/drivers/atronic.cpp | 2 +- src/mame/drivers/attache.cpp | 2 +- src/mame/drivers/attckufo.cpp | 2 +- src/mame/drivers/atvtrack.cpp | 6 +- src/mame/drivers/avt.cpp | 2 +- src/mame/drivers/ax20.cpp | 2 +- src/mame/drivers/b16.cpp | 2 +- src/mame/drivers/babbage.cpp | 2 +- src/mame/drivers/backfire.cpp | 2 +- src/mame/drivers/bailey.cpp | 2 +- src/mame/drivers/barata.cpp | 2 +- src/mame/drivers/bartop52.cpp | 2 +- src/mame/drivers/basic52.cpp | 2 +- src/mame/drivers/bbcbc.cpp | 2 +- src/mame/drivers/bcs3.cpp | 2 +- src/mame/drivers/beaminv.cpp | 2 +- src/mame/drivers/beehive.cpp | 2 +- src/mame/drivers/belatra.cpp | 2 +- src/mame/drivers/berzerk.cpp | 2 +- src/mame/drivers/besta.cpp | 2 +- src/mame/drivers/bestleag.cpp | 2 +- src/mame/drivers/beta.cpp | 2 +- src/mame/drivers/bfcobra.cpp | 2 +- src/mame/drivers/bfm_sc1.cpp | 2 +- src/mame/drivers/bfm_sc2.cpp | 2 +- src/mame/drivers/bfm_swp.cpp | 2 +- src/mame/drivers/bfmsys83.cpp | 2 +- src/mame/drivers/bfmsys85.cpp | 2 +- src/mame/drivers/bgt.cpp | 2 +- src/mame/drivers/big10.cpp | 2 +- src/mame/drivers/bigbord2.cpp | 2 +- src/mame/drivers/binbug.cpp | 4 +- src/mame/drivers/bingo.cpp | 6 +- src/mame/drivers/bingoc.cpp | 2 +- src/mame/drivers/bingoman.cpp | 2 +- src/mame/drivers/bingor.cpp | 2 +- src/mame/drivers/bitgraph.cpp | 2 +- src/mame/drivers/blackt96.cpp | 2 +- src/mame/drivers/blitz.cpp | 2 +- src/mame/drivers/blitz68k.cpp | 2 +- src/mame/drivers/blockhl.cpp | 2 +- src/mame/drivers/bmcbowl.cpp | 2 +- src/mame/drivers/bmcpokr.cpp | 2 +- src/mame/drivers/bmjr.cpp | 2 +- src/mame/drivers/bml3.cpp | 2 +- src/mame/drivers/bnstars.cpp | 2 +- src/mame/drivers/bntyhunt.cpp | 2 +- src/mame/drivers/bob85.cpp | 2 +- src/mame/drivers/bowltry.cpp | 2 +- src/mame/drivers/boxer.cpp | 2 +- src/mame/drivers/br8641.cpp | 2 +- src/mame/drivers/buster.cpp | 2 +- src/mame/drivers/by17.cpp | 2 +- src/mame/drivers/by35.cpp | 2 +- src/mame/drivers/by6803.cpp | 2 +- src/mame/drivers/by68701.cpp | 2 +- src/mame/drivers/byvid.cpp | 2 +- src/mame/drivers/c10.cpp | 2 +- src/mame/drivers/c64dtv.cpp | 2 +- src/mame/drivers/c65.cpp | 2 +- src/mame/drivers/c900.cpp | 2 +- src/mame/drivers/cabaret.cpp | 2 +- src/mame/drivers/calchase.cpp | 2 +- src/mame/drivers/calorie.cpp | 2 +- src/mame/drivers/camplynx.cpp | 2 +- src/mame/drivers/canon_s80.cpp | 2 +- src/mame/drivers/capcom.cpp | 2 +- src/mame/drivers/capr1.cpp | 2 +- src/mame/drivers/caprcyc.cpp | 2 +- src/mame/drivers/cardline.cpp | 2 +- src/mame/drivers/carrera.cpp | 2 +- src/mame/drivers/casloopy.cpp | 2 +- src/mame/drivers/castle.cpp | 2 +- src/mame/drivers/caswin.cpp | 2 +- src/mame/drivers/cat.cpp | 2 +- src/mame/drivers/cavepc.cpp | 2 +- src/mame/drivers/cb2001.cpp | 2 +- src/mame/drivers/cball.cpp | 2 +- src/mame/drivers/cc40.cpp | 2 +- src/mame/drivers/cchance.cpp | 2 +- src/mame/drivers/ccs2810.cpp | 2 +- src/mame/drivers/ccs300.cpp | 2 +- src/mame/drivers/cd2650.cpp | 2 +- src/mame/drivers/cdc721.cpp | 2 +- src/mame/drivers/cesclass.cpp | 2 +- src/mame/drivers/cfx9850.cpp | 2 +- src/mame/drivers/cgenie.cpp | 2 +- src/mame/drivers/cham24.cpp | 2 +- src/mame/drivers/champbwl.cpp | 2 +- src/mame/drivers/chanbara.cpp | 2 +- src/mame/drivers/chance32.cpp | 2 +- src/mame/drivers/chaos.cpp | 2 +- src/mame/drivers/chessmst.cpp | 2 +- src/mame/drivers/chesstrv.cpp | 2 +- src/mame/drivers/chexx.cpp | 2 +- src/mame/drivers/chicago.cpp | 2 +- src/mame/drivers/chihiro.cpp | 6 +- src/mame/drivers/chinagat.cpp | 2 +- src/mame/drivers/chinsan.cpp | 2 +- src/mame/drivers/chsuper.cpp | 2 +- src/mame/drivers/clayshoo.cpp | 2 +- src/mame/drivers/clcd.cpp | 2 +- src/mame/drivers/cliffhgr.cpp | 2 +- src/mame/drivers/clowndwn.cpp | 2 +- src/mame/drivers/cm1800.cpp | 2 +- src/mame/drivers/cmmb.cpp | 2 +- src/mame/drivers/cntsteer.cpp | 2 +- src/mame/drivers/cobra.cpp | 18 +- src/mame/drivers/cocoloco.cpp | 2 +- src/mame/drivers/codata.cpp | 2 +- src/mame/drivers/coinmstr.cpp | 2 +- src/mame/drivers/coinmvga.cpp | 2 +- src/mame/drivers/comebaby.cpp | 2 +- src/mame/drivers/compucolor.cpp | 2 +- src/mame/drivers/coolridr.cpp | 2 +- src/mame/drivers/cops.cpp | 2 +- src/mame/drivers/corona.cpp | 2 +- src/mame/drivers/cortex.cpp | 2 +- src/mame/drivers/cp1.cpp | 2 +- src/mame/drivers/cps3.cpp | 22 +- src/mame/drivers/craft.cpp | 2 +- src/mame/drivers/crystal.cpp | 2 +- src/mame/drivers/csc.cpp | 349 +++++++++++++++++ src/mame/drivers/cshooter.cpp | 2 +- src/mame/drivers/csplayh5.cpp | 2 +- src/mame/drivers/cswat.cpp | 2 +- src/mame/drivers/ct486.cpp | 2 +- src/mame/drivers/cubeqst.cpp | 2 +- src/mame/drivers/cubo.cpp | 2 +- src/mame/drivers/cultures.cpp | 2 +- src/mame/drivers/cupidon.cpp | 2 +- src/mame/drivers/cv1k.cpp | 2 +- src/mame/drivers/cvicny.cpp | 2 +- src/mame/drivers/cybertnk.cpp | 2 +- src/mame/drivers/cyclemb.cpp | 2 +- src/mame/drivers/czk80.cpp | 2 +- src/mame/drivers/d6800.cpp | 2 +- src/mame/drivers/d6809.cpp | 2 +- src/mame/drivers/d9final.cpp | 2 +- src/mame/drivers/dacholer.cpp | 2 +- src/mame/drivers/dai3wksi.cpp | 2 +- src/mame/drivers/dambustr.cpp | 2 +- src/mame/drivers/daruma.cpp | 2 +- src/mame/drivers/dblcrown.cpp | 2 +- src/mame/drivers/dblewing.cpp | 2 +- src/mame/drivers/dct11em.cpp | 2 +- src/mame/drivers/ddayjlc.cpp | 2 +- src/mame/drivers/ddealer.cpp | 2 +- src/mame/drivers/ddenlovr.cpp | 2 +- src/mame/drivers/ddragon3.cpp | 4 +- src/mame/drivers/de_2.cpp | 2 +- src/mame/drivers/de_3.cpp | 2 +- src/mame/drivers/de_3b.cpp | 2 +- src/mame/drivers/deco156.cpp | 6 +- src/mame/drivers/deco_ld.cpp | 2 +- src/mame/drivers/dectalk.cpp | 2 +- src/mame/drivers/decwritr.cpp | 2 +- src/mame/drivers/deshoros.cpp | 2 +- src/mame/drivers/destroyr.cpp | 2 +- src/mame/drivers/dfruit.cpp | 2 +- src/mame/drivers/dgpix.cpp | 2 +- src/mame/drivers/didact.cpp | 6 +- src/mame/drivers/digel804.cpp | 2 +- src/mame/drivers/dim68k.cpp | 2 +- src/mame/drivers/discoboy.cpp | 2 +- src/mame/drivers/diverboy.cpp | 2 +- src/mame/drivers/dlair.cpp | 2 +- src/mame/drivers/dlair2.cpp | 2 +- src/mame/drivers/dmndrby.cpp | 2 +- src/mame/drivers/dms5000.cpp | 2 +- src/mame/drivers/dms86.cpp | 2 +- src/mame/drivers/dmv.cpp | 2 +- src/mame/drivers/dolphunk.cpp | 2 +- src/mame/drivers/dominob.cpp | 2 +- src/mame/drivers/dorachan.cpp | 2 +- src/mame/drivers/dotrikun.cpp | 2 +- src/mame/drivers/dps1.cpp | 2 +- src/mame/drivers/dreambal.cpp | 2 +- src/mame/drivers/dreamwld.cpp | 2 +- src/mame/drivers/drtomy.cpp | 2 +- src/mame/drivers/drw80pkr.cpp | 2 +- src/mame/drivers/dsb46.cpp | 2 +- src/mame/drivers/dual68.cpp | 2 +- src/mame/drivers/dunhuang.cpp | 2 +- src/mame/drivers/dvk_kcgd.cpp | 2 +- src/mame/drivers/dvk_ksm.cpp | 2 +- src/mame/drivers/dwarfd.cpp | 2 +- src/mame/drivers/dynadice.cpp | 2 +- src/mame/drivers/eacc.cpp | 2 +- src/mame/drivers/ec184x.cpp | 2 +- src/mame/drivers/ec65.cpp | 4 +- src/mame/drivers/ecoinf1.cpp | 2 +- src/mame/drivers/ecoinf2.cpp | 2 +- src/mame/drivers/ecoinf3.cpp | 2 +- src/mame/drivers/ecoinfr.cpp | 2 +- src/mame/drivers/egghunt.cpp | 2 +- src/mame/drivers/einstein.cpp | 2 +- src/mame/drivers/elecbowl.cpp | 2 +- src/mame/drivers/electra.cpp | 2 +- src/mame/drivers/elekscmp.cpp | 2 +- src/mame/drivers/elwro800.cpp | 2 +- src/mame/drivers/embargo.cpp | 2 +- src/mame/drivers/enigma2.cpp | 2 +- src/mame/drivers/enmirage.cpp | 2 +- src/mame/drivers/eolith16.cpp | 2 +- src/mame/drivers/ertictac.cpp | 2 +- src/mame/drivers/esh.cpp | 2 +- src/mame/drivers/esq1.cpp | 6 +- src/mame/drivers/esq5505.cpp | 2 +- src/mame/drivers/esqasr.cpp | 2 +- src/mame/drivers/esqkt.cpp | 2 +- src/mame/drivers/esqmr.cpp | 2 +- src/mame/drivers/et3400.cpp | 2 +- src/mame/drivers/ettrivia.cpp | 2 +- src/mame/drivers/europc.cpp | 2 +- src/mame/drivers/evmbug.cpp | 2 +- src/mame/drivers/excali64.cpp | 2 +- src/mame/drivers/exelv.cpp | 2 +- src/mame/drivers/exidyttl.cpp | 2 +- src/mame/drivers/expro02.cpp | 2 +- src/mame/drivers/extrema.cpp | 2 +- src/mame/drivers/f-32.cpp | 2 +- src/mame/drivers/famibox.cpp | 2 +- src/mame/drivers/fanucs15.cpp | 2 +- src/mame/drivers/fanucspmg.cpp | 2 +- src/mame/drivers/fastinvaders.cpp | 4 +- src/mame/drivers/fb01.cpp | 2 +- src/mame/drivers/fc100.cpp | 2 +- src/mame/drivers/feversoc.cpp | 2 +- src/mame/drivers/fireball.cpp | 2 +- src/mame/drivers/firebeat.cpp | 2 +- src/mame/drivers/firefox.cpp | 2 +- src/mame/drivers/fk1.cpp | 2 +- src/mame/drivers/flicker.cpp | 2 +- src/mame/drivers/flipjack.cpp | 2 +- src/mame/drivers/flyball.cpp | 2 +- src/mame/drivers/force68k.cpp | 2 +- src/mame/drivers/forte2.cpp | 2 +- src/mame/drivers/fortecar.cpp | 2 +- src/mame/drivers/fp1100.cpp | 2 +- src/mame/drivers/fp200.cpp | 2 +- src/mame/drivers/fp6000.cpp | 2 +- src/mame/drivers/fresh.cpp | 2 +- src/mame/drivers/fruitpc.cpp | 2 +- src/mame/drivers/ft68m.cpp | 2 +- src/mame/drivers/fungames.cpp | 2 +- src/mame/drivers/funkball.cpp | 2 +- src/mame/drivers/g627.cpp | 2 +- src/mame/drivers/gal3.cpp | 2 +- src/mame/drivers/galaxi.cpp | 2 +- src/mame/drivers/galgame.cpp | 2 +- src/mame/drivers/galpani2.cpp | 4 +- src/mame/drivers/galpani3.cpp | 2 +- src/mame/drivers/gamate.cpp | 2 +- src/mame/drivers/gambl186.cpp | 2 +- src/mame/drivers/gamecstl.cpp | 2 +- src/mame/drivers/gameking.cpp | 2 +- src/mame/drivers/gammagic.cpp | 2 +- src/mame/drivers/gamtor.cpp | 2 +- src/mame/drivers/gei.cpp | 2 +- src/mame/drivers/geneve.cpp | 2 +- src/mame/drivers/geniusiq.cpp | 4 +- src/mame/drivers/genpc.cpp | 2 +- src/mame/drivers/ggconnie.cpp | 2 +- src/mame/drivers/ghosteo.cpp | 2 +- src/mame/drivers/gimix.cpp | 2 +- src/mame/drivers/gizmondo.cpp | 2 +- src/mame/drivers/gkigt.cpp | 2 +- src/mame/drivers/glasgow.cpp | 2 +- src/mame/drivers/globalfr.cpp | 2 +- src/mame/drivers/globalvr.cpp | 2 +- src/mame/drivers/gluck2.cpp | 2 +- src/mame/drivers/gmaster.cpp | 2 +- src/mame/drivers/go2000.cpp | 2 +- src/mame/drivers/goldngam.cpp | 2 +- src/mame/drivers/goldnpkr.cpp | 2 +- src/mame/drivers/good.cpp | 2 +- src/mame/drivers/goodejan.cpp | 2 +- src/mame/drivers/gp2x.cpp | 2 +- src/mame/drivers/gp_1.cpp | 2 +- src/mame/drivers/gp_2.cpp | 2 +- src/mame/drivers/gpworld.cpp | 2 +- src/mame/drivers/grfd2301.cpp | 2 +- src/mame/drivers/gstream.cpp | 2 +- src/mame/drivers/gticlub.cpp | 6 +- src/mame/drivers/gts1.cpp | 2 +- src/mame/drivers/gts3.cpp | 2 +- src/mame/drivers/gts3a.cpp | 2 +- src/mame/drivers/gts80.cpp | 2 +- src/mame/drivers/gts80a.cpp | 4 +- src/mame/drivers/gts80b.cpp | 2 +- src/mame/drivers/guab.cpp | 2 +- src/mame/drivers/gunpey.cpp | 2 +- src/mame/drivers/h19.cpp | 2 +- src/mame/drivers/h8.cpp | 2 +- src/mame/drivers/h89.cpp | 2 +- src/mame/drivers/halleys.cpp | 2 +- src/mame/drivers/hankin.cpp | 2 +- src/mame/drivers/harddriv.cpp | 20 +- src/mame/drivers/harriet.cpp | 2 +- src/mame/drivers/hazelgr.cpp | 2 +- src/mame/drivers/headonb.cpp | 2 +- src/mame/drivers/hh_cop400.cpp | 14 +- src/mame/drivers/hh_hmcs40.cpp | 62 +-- src/mame/drivers/hh_melps4.cpp | 6 +- src/mame/drivers/hh_pic16.cpp | 4 +- src/mame/drivers/hh_sm510.cpp | 8 +- src/mame/drivers/hh_tms1k.cpp | 62 +-- src/mame/drivers/hh_ucom4.cpp | 38 +- src/mame/drivers/hideseek.cpp | 2 +- src/mame/drivers/highvdeo.cpp | 2 +- src/mame/drivers/hikaru.cpp | 2 +- src/mame/drivers/hitpoker.cpp | 2 +- src/mame/drivers/hk68v10.cpp | 2 +- src/mame/drivers/homelab.cpp | 2 +- src/mame/drivers/homez80.cpp | 2 +- src/mame/drivers/horizon.cpp | 2 +- src/mame/drivers/hornet.cpp | 6 +- src/mame/drivers/hotblock.cpp | 2 +- src/mame/drivers/hotstuff.cpp | 2 +- src/mame/drivers/hp16500.cpp | 2 +- src/mame/drivers/hp49gp.cpp | 2 +- src/mame/drivers/hp64k.cpp | 4 +- src/mame/drivers/hp9845.cpp | 4 +- src/mame/drivers/hp9k.cpp | 2 +- src/mame/drivers/hp9k_3xx.cpp | 2 +- src/mame/drivers/hp_ipc.cpp | 2 +- src/mame/drivers/hprot1.cpp | 2 +- src/mame/drivers/hpz80unk.cpp | 2 +- src/mame/drivers/ht68k.cpp | 2 +- src/mame/drivers/hunter2.cpp | 2 +- src/mame/drivers/hvyunit.cpp | 2 +- src/mame/drivers/hyperscan.cpp | 2 +- src/mame/drivers/i7000.cpp | 2 +- src/mame/drivers/ibm6580.cpp | 2 +- src/mame/drivers/ibmpc.cpp | 2 +- src/mame/drivers/ibmpcjr.cpp | 2 +- src/mame/drivers/icatel.cpp | 2 +- src/mame/drivers/ice_bozopail.cpp | 2 +- src/mame/drivers/ice_tbd.cpp | 2 +- src/mame/drivers/icecold.cpp | 2 +- src/mame/drivers/ichiban.cpp | 2 +- src/mame/drivers/ie15.cpp | 2 +- src/mame/drivers/if800.cpp | 2 +- src/mame/drivers/igs009.cpp | 2 +- src/mame/drivers/igs011.cpp | 2 +- src/mame/drivers/igs017.cpp | 2 +- src/mame/drivers/igs_fear.cpp | 2 +- src/mame/drivers/igs_m027.cpp | 2 +- src/mame/drivers/igs_m036.cpp | 2 +- src/mame/drivers/igspc.cpp | 2 +- src/mame/drivers/igspoker.cpp | 2 +- src/mame/drivers/imds.cpp | 2 +- src/mame/drivers/imds2.cpp | 2 +- src/mame/drivers/imolagp.cpp | 2 +- src/mame/drivers/imsai.cpp | 2 +- src/mame/drivers/inder.cpp | 2 +- src/mame/drivers/indiana.cpp | 2 +- src/mame/drivers/indigo.cpp | 2 +- src/mame/drivers/indy_indigo2.cpp | 2 +- src/mame/drivers/instruct.cpp | 2 +- src/mame/drivers/interact.cpp | 2 +- src/mame/drivers/intrscti.cpp | 2 +- src/mame/drivers/invqix.cpp | 2 +- src/mame/drivers/ipc.cpp | 2 +- src/mame/drivers/ipds.cpp | 2 +- src/mame/drivers/iq151.cpp | 2 +- src/mame/drivers/iris3130.cpp | 2 +- src/mame/drivers/irisha.cpp | 2 +- src/mame/drivers/isbc.cpp | 2 +- src/mame/drivers/iskr103x.cpp | 2 +- src/mame/drivers/istellar.cpp | 2 +- src/mame/drivers/iteagle.cpp | 2 +- src/mame/drivers/itech8.cpp | 4 +- src/mame/drivers/itgambl2.cpp | 2 +- src/mame/drivers/itgambl3.cpp | 2 +- src/mame/drivers/itgamble.cpp | 2 +- src/mame/drivers/itt3030.cpp | 2 +- src/mame/drivers/jackie.cpp | 2 +- src/mame/drivers/jackpool.cpp | 2 +- src/mame/drivers/jade.cpp | 2 +- src/mame/drivers/jaguar.cpp | 2 +- src/mame/drivers/jalmah.cpp | 2 +- src/mame/drivers/jangou.cpp | 2 +- src/mame/drivers/jankenmn.cpp | 2 +- src/mame/drivers/jantotsu.cpp | 2 +- src/mame/drivers/jchan.cpp | 2 +- src/mame/drivers/jclub2.cpp | 2 +- src/mame/drivers/jeutel.cpp | 2 +- src/mame/drivers/jokrwild.cpp | 2 +- src/mame/drivers/jollyjgr.cpp | 2 +- src/mame/drivers/jongkyo.cpp | 2 +- src/mame/drivers/jonos.cpp | 2 +- src/mame/drivers/joystand.cpp | 2 +- src/mame/drivers/jp.cpp | 2 +- src/mame/drivers/jpmmps.cpp | 2 +- src/mame/drivers/jpms80.cpp | 2 +- src/mame/drivers/jpmsru.cpp | 2 +- src/mame/drivers/jpmsys7.cpp | 2 +- src/mame/drivers/jr100.cpp | 2 +- src/mame/drivers/jr200.cpp | 2 +- src/mame/drivers/jrpacman.cpp | 2 +- src/mame/drivers/jtc.cpp | 8 +- src/mame/drivers/jubilee.cpp | 2 +- src/mame/drivers/juicebox.cpp | 2 +- src/mame/drivers/junior.cpp | 2 +- src/mame/drivers/junofrst.cpp | 2 +- src/mame/drivers/jupace.cpp | 2 +- src/mame/drivers/jvh.cpp | 2 +- src/mame/drivers/k1003.cpp | 2 +- src/mame/drivers/k8915.cpp | 2 +- src/mame/drivers/kaneko16.cpp | 2 +- src/mame/drivers/kas89.cpp | 2 +- src/mame/drivers/kenseim.cpp | 2 +- src/mame/drivers/kim1.cpp | 2 +- src/mame/drivers/kingdrby.cpp | 2 +- src/mame/drivers/kingpin.cpp | 2 +- src/mame/drivers/kinst.cpp | 2 +- src/mame/drivers/kissproto.cpp | 2 +- src/mame/drivers/koftball.cpp | 2 +- src/mame/drivers/koikoi.cpp | 2 +- src/mame/drivers/konamigq.cpp | 2 +- src/mame/drivers/konamigv.cpp | 2 +- src/mame/drivers/konamim2.cpp | 2 +- src/mame/drivers/konendev.cpp | 2 +- src/mame/drivers/konin.cpp | 2 +- src/mame/drivers/kontest.cpp | 2 +- src/mame/drivers/korgm1.cpp | 2 +- src/mame/drivers/ksys573.cpp | 2 +- src/mame/drivers/kungfur.cpp | 2 +- src/mame/drivers/kurukuru.cpp | 2 +- src/mame/drivers/laser3k.cpp | 2 +- src/mame/drivers/laserbas.cpp | 2 +- src/mame/drivers/lastbank.cpp | 2 +- src/mame/drivers/lastfght.cpp | 2 +- src/mame/drivers/laz_aftrshok.cpp | 2 +- src/mame/drivers/laz_awetoss.cpp | 2 +- src/mame/drivers/laz_ribrac.cpp | 2 +- src/mame/drivers/lbeach.cpp | 2 +- src/mame/drivers/lcmate2.cpp | 2 +- src/mame/drivers/leapster.cpp | 2 +- src/mame/drivers/lft.cpp | 2 +- src/mame/drivers/lg-dvd.cpp | 2 +- src/mame/drivers/lgp.cpp | 2 +- src/mame/drivers/limenko.cpp | 2 +- src/mame/drivers/lindbergh.cpp | 4 +- src/mame/drivers/littlerb.cpp | 2 +- src/mame/drivers/lola8a.cpp | 2 +- src/mame/drivers/looping.cpp | 2 +- src/mame/drivers/ltcasino.cpp | 2 +- src/mame/drivers/ltd.cpp | 2 +- src/mame/drivers/luckgrln.cpp | 2 +- src/mame/drivers/m14.cpp | 2 +- src/mame/drivers/m20.cpp | 2 +- src/mame/drivers/m24.cpp | 2 +- src/mame/drivers/m63.cpp | 2 +- src/mame/drivers/m6805evs.cpp | 2 +- src/mame/drivers/m79152pc.cpp | 2 +- src/mame/drivers/macs.cpp | 2 +- src/mame/drivers/magic10.cpp | 2 +- src/mame/drivers/magicard.cpp | 2 +- src/mame/drivers/magicfly.cpp | 2 +- src/mame/drivers/magictg.cpp | 2 +- src/mame/drivers/magtouch.cpp | 2 +- src/mame/drivers/majorpkr.cpp | 2 +- src/mame/drivers/manohman.cpp | 2 +- src/mame/drivers/marinedt.cpp | 2 +- src/mame/drivers/marywu.cpp | 2 +- src/mame/drivers/mastboy.cpp | 2 +- src/mame/drivers/maxaflex.cpp | 2 +- src/mame/drivers/maygayep.cpp | 2 +- src/mame/drivers/maygaysw.cpp | 2 +- src/mame/drivers/maygayv1.cpp | 2 +- src/mame/drivers/mayumi.cpp | 2 +- src/mame/drivers/mazerbla.cpp | 2 +- src/mame/drivers/mbc200.cpp | 2 +- src/mame/drivers/mbdtower.cpp | 2 +- src/mame/drivers/mc10.cpp | 2 +- src/mame/drivers/mcb216.cpp | 2 +- src/mame/drivers/mccpm.cpp | 2 +- src/mame/drivers/meadwttl.cpp | 2 +- src/mame/drivers/mediagx.cpp | 2 +- src/mame/drivers/megaphx.cpp | 2 +- src/mame/drivers/megaplay.cpp | 2 +- src/mame/drivers/megatech.cpp | 2 +- src/mame/drivers/meijinsn.cpp | 2 +- src/mame/drivers/mekd2.cpp | 2 +- src/mame/drivers/mephisto.cpp | 2 +- src/mame/drivers/mephistp.cpp | 2 +- src/mame/drivers/merit.cpp | 2 +- src/mame/drivers/meritm.cpp | 2 +- src/mame/drivers/mes.cpp | 2 +- src/mame/drivers/metro.cpp | 4 +- src/mame/drivers/meyc8080.cpp | 2 +- src/mame/drivers/meyc8088.cpp | 2 +- src/mame/drivers/mgames.cpp | 2 +- src/mame/drivers/mgavegas.cpp | 2 +- src/mame/drivers/mgolf.cpp | 2 +- src/mame/drivers/mice.cpp | 2 +- src/mame/drivers/micral.cpp | 2 +- src/mame/drivers/microdec.cpp | 2 +- src/mame/drivers/microkit.cpp | 2 +- src/mame/drivers/micropin.cpp | 2 +- src/mame/drivers/microvsn.cpp | 2 +- src/mame/drivers/midas.cpp | 2 +- src/mame/drivers/midqslvr.cpp | 2 +- src/mame/drivers/mikrosha.cpp | 2 +- src/mame/drivers/mil4000.cpp | 2 +- src/mame/drivers/mini2440.cpp | 2 +- src/mame/drivers/miniboy7.cpp | 2 +- src/mame/drivers/minicom.cpp | 2 +- src/mame/drivers/minivadr.cpp | 2 +- src/mame/drivers/mirage.cpp | 2 +- src/mame/drivers/mirax.cpp | 2 +- src/mame/drivers/missb2.cpp | 2 +- src/mame/drivers/missile.cpp | 2 +- src/mame/drivers/mits680b.cpp | 2 +- src/mame/drivers/mjsister.cpp | 2 +- src/mame/drivers/mk1.cpp | 2 +- src/mame/drivers/mk14.cpp | 2 +- src/mame/drivers/mk2.cpp | 2 +- src/mame/drivers/mk85.cpp | 2 +- src/mame/drivers/mk90.cpp | 2 +- src/mame/drivers/mkit09.cpp | 2 +- src/mame/drivers/mlanding.cpp | 2 +- src/mame/drivers/mmagic.cpp | 2 +- src/mame/drivers/mmd1.cpp | 2 +- src/mame/drivers/mmm.cpp | 2 +- src/mame/drivers/mmodular.cpp | 2 +- src/mame/drivers/mod8.cpp | 2 +- src/mame/drivers/modellot.cpp | 2 +- src/mame/drivers/mogura.cpp | 2 +- src/mame/drivers/mole.cpp | 2 +- src/mame/drivers/molecular.cpp | 2 +- src/mame/drivers/monacogp.cpp | 2 +- src/mame/drivers/monty.cpp | 2 +- src/mame/drivers/monzagp.cpp | 2 +- src/mame/drivers/mps1230.cpp | 2 +- src/mame/drivers/mpu12wbk.cpp | 2 +- src/mame/drivers/mpu2.cpp | 2 +- src/mame/drivers/mpu3.cpp | 2 +- src/mame/drivers/mpu4dealem.cpp | 2 +- src/mame/drivers/mpu4plasma.cpp | 2 +- src/mame/drivers/mpu4vid.cpp | 2 +- src/mame/drivers/mpu5hw.cpp | 2 +- src/mame/drivers/mquake.cpp | 2 +- src/mame/drivers/mrgame.cpp | 2 +- src/mame/drivers/ms0515.cpp | 2 +- src/mame/drivers/ms9540.cpp | 2 +- src/mame/drivers/mstation.cpp | 2 +- src/mame/drivers/mt735.cpp | 4 +- src/mame/drivers/multi16.cpp | 2 +- src/mame/drivers/multi8.cpp | 2 +- src/mame/drivers/multigam.cpp | 2 +- src/mame/drivers/murogem.cpp | 2 +- src/mame/drivers/murogmbl.cpp | 2 +- src/mame/drivers/mvme350.cpp | 2 +- src/mame/drivers/mw18w.cpp | 2 +- src/mame/drivers/mwarr.cpp | 2 +- src/mame/drivers/mwsub.cpp | 2 +- src/mame/drivers/mx2178.cpp | 2 +- src/mame/drivers/myb3k.cpp | 2 +- src/mame/drivers/mycom.cpp | 2 +- src/mame/drivers/myvision.cpp | 2 +- src/mame/drivers/mz2000.cpp | 2 +- src/mame/drivers/mz2500.cpp | 2 +- src/mame/drivers/mz3500.cpp | 2 +- src/mame/drivers/mz6500.cpp | 2 +- src/mame/drivers/mzr8105.cpp | 2 +- src/mame/drivers/n64.cpp | 2 +- src/mame/drivers/nakajies.cpp | 2 +- src/mame/drivers/namcops2.cpp | 2 +- src/mame/drivers/namcos10.cpp | 2 +- src/mame/drivers/namcos11.cpp | 2 +- src/mame/drivers/namcos12.cpp | 2 +- src/mame/drivers/namcos23.cpp | 8 +- src/mame/drivers/nanos.cpp | 2 +- src/mame/drivers/nascom1.cpp | 6 +- src/mame/drivers/neoprint.cpp | 2 +- src/mame/drivers/neptunp2.cpp | 2 +- src/mame/drivers/nexus3d.cpp | 2 +- src/mame/drivers/ng_aes.cpp | 2 +- src/mame/drivers/ngen.cpp | 4 +- src/mame/drivers/ngp.cpp | 2 +- src/mame/drivers/nightgal.cpp | 2 +- src/mame/drivers/ninjaw.cpp | 4 +- src/mame/drivers/nmg5.cpp | 2 +- src/mame/drivers/nokia_3310.cpp | 2 +- src/mame/drivers/nsm.cpp | 2 +- src/mame/drivers/nsmpoker.cpp | 2 +- src/mame/drivers/nss.cpp | 2 +- src/mame/drivers/nwk-tr.cpp | 2 +- src/mame/drivers/nyny.cpp | 2 +- src/mame/drivers/octopus.cpp | 2 +- src/mame/drivers/odyssey2.cpp | 4 +- src/mame/drivers/okean240.cpp | 2 +- src/mame/drivers/olibochu.cpp | 2 +- src/mame/drivers/omegrace.cpp | 2 +- src/mame/drivers/onetwo.cpp | 2 +- src/mame/drivers/onyx.cpp | 2 +- src/mame/drivers/oric.cpp | 4 +- src/mame/drivers/osbexec.cpp | 2 +- src/mame/drivers/othello.cpp | 2 +- src/mame/drivers/p112.cpp | 2 +- src/mame/drivers/p8k.cpp | 2 +- src/mame/drivers/pachifev.cpp | 2 +- src/mame/drivers/palm.cpp | 2 +- src/mame/drivers/palmz22.cpp | 2 +- src/mame/drivers/pangofun.cpp | 2 +- src/mame/drivers/panicr.cpp | 2 +- src/mame/drivers/paranoia.cpp | 2 +- src/mame/drivers/pasha2.cpp | 2 +- src/mame/drivers/paso1600.cpp | 2 +- src/mame/drivers/pasogo.cpp | 2 +- src/mame/drivers/pasopia.cpp | 2 +- src/mame/drivers/pasopia7.cpp | 2 +- src/mame/drivers/patinho_feio.cpp | 2 +- src/mame/drivers/pb1000.cpp | 2 +- src/mame/drivers/pc.cpp | 2 +- src/mame/drivers/pc100.cpp | 2 +- src/mame/drivers/pc1500.cpp | 2 +- src/mame/drivers/pc2000.cpp | 8 +- src/mame/drivers/pc6001.cpp | 2 +- src/mame/drivers/pc8801.cpp | 2 +- src/mame/drivers/pc88va.cpp | 2 +- src/mame/drivers/pc9801.cpp | 2 +- src/mame/drivers/pcat_dyn.cpp | 2 +- src/mame/drivers/pcat_nit.cpp | 2 +- src/mame/drivers/pcd.cpp | 2 +- src/mame/drivers/pce220.cpp | 4 +- src/mame/drivers/pcfx.cpp | 2 +- src/mame/drivers/pcm.cpp | 2 +- src/mame/drivers/pcxt.cpp | 10 +- src/mame/drivers/pda600.cpp | 2 +- src/mame/drivers/pdp1.cpp | 16 +- src/mame/drivers/pdp11.cpp | 2 +- src/mame/drivers/pegasus.cpp | 2 +- src/mame/drivers/pencil2.cpp | 2 +- src/mame/drivers/pengadvb.cpp | 2 +- src/mame/drivers/pengo.cpp | 2 +- src/mame/drivers/pentagon.cpp | 2 +- src/mame/drivers/peoplepc.cpp | 2 +- src/mame/drivers/peplus.cpp | 2 +- src/mame/drivers/peyper.cpp | 2 +- src/mame/drivers/pgm2.cpp | 2 +- src/mame/drivers/photon.cpp | 2 +- src/mame/drivers/photon2.cpp | 2 +- src/mame/drivers/photoply.cpp | 2 +- src/mame/drivers/phunsy.cpp | 2 +- src/mame/drivers/piggypas.cpp | 2 +- src/mame/drivers/pimps.cpp | 2 +- src/mame/drivers/pinball2k.cpp | 2 +- src/mame/drivers/pinkiri8.cpp | 6 +- src/mame/drivers/pipbug.cpp | 2 +- src/mame/drivers/pipedrm.cpp | 2 +- src/mame/drivers/pipeline.cpp | 2 +- src/mame/drivers/pitagjr.cpp | 2 +- src/mame/drivers/pk8000.cpp | 2 +- src/mame/drivers/pkscram.cpp | 2 +- src/mame/drivers/plan80.cpp | 2 +- src/mame/drivers/play_1.cpp | 2 +- src/mame/drivers/play_2.cpp | 2 +- src/mame/drivers/play_3.cpp | 2 +- src/mame/drivers/play_5.cpp | 2 +- src/mame/drivers/pluto5.cpp | 2 +- src/mame/drivers/pm68k.cpp | 2 +- src/mame/drivers/pmi80.cpp | 2 +- src/mame/drivers/pntnpuzl.cpp | 2 +- src/mame/drivers/pockstat.cpp | 2 +- src/mame/drivers/pokemini.cpp | 2 +- src/mame/drivers/poker72.cpp | 2 +- src/mame/drivers/poly.cpp | 2 +- src/mame/drivers/pong.cpp | 6 +- src/mame/drivers/popobear.cpp | 2 +- src/mame/drivers/potgoldu.cpp | 2 +- src/mame/drivers/powerbal.cpp | 2 +- src/mame/drivers/ppmast93.cpp | 2 +- src/mame/drivers/prestige.cpp | 2 +- src/mame/drivers/pro80.cpp | 2 +- src/mame/drivers/proconn.cpp | 2 +- src/mame/drivers/progolf.cpp | 2 +- src/mame/drivers/prophet600.cpp | 2 +- src/mame/drivers/proteus3.cpp | 2 +- src/mame/drivers/pse.cpp | 2 +- src/mame/drivers/psx.cpp | 2 +- src/mame/drivers/pt68k4.cpp | 2 +- src/mame/drivers/ptcsol.cpp | 2 +- src/mame/drivers/pturn.cpp | 2 +- src/mame/drivers/pulsar.cpp | 2 +- src/mame/drivers/pv1000.cpp | 6 +- src/mame/drivers/pv2000.cpp | 2 +- src/mame/drivers/pv9234.cpp | 2 +- src/mame/drivers/pve500.cpp | 2 +- src/mame/drivers/px4.cpp | 6 +- src/mame/drivers/pyl601.cpp | 2 +- src/mame/drivers/pyson.cpp | 2 +- src/mame/drivers/pzletime.cpp | 2 +- src/mame/drivers/qtsbc.cpp | 2 +- src/mame/drivers/quakeat.cpp | 2 +- src/mame/drivers/quantum.cpp | 2 +- src/mame/drivers/queen.cpp | 2 +- src/mame/drivers/quizo.cpp | 2 +- src/mame/drivers/quizpun2.cpp | 2 +- src/mame/drivers/quizshow.cpp | 2 +- src/mame/drivers/qx10.cpp | 2 +- src/mame/drivers/r2dtank.cpp | 2 +- src/mame/drivers/r2dx_v33.cpp | 2 +- src/mame/drivers/r9751.cpp | 2 +- src/mame/drivers/rabbit.cpp | 2 +- src/mame/drivers/rainbow.cpp | 2 +- src/mame/drivers/rambo.cpp | 2 +- src/mame/drivers/ramtek.cpp | 2 +- src/mame/drivers/rastersp.cpp | 2 +- src/mame/drivers/ravens.cpp | 2 +- src/mame/drivers/rbmk.cpp | 2 +- src/mame/drivers/rc759.cpp | 2 +- src/mame/drivers/rcorsair.cpp | 2 +- src/mame/drivers/rd100.cpp | 2 +- src/mame/drivers/rd110.cpp | 4 +- src/mame/drivers/re900.cpp | 2 +- src/mame/drivers/replicator.cpp | 2 +- src/mame/drivers/rex6000.cpp | 2 +- src/mame/drivers/rgum.cpp | 2 +- src/mame/drivers/riscpc.cpp | 2 +- src/mame/drivers/rmhaihai.cpp | 2 +- src/mame/drivers/rmt32.cpp | 4 +- src/mame/drivers/rollext.cpp | 2 +- src/mame/drivers/rotaryf.cpp | 2 +- src/mame/drivers/roul.cpp | 2 +- src/mame/drivers/route16.cpp | 2 +- src/mame/drivers/rowamet.cpp | 2 +- src/mame/drivers/royalmah.cpp | 2 +- src/mame/drivers/rsc55.cpp | 4 +- src/mame/drivers/rt1715.cpp | 2 +- src/mame/drivers/rvoice.cpp | 2 +- src/mame/drivers/rx78.cpp | 2 +- src/mame/drivers/s3.cpp | 2 +- src/mame/drivers/s4.cpp | 2 +- src/mame/drivers/s6.cpp | 2 +- src/mame/drivers/s6a.cpp | 2 +- src/mame/drivers/s7.cpp | 2 +- src/mame/drivers/s8.cpp | 2 +- src/mame/drivers/s8a.cpp | 2 +- src/mame/drivers/s9.cpp | 2 +- src/mame/drivers/sacstate.cpp | 2 +- src/mame/drivers/safarir.cpp | 2 +- src/mame/drivers/sam.cpp | 2 +- src/mame/drivers/sandscrp.cpp | 2 +- src/mame/drivers/sangho.cpp | 2 +- src/mame/drivers/sanremmg.cpp | 2 +- src/mame/drivers/sanremo.cpp | 2 +- src/mame/drivers/sansa_fuze.cpp | 2 +- src/mame/drivers/sapi1.cpp | 2 +- src/mame/drivers/saturn.cpp | 2 +- src/mame/drivers/savia84.cpp | 2 +- src/mame/drivers/savquest.cpp | 2 +- src/mame/drivers/sbc6510.cpp | 2 +- src/mame/drivers/sbowling.cpp | 2 +- src/mame/drivers/sbrain.cpp | 2 +- src/mame/drivers/sbrkout.cpp | 2 +- src/mame/drivers/sc1.cpp | 2 +- src/mame/drivers/sc2.cpp | 2 +- src/mame/drivers/scm_500.cpp | 2 +- src/mame/drivers/scobra.cpp | 2 +- src/mame/drivers/scorpion.cpp | 2 +- src/mame/drivers/scregg.cpp | 2 +- src/mame/drivers/scv.cpp | 2 +- src/mame/drivers/sdk80.cpp | 2 +- src/mame/drivers/sdk85.cpp | 2 +- src/mame/drivers/sdk86.cpp | 2 +- src/mame/drivers/seabattl.cpp | 2 +- src/mame/drivers/sealy.cpp | 2 +- src/mame/drivers/seattle.cpp | 2 +- src/mame/drivers/seattlecmp.cpp | 2 +- src/mame/drivers/sega_sawatte.cpp | 2 +- src/mame/drivers/segac2.cpp | 2 +- src/mame/drivers/segacoin.cpp | 2 +- src/mame/drivers/segae.cpp | 2 +- src/mame/drivers/segajw.cpp | 2 +- src/mame/drivers/segald.cpp | 2 +- src/mame/drivers/segam1.cpp | 2 +- src/mame/drivers/segapico.cpp | 6 +- src/mame/drivers/segapm.cpp | 2 +- src/mame/drivers/segas24.cpp | 12 +- src/mame/drivers/segas32.cpp | 10 +- src/mame/drivers/segaufo.cpp | 2 +- src/mame/drivers/segaxbd.cpp | 20 +- src/mame/drivers/selz80.cpp | 2 +- src/mame/drivers/sengokmj.cpp | 2 +- src/mame/drivers/seta2.cpp | 4 +- src/mame/drivers/sfbonus.cpp | 2 +- src/mame/drivers/sfcbox.cpp | 2 +- src/mame/drivers/sfkick.cpp | 2 +- src/mame/drivers/sg1000a.cpp | 2 +- src/mame/drivers/sh4robot.cpp | 2 +- src/mame/drivers/shanghai.cpp | 2 +- src/mame/drivers/shougi.cpp | 2 +- src/mame/drivers/shtzone.cpp | 2 +- src/mame/drivers/sigmab52.cpp | 2 +- src/mame/drivers/sigmab98.cpp | 2 +- src/mame/drivers/silvmil.cpp | 2 +- src/mame/drivers/sitcom.cpp | 2 +- src/mame/drivers/skeetsht.cpp | 2 +- src/mame/drivers/skimaxx.cpp | 2 +- src/mame/drivers/skyarmy.cpp | 2 +- src/mame/drivers/skylncr.cpp | 2 +- src/mame/drivers/slc1.cpp | 2 +- src/mame/drivers/sleic.cpp | 2 +- src/mame/drivers/slicer.cpp | 2 +- src/mame/drivers/sliver.cpp | 2 +- src/mame/drivers/slotcarn.cpp | 2 +- src/mame/drivers/sm1800.cpp | 2 +- src/mame/drivers/smc777.cpp | 2 +- src/mame/drivers/smsmcorp.cpp | 2 +- src/mame/drivers/snes.cpp | 2 +- src/mame/drivers/snesb.cpp | 2 +- src/mame/drivers/socrates.cpp | 4 +- src/mame/drivers/sothello.cpp | 2 +- src/mame/drivers/spaceg.cpp | 2 +- src/mame/drivers/spc1000.cpp | 2 +- src/mame/drivers/spc1500.cpp | 2 +- src/mame/drivers/spectra.cpp | 2 +- src/mame/drivers/speglsht.cpp | 2 +- src/mame/drivers/spinb.cpp | 2 +- src/mame/drivers/splus.cpp | 2 +- src/mame/drivers/spoker.cpp | 2 +- src/mame/drivers/spool99.cpp | 2 +- src/mame/drivers/squale.cpp | 2 +- src/mame/drivers/srmp5.cpp | 2 +- src/mame/drivers/srmp6.cpp | 2 +- src/mame/drivers/ssem.cpp | 2 +- src/mame/drivers/ssfindo.cpp | 2 +- src/mame/drivers/sshot.cpp | 2 +- src/mame/drivers/ssingles.cpp | 2 +- src/mame/drivers/sstrangr.cpp | 2 +- src/mame/drivers/st17xx.cpp | 2 +- src/mame/drivers/st_mp100.cpp | 2 +- src/mame/drivers/st_mp200.cpp | 2 +- src/mame/drivers/statriv2.cpp | 2 +- src/mame/drivers/stellafr.cpp | 2 +- src/mame/drivers/stratos.cpp | 2 +- src/mame/drivers/studio2.cpp | 6 +- src/mame/drivers/stuntair.cpp | 2 +- src/mame/drivers/su2000.cpp | 2 +- src/mame/drivers/sub.cpp | 2 +- src/mame/drivers/subhuntr.cpp | 2 +- src/mame/drivers/subsino.cpp | 2 +- src/mame/drivers/subsino2.cpp | 2 +- src/mame/drivers/summit.cpp | 2 +- src/mame/drivers/sumt8035.cpp | 2 +- src/mame/drivers/sun1.cpp | 2 +- src/mame/drivers/sun2.cpp | 2 +- src/mame/drivers/sun3.cpp | 2 +- src/mame/drivers/sun4.cpp | 2 +- src/mame/drivers/supdrapo.cpp | 2 +- src/mame/drivers/supduck.cpp | 2 +- src/mame/drivers/supercon.cpp | 2 +- src/mame/drivers/supercrd.cpp | 2 +- src/mame/drivers/superdq.cpp | 2 +- src/mame/drivers/supertnk.cpp | 2 +- src/mame/drivers/superwng.cpp | 2 +- src/mame/drivers/supracan.cpp | 8 +- src/mame/drivers/suprgolf.cpp | 2 +- src/mame/drivers/suprnova.cpp | 2 +- src/mame/drivers/sv8000.cpp | 2 +- src/mame/drivers/svmu.cpp | 2 +- src/mame/drivers/swtpc.cpp | 2 +- src/mame/drivers/swyft.cpp | 2 +- src/mame/drivers/sym1.cpp | 2 +- src/mame/drivers/sys2900.cpp | 2 +- src/mame/drivers/systec.cpp | 2 +- src/mame/drivers/taito.cpp | 2 +- src/mame/drivers/taito_z.cpp | 2 +- src/mame/drivers/taitogn.cpp | 2 +- src/mame/drivers/taitopjc.cpp | 2 +- src/mame/drivers/taitottl.cpp | 2 +- src/mame/drivers/taitotx.cpp | 2 +- src/mame/drivers/taitotz.cpp | 2 +- src/mame/drivers/taitowlf.cpp | 2 +- src/mame/drivers/tamag1.cpp | 2 +- src/mame/drivers/tandy1t.cpp | 2 +- src/mame/drivers/tapatune.cpp | 2 +- src/mame/drivers/tasman.cpp | 2 +- src/mame/drivers/tattack.cpp | 2 +- src/mame/drivers/tavernie.cpp | 2 +- src/mame/drivers/tb303.cpp | 2 +- src/mame/drivers/tcl.cpp | 2 +- src/mame/drivers/tec1.cpp | 2 +- src/mame/drivers/techno.cpp | 2 +- src/mame/drivers/tecnbras.cpp | 2 +- src/mame/drivers/tek410x.cpp | 2 +- src/mame/drivers/tekxp33x.cpp | 2 +- src/mame/drivers/tempest.cpp | 2 +- src/mame/drivers/terak.cpp | 2 +- src/mame/drivers/test_t400.cpp | 2 +- src/mame/drivers/tgtpanic.cpp | 2 +- src/mame/drivers/thayers.cpp | 2 +- src/mame/drivers/thedealr.cpp | 2 +- src/mame/drivers/ti630.cpp | 2 +- src/mame/drivers/ti74.cpp | 2 +- src/mame/drivers/ti990_10.cpp | 2 +- src/mame/drivers/ti990_4.cpp | 2 +- src/mame/drivers/ti99_2.cpp | 2 +- src/mame/drivers/ti99_4p.cpp | 2 +- src/mame/drivers/ti99_4x.cpp | 2 +- src/mame/drivers/ti99_8.cpp | 2 +- src/mame/drivers/ticalc1x.cpp | 18 +- src/mame/drivers/tickee.cpp | 2 +- src/mame/drivers/tim011.cpp | 2 +- src/mame/drivers/tim100.cpp | 2 +- src/mame/drivers/timetrv.cpp | 2 +- src/mame/drivers/tispeak.cpp | 2 +- src/mame/drivers/tispellb.cpp | 2 +- src/mame/drivers/tk2000.cpp | 2 +- src/mame/drivers/tk80.cpp | 2 +- src/mame/drivers/tk80bs.cpp | 2 +- src/mame/drivers/tm990189.cpp | 6 +- src/mame/drivers/tmaster.cpp | 2 +- src/mame/drivers/tmmjprd.cpp | 2 +- src/mame/drivers/tmspoker.cpp | 2 +- src/mame/drivers/tokyocop.cpp | 2 +- src/mame/drivers/tomcat.cpp | 2 +- src/mame/drivers/tonton.cpp | 2 +- src/mame/drivers/topspeed.cpp | 2 +- src/mame/drivers/toratora.cpp | 2 +- src/mame/drivers/tourtabl.cpp | 2 +- src/mame/drivers/tourvis.cpp | 2 +- src/mame/drivers/tricep.cpp | 2 +- src/mame/drivers/triforce.cpp | 2 +- src/mame/drivers/trvmadns.cpp | 2 +- src/mame/drivers/ts802.cpp | 2 +- src/mame/drivers/ts803.cpp | 2 +- src/mame/drivers/ts816.cpp | 2 +- src/mame/drivers/ttchamp.cpp | 2 +- src/mame/drivers/tugboat.cpp | 2 +- src/mame/drivers/turrett.cpp | 2 +- src/mame/drivers/tutor.cpp | 2 +- src/mame/drivers/tv950.cpp | 2 +- src/mame/drivers/tvc.cpp | 2 +- src/mame/drivers/tvcapcom.cpp | 2 +- src/mame/drivers/tvgame.cpp | 2 +- src/mame/drivers/twinkle.cpp | 2 +- src/mame/drivers/twins.cpp | 2 +- src/mame/drivers/tx0.cpp | 16 +- src/mame/drivers/uapce.cpp | 2 +- src/mame/drivers/uknc.cpp | 2 +- src/mame/drivers/ultrsprt.cpp | 2 +- src/mame/drivers/umipoker.cpp | 2 +- src/mame/drivers/unichamp.cpp | 2 +- src/mame/drivers/unior.cpp | 2 +- src/mame/drivers/unistar.cpp | 2 +- src/mame/drivers/univac.cpp | 2 +- src/mame/drivers/unixpc.cpp | 2 +- src/mame/drivers/unkfr.cpp | 2 +- src/mame/drivers/unkhorse.cpp | 2 +- src/mame/drivers/upscope.cpp | 2 +- src/mame/drivers/uzebox.cpp | 2 +- src/mame/drivers/v6809.cpp | 2 +- src/mame/drivers/vamphalf.cpp | 2 +- src/mame/drivers/vax11.cpp | 2 +- src/mame/drivers/vboy.cpp | 2 +- src/mame/drivers/vcombat.cpp | 8 +- src/mame/drivers/vd.cpp | 2 +- src/mame/drivers/vector4.cpp | 2 +- src/mame/drivers/vega.cpp | 2 +- src/mame/drivers/vegaeo.cpp | 2 +- src/mame/drivers/vegas.cpp | 2 +- src/mame/drivers/vg5k.cpp | 2 +- src/mame/drivers/videopkr.cpp | 2 +- src/mame/drivers/vii.cpp | 2 +- src/mame/drivers/viper.cpp | 2 +- src/mame/drivers/vk100.cpp | 2 +- src/mame/drivers/vlc.cpp | 2 +- src/mame/drivers/votrpss.cpp | 2 +- src/mame/drivers/votrtnt.cpp | 2 +- src/mame/drivers/voyager.cpp | 2 +- src/mame/drivers/vp101.cpp | 2 +- src/mame/drivers/vpoker.cpp | 2 +- src/mame/drivers/vroulet.cpp | 2 +- src/mame/drivers/vt100.cpp | 2 +- src/mame/drivers/vt220.cpp | 2 +- src/mame/drivers/vt240.cpp | 2 +- src/mame/drivers/vt320.cpp | 2 +- src/mame/drivers/vt520.cpp | 2 +- src/mame/drivers/vta2000.cpp | 2 +- src/mame/drivers/vtech1.cpp | 2 +- src/mame/drivers/wacky_gator.cpp | 2 +- src/mame/drivers/wallc.cpp | 2 +- src/mame/drivers/wardner.cpp | 2 +- src/mame/drivers/warpsped.cpp | 2 +- src/mame/drivers/wheelfir.cpp | 2 +- src/mame/drivers/white_mod.cpp | 2 +- src/mame/drivers/whitestar.cpp | 2 +- src/mame/drivers/wicat.cpp | 2 +- src/mame/drivers/wico.cpp | 2 +- src/mame/drivers/wildfire.cpp | 2 +- src/mame/drivers/wildpkr.cpp | 2 +- src/mame/drivers/wink.cpp | 2 +- src/mame/drivers/witch.cpp | 2 +- src/mame/drivers/wmg.cpp | 4 +- src/mame/drivers/wms.cpp | 2 +- src/mame/drivers/wpc_95.cpp | 2 +- src/mame/drivers/wpc_an.cpp | 2 +- src/mame/drivers/wpc_dcs.cpp | 2 +- src/mame/drivers/wpc_s.cpp | 2 +- src/mame/drivers/wyvernf0.cpp | 2 +- src/mame/drivers/x1twin.cpp | 2 +- src/mame/drivers/xavix.cpp | 2 +- src/mame/drivers/xbox.cpp | 2 +- src/mame/drivers/xtheball.cpp | 2 +- src/mame/drivers/xtom3d.cpp | 2 +- src/mame/drivers/ymmu100.cpp | 4 +- src/mame/drivers/z100.cpp | 2 +- src/mame/drivers/z1013.cpp | 2 +- src/mame/drivers/z80dev.cpp | 2 +- src/mame/drivers/z9001.cpp | 2 +- src/mame/drivers/zac_1.cpp | 2 +- src/mame/drivers/zac_2.cpp | 2 +- src/mame/drivers/zac_proto.cpp | 2 +- src/mame/drivers/zapcomputer.cpp | 2 +- src/mame/drivers/zaurus.cpp | 2 +- src/mame/drivers/zexall.cpp | 2 +- src/mame/drivers/zn.cpp | 2 +- src/mame/drivers/zorba.cpp | 2 +- src/mame/drivers/zr107.cpp | 2 +- src/mame/drivers/zrt80.cpp | 2 +- src/mame/drivers/zsbc3.cpp | 2 +- src/mame/etc/template_cpu.cpp | 2 +- src/mame/etc/template_device.cpp | 2 +- src/mame/etc/template_device.h | 2 +- src/mame/etc/template_driver.cpp | 2 +- src/mame/includes/1942.h | 2 +- src/mame/includes/1943.h | 2 +- src/mame/includes/20pacgal.h | 4 +- src/mame/includes/3do.h | 2 +- src/mame/includes/40love.h | 2 +- src/mame/includes/4enraya.h | 2 +- src/mame/includes/8080bw.h | 2 +- src/mame/includes/88games.h | 2 +- src/mame/includes/abc1600.h | 2 +- src/mame/includes/abc80.h | 2 +- src/mame/includes/abc80x.h | 10 +- src/mame/includes/ac1.h | 2 +- src/mame/includes/actfancr.h | 2 +- src/mame/includes/adam.h | 2 +- src/mame/includes/advision.h | 2 +- src/mame/includes/aeroboto.h | 2 +- src/mame/includes/aerofgt.h | 2 +- src/mame/includes/aim65.h | 2 +- src/mame/includes/airbustr.h | 2 +- src/mame/includes/ajax.h | 2 +- src/mame/includes/alesis.h | 4 +- src/mame/includes/aliens.h | 2 +- src/mame/includes/alpha68k.h | 2 +- src/mame/includes/ambush.h | 2 +- src/mame/includes/amiga.h | 2 +- src/mame/includes/ampoker2.h | 2 +- src/mame/includes/amspdwy.h | 2 +- src/mame/includes/amstrad.h | 2 +- src/mame/includes/angelkds.h | 2 +- src/mame/includes/apollo.h | 18 +- src/mame/includes/apple1.h | 2 +- src/mame/includes/apple2.h | 2 +- src/mame/includes/apple2gs.h | 2 +- src/mame/includes/apple3.h | 2 +- src/mame/includes/appoooh.h | 2 +- src/mame/includes/aquarium.h | 2 +- src/mame/includes/aquarius.h | 2 +- src/mame/includes/arabian.h | 2 +- src/mame/includes/arcadecl.h | 2 +- src/mame/includes/arcadia.h | 2 +- src/mame/includes/archimds.h | 2 +- src/mame/includes/argus.h | 2 +- src/mame/includes/arkanoid.h | 2 +- src/mame/includes/armedf.h | 4 +- src/mame/includes/artmagic.h | 2 +- src/mame/includes/ashnojoe.h | 2 +- src/mame/includes/asterix.h | 2 +- src/mame/includes/asteroid.h | 2 +- src/mame/includes/astrocde.h | 2 +- src/mame/includes/astrof.h | 2 +- src/mame/includes/asuka.h | 2 +- src/mame/includes/at.h | 6 +- src/mame/includes/atari.h | 2 +- src/mame/includes/atarifb.h | 2 +- src/mame/includes/atarig1.h | 2 +- src/mame/includes/atarig42.h | 2 +- src/mame/includes/atarigt.h | 2 +- src/mame/includes/atarigx2.h | 2 +- src/mame/includes/atarist.h | 10 +- src/mame/includes/atarisy1.h | 2 +- src/mame/includes/atarisy2.h | 2 +- src/mame/includes/atetris.h | 2 +- src/mame/includes/atom.h | 4 +- src/mame/includes/aussiebyte.h | 2 +- src/mame/includes/avalnche.h | 2 +- src/mame/includes/avigo.h | 2 +- src/mame/includes/aztarac.h | 2 +- src/mame/includes/b2m.h | 2 +- src/mame/includes/badlands.h | 2 +- src/mame/includes/bagman.h | 2 +- src/mame/includes/balsente.h | 2 +- src/mame/includes/banctec.h | 2 +- src/mame/includes/bankp.h | 2 +- src/mame/includes/baraduke.h | 2 +- src/mame/includes/batman.h | 2 +- src/mame/includes/battlane.h | 2 +- src/mame/includes/battlera.h | 2 +- src/mame/includes/battlex.h | 2 +- src/mame/includes/battlnts.h | 2 +- src/mame/includes/bbc.h | 2 +- src/mame/includes/bbusters.h | 2 +- src/mame/includes/beathead.h | 2 +- src/mame/includes/bebox.h | 2 +- src/mame/includes/beezer.h | 4 +- src/mame/includes/bfm_ad5.h | 2 +- src/mame/includes/bfm_sc45.h | 6 +- src/mame/includes/bfm_sc5.h | 2 +- src/mame/includes/bigevglf.h | 2 +- src/mame/includes/bigstrkb.h | 2 +- src/mame/includes/bionicc.h | 2 +- src/mame/includes/bishi.h | 2 +- src/mame/includes/bk.h | 2 +- src/mame/includes/bking.h | 2 +- src/mame/includes/bladestl.h | 2 +- src/mame/includes/blktiger.h | 2 +- src/mame/includes/blmbycar.h | 2 +- src/mame/includes/blockade.h | 2 +- src/mame/includes/blockout.h | 2 +- src/mame/includes/bloodbro.h | 2 +- src/mame/includes/blstroid.h | 2 +- src/mame/includes/blueprnt.h | 2 +- src/mame/includes/bogeyman.h | 2 +- src/mame/includes/bombjack.h | 2 +- src/mame/includes/boogwing.h | 2 +- src/mame/includes/bottom9.h | 2 +- src/mame/includes/brkthru.h | 2 +- src/mame/includes/bsktball.h | 2 +- src/mame/includes/btime.h | 2 +- src/mame/includes/btoads.h | 2 +- src/mame/includes/bublbobl.h | 2 +- src/mame/includes/buggychl.h | 2 +- src/mame/includes/bullet.h | 4 +- src/mame/includes/busicom.h | 2 +- src/mame/includes/bw12.h | 2 +- src/mame/includes/bw2.h | 2 +- src/mame/includes/bwidow.h | 2 +- src/mame/includes/bwing.h | 2 +- src/mame/includes/bzone.h | 2 +- src/mame/includes/c128.h | 2 +- src/mame/includes/c64.h | 8 +- src/mame/includes/c80.h | 2 +- src/mame/includes/cabal.h | 2 +- src/mame/includes/calomega.h | 2 +- src/mame/includes/canyon.h | 2 +- src/mame/includes/capbowl.h | 2 +- src/mame/includes/carjmbre.h | 2 +- src/mame/includes/carpolo.h | 2 +- src/mame/includes/cave.h | 2 +- src/mame/includes/cbasebal.h | 2 +- src/mame/includes/cbm2.h | 6 +- src/mame/includes/cbuster.h | 2 +- src/mame/includes/ccastles.h | 2 +- src/mame/includes/cchasm.h | 2 +- src/mame/includes/cclimber.h | 2 +- src/mame/includes/cdi.h | 2 +- src/mame/includes/centiped.h | 2 +- src/mame/includes/cgc7900.h | 2 +- src/mame/includes/chaknpop.h | 2 +- src/mame/includes/champbas.h | 2 +- src/mame/includes/changela.h | 2 +- src/mame/includes/channelf.h | 2 +- src/mame/includes/cheekyms.h | 2 +- src/mame/includes/chqflag.h | 2 +- src/mame/includes/cidelsa.h | 4 +- src/mame/includes/cinemat.h | 2 +- src/mame/includes/circus.h | 2 +- src/mame/includes/circusc.h | 2 +- src/mame/includes/cischeat.h | 2 +- src/mame/includes/citycon.h | 2 +- src/mame/includes/cloak.h | 2 +- src/mame/includes/cloud9.h | 2 +- src/mame/includes/clshroad.h | 2 +- src/mame/includes/cninja.h | 2 +- src/mame/includes/coco.h | 2 +- src/mame/includes/coco12.h | 2 +- src/mame/includes/coco3.h | 2 +- src/mame/includes/coleco.h | 2 +- src/mame/includes/combatsc.h | 2 +- src/mame/includes/commando.h | 2 +- src/mame/includes/compgolf.h | 2 +- src/mame/includes/compis.h | 2 +- src/mame/includes/comquest.h | 2 +- src/mame/includes/comx35.h | 2 +- src/mame/includes/concept.h | 2 +- src/mame/includes/contra.h | 2 +- src/mame/includes/coolpool.h | 2 +- src/mame/includes/cop01.h | 2 +- src/mame/includes/copsnrob.h | 2 +- src/mame/includes/cosmic.h | 2 +- src/mame/includes/cosmicos.h | 2 +- src/mame/includes/cps1.h | 2 +- src/mame/includes/cps3.h | 2 +- src/mame/includes/crbaloon.h | 2 +- src/mame/includes/crgolf.h | 2 +- src/mame/includes/crimfght.h | 2 +- src/mame/includes/crospang.h | 2 +- src/mame/includes/crshrace.h | 2 +- src/mame/includes/crvision.h | 6 +- src/mame/includes/cvs.h | 2 +- src/mame/includes/cxhumax.h | 2 +- src/mame/includes/cyberbal.h | 2 +- src/mame/includes/cybiko.h | 2 +- src/mame/includes/dai.h | 2 +- src/mame/includes/darius.h | 2 +- src/mame/includes/darkmist.h | 2 +- src/mame/includes/darkseal.h | 2 +- src/mame/includes/dassault.h | 2 +- src/mame/includes/dbz.h | 2 +- src/mame/includes/dc.h | 2 +- src/mame/includes/dccons.h | 2 +- src/mame/includes/dcheese.h | 2 +- src/mame/includes/dcon.h | 2 +- src/mame/includes/dday.h | 2 +- src/mame/includes/ddragon.h | 2 +- src/mame/includes/ddragon3.h | 4 +- src/mame/includes/ddribble.h | 2 +- src/mame/includes/deadang.h | 2 +- src/mame/includes/dec0.h | 4 +- src/mame/includes/dec8.h | 2 +- src/mame/includes/deco32.h | 4 +- src/mame/includes/deco_mlc.h | 2 +- src/mame/includes/decocass.h | 2 +- src/mame/includes/decocrpt.h | 6 +- src/mame/includes/deniam.h | 2 +- src/mame/includes/dgn_beta.h | 2 +- src/mame/includes/dgnalpha.h | 2 +- src/mame/includes/dietgo.h | 2 +- src/mame/includes/djboy.h | 2 +- src/mame/includes/djmain.h | 2 +- src/mame/includes/dkong.h | 2 +- src/mame/includes/dm7000.h | 2 +- src/mame/includes/docastle.h | 2 +- src/mame/includes/dogfgt.h | 2 +- src/mame/includes/dooyong.h | 8 +- src/mame/includes/dragon.h | 4 +- src/mame/includes/dragrace.h | 2 +- src/mame/includes/drgnmst.h | 2 +- src/mame/includes/dribling.h | 2 +- src/mame/includes/drmicro.h | 2 +- src/mame/includes/dynax.h | 2 +- src/mame/includes/dynduke.h | 2 +- src/mame/includes/ec184x.h | 2 +- src/mame/includes/einstein.h | 8 +- src/mame/includes/electron.h | 2 +- src/mame/includes/elf.h | 2 +- src/mame/includes/eolith.h | 2 +- src/mame/includes/ep64.h | 2 +- src/mame/includes/epos.h | 2 +- src/mame/includes/eprom.h | 2 +- src/mame/includes/equites.h | 2 +- src/mame/includes/esd16.h | 2 +- src/mame/includes/espial.h | 2 +- src/mame/includes/esripsys.h | 2 +- src/mame/includes/eti660.h | 2 +- src/mame/includes/exedexes.h | 2 +- src/mame/includes/exerion.h | 2 +- src/mame/includes/exidy.h | 2 +- src/mame/includes/exidy440.h | 2 +- src/mame/includes/exp85.h | 2 +- src/mame/includes/exprraid.h | 2 +- src/mame/includes/exterm.h | 2 +- src/mame/includes/exzisus.h | 2 +- src/mame/includes/f1gp.h | 2 +- src/mame/includes/fantland.h | 2 +- src/mame/includes/fastfred.h | 2 +- src/mame/includes/fastlane.h | 2 +- src/mame/includes/fcombat.h | 2 +- src/mame/includes/fgoal.h | 2 +- src/mame/includes/finalizr.h | 2 +- src/mame/includes/firetrap.h | 2 +- src/mame/includes/firetrk.h | 2 +- src/mame/includes/fitfight.h | 2 +- src/mame/includes/flkatck.h | 2 +- src/mame/includes/flower.h | 4 +- src/mame/includes/flstory.h | 2 +- src/mame/includes/fm7.h | 2 +- src/mame/includes/fmtowns.h | 6 +- src/mame/includes/foodf.h | 2 +- src/mame/includes/freekick.h | 2 +- src/mame/includes/fromanc2.h | 2 +- src/mame/includes/fromance.h | 2 +- src/mame/includes/funkybee.h | 2 +- src/mame/includes/funkyjet.h | 2 +- src/mame/includes/funworld.h | 2 +- src/mame/includes/funybubl.h | 2 +- src/mame/includes/fuukifg2.h | 2 +- src/mame/includes/fuukifg3.h | 2 +- src/mame/includes/gaelco.h | 2 +- src/mame/includes/gaelco2.h | 6 +- src/mame/includes/gaelco3d.h | 2 +- src/mame/includes/gaiden.h | 2 +- src/mame/includes/galaga.h | 8 +- src/mame/includes/galastrm.h | 2 +- src/mame/includes/galaxia.h | 2 +- src/mame/includes/galaxian.h | 2 +- src/mame/includes/galaxold.h | 2 +- src/mame/includes/galaxy.h | 2 +- src/mame/includes/galeb.h | 2 +- src/mame/includes/galivan.h | 2 +- src/mame/includes/galpani2.h | 2 +- src/mame/includes/galpanic.h | 2 +- src/mame/includes/galspnbl.h | 2 +- src/mame/includes/gamate.h | 2 +- src/mame/includes/gamecom.h | 2 +- src/mame/includes/gameplan.h | 2 +- src/mame/includes/gamepock.h | 2 +- src/mame/includes/gaplus.h | 2 +- src/mame/includes/gatron.h | 2 +- src/mame/includes/gauntlet.h | 2 +- src/mame/includes/gb.h | 4 +- src/mame/includes/gba.h | 2 +- src/mame/includes/gberet.h | 2 +- src/mame/includes/gcpinbal.h | 2 +- src/mame/includes/genpc.h | 12 +- src/mame/includes/gijoe.h | 2 +- src/mame/includes/ginganin.h | 2 +- src/mame/includes/gladiatr.h | 2 +- src/mame/includes/glass.h | 2 +- src/mame/includes/gng.h | 2 +- src/mame/includes/goal92.h | 2 +- src/mame/includes/goindol.h | 2 +- src/mame/includes/goldstar.h | 12 +- src/mame/includes/gomoku.h | 4 +- src/mame/includes/gotcha.h | 2 +- src/mame/includes/gottlieb.h | 2 +- src/mame/includes/gotya.h | 2 +- src/mame/includes/gp32.h | 2 +- src/mame/includes/gradius3.h | 2 +- src/mame/includes/grchamp.h | 2 +- src/mame/includes/gridlee.h | 4 +- src/mame/includes/groundfx.h | 2 +- src/mame/includes/gstriker.h | 2 +- src/mame/includes/gsword.h | 2 +- src/mame/includes/gumbo.h | 2 +- src/mame/includes/gunbustr.h | 2 +- src/mame/includes/gundealr.h | 2 +- src/mame/includes/gunsmoke.h | 2 +- src/mame/includes/gyruss.h | 2 +- src/mame/includes/hanaawas.h | 2 +- src/mame/includes/harddriv.h | 32 +- src/mame/includes/hcastle.h | 2 +- src/mame/includes/hec2hrp.h | 2 +- src/mame/includes/hexion.h | 2 +- src/mame/includes/hh_tms1k.h | 2 +- src/mame/includes/hh_ucom4.h | 2 +- src/mame/includes/higemaru.h | 2 +- src/mame/includes/himesiki.h | 2 +- src/mame/includes/hitme.h | 2 +- src/mame/includes/hnayayoi.h | 2 +- src/mame/includes/hng64.h | 2 +- src/mame/includes/holeland.h | 2 +- src/mame/includes/homedata.h | 2 +- src/mame/includes/homerun.h | 2 +- src/mame/includes/hp48.h | 4 +- src/mame/includes/huebler.h | 2 +- src/mame/includes/hx20.h | 2 +- src/mame/includes/hyhoo.h | 2 +- src/mame/includes/hyperspt.h | 2 +- src/mame/includes/hyprduel.h | 2 +- src/mame/includes/ikki.h | 2 +- src/mame/includes/imds2.h | 2 +- src/mame/includes/intv.h | 2 +- src/mame/includes/inufuku.h | 2 +- src/mame/includes/iqblock.h | 2 +- src/mame/includes/irobot.h | 2 +- src/mame/includes/ironhors.h | 2 +- src/mame/includes/itech32.h | 4 +- src/mame/includes/itech8.h | 2 +- src/mame/includes/jack.h | 2 +- src/mame/includes/jackal.h | 2 +- src/mame/includes/jaguar.h | 2 +- src/mame/includes/jailbrek.h | 2 +- src/mame/includes/jedi.h | 2 +- src/mame/includes/jpmimpct.h | 2 +- src/mame/includes/jpmsys5.h | 2 +- src/mame/includes/jupiter.h | 4 +- src/mame/includes/kaneko16.h | 10 +- src/mame/includes/kangaroo.h | 2 +- src/mame/includes/karnov.h | 2 +- src/mame/includes/kaypro.h | 2 +- src/mame/includes/kc.h | 4 +- src/mame/includes/kchamp.h | 2 +- src/mame/includes/kickgoal.h | 2 +- src/mame/includes/kingobox.h | 2 +- src/mame/includes/klax.h | 2 +- src/mame/includes/kncljoe.h | 2 +- src/mame/includes/konamigx.h | 2 +- src/mame/includes/kopunch.h | 2 +- src/mame/includes/kramermc.h | 2 +- src/mame/includes/ksayakyu.h | 2 +- src/mame/includes/kyocera.h | 8 +- src/mame/includes/kyugo.h | 2 +- src/mame/includes/labyrunr.h | 2 +- src/mame/includes/ladybug.h | 2 +- src/mame/includes/ladyfrog.h | 2 +- src/mame/includes/laserbat.h | 6 +- src/mame/includes/lasso.h | 2 +- src/mame/includes/lastduel.h | 2 +- src/mame/includes/lazercmd.h | 2 +- src/mame/includes/lc80.h | 2 +- src/mame/includes/legionna.h | 2 +- src/mame/includes/leland.h | 12 +- src/mame/includes/lemmings.h | 2 +- src/mame/includes/lethal.h | 2 +- src/mame/includes/lethalj.h | 2 +- src/mame/includes/liberate.h | 2 +- src/mame/includes/liberatr.h | 2 +- src/mame/includes/lisa.h | 2 +- src/mame/includes/lkage.h | 2 +- src/mame/includes/llc.h | 2 +- src/mame/includes/lockon.h | 2 +- src/mame/includes/lordgun.h | 2 +- src/mame/includes/lsasquad.h | 2 +- src/mame/includes/lucky74.h | 2 +- src/mame/includes/lvcards.h | 2 +- src/mame/includes/lviv.h | 2 +- src/mame/includes/lwings.h | 2 +- src/mame/includes/lynx.h | 2 +- src/mame/includes/m10.h | 2 +- src/mame/includes/m107.h | 2 +- src/mame/includes/m5.h | 2 +- src/mame/includes/m52.h | 2 +- src/mame/includes/m57.h | 2 +- src/mame/includes/m58.h | 2 +- src/mame/includes/m62.h | 2 +- src/mame/includes/m72.h | 2 +- src/mame/includes/m79amb.h | 2 +- src/mame/includes/m90.h | 2 +- src/mame/includes/m92.h | 2 +- src/mame/includes/mac.h | 4 +- src/mame/includes/macpci.h | 2 +- src/mame/includes/macrossp.h | 2 +- src/mame/includes/madalien.h | 2 +- src/mame/includes/madmotor.h | 2 +- src/mame/includes/magmax.h | 2 +- src/mame/includes/mainevt.h | 2 +- src/mame/includes/mainsnk.h | 2 +- src/mame/includes/malzak.h | 2 +- src/mame/includes/mappy.h | 2 +- src/mame/includes/marineb.h | 2 +- src/mame/includes/mario.h | 2 +- src/mame/includes/markham.h | 2 +- src/mame/includes/matmania.h | 2 +- src/mame/includes/maygay1b.h | 2 +- src/mame/includes/mbc55x.h | 2 +- src/mame/includes/mbee.h | 2 +- src/mame/includes/mboard.h | 2 +- src/mame/includes/mc1000.h | 2 +- src/mame/includes/mc1502.h | 2 +- src/mame/includes/mc80.h | 2 +- src/mame/includes/mcatadv.h | 2 +- src/mame/includes/mcr.h | 2 +- src/mame/includes/mcr3.h | 2 +- src/mame/includes/mcr68.h | 2 +- src/mame/includes/md_cons.h | 2 +- src/mame/includes/meadows.h | 2 +- src/mame/includes/megadriv.h | 4 +- src/mame/includes/megasys1.h | 2 +- src/mame/includes/megazone.h | 2 +- src/mame/includes/mermaid.h | 2 +- src/mame/includes/metalmx.h | 2 +- src/mame/includes/metlclsh.h | 2 +- src/mame/includes/metro.h | 2 +- src/mame/includes/mexico86.h | 2 +- src/mame/includes/mhavoc.h | 2 +- src/mame/includes/micro3d.h | 4 +- src/mame/includes/micronic.h | 2 +- src/mame/includes/microtan.h | 2 +- src/mame/includes/midtunit.h | 2 +- src/mame/includes/midvunit.h | 2 +- src/mame/includes/midwunit.h | 2 +- src/mame/includes/midxunit.h | 2 +- src/mame/includes/midyunit.h | 2 +- src/mame/includes/midzeus.h | 4 +- src/mame/includes/mikie.h | 2 +- src/mame/includes/mikro80.h | 2 +- src/mame/includes/mikromik.h | 2 +- src/mame/includes/mitchell.h | 2 +- src/mame/includes/mjkjidai.h | 2 +- src/mame/includes/model1.h | 2 +- src/mame/includes/model2.h | 2 +- src/mame/includes/model3.h | 2 +- src/mame/includes/momoko.h | 2 +- src/mame/includes/moo.h | 2 +- src/mame/includes/mosaic.h | 2 +- src/mame/includes/mouser.h | 2 +- src/mame/includes/mpf1.h | 2 +- src/mame/includes/mpu4.h | 2 +- src/mame/includes/mpz80.h | 2 +- src/mame/includes/mrdo.h | 2 +- src/mame/includes/mrflea.h | 2 +- src/mame/includes/mrjong.h | 2 +- src/mame/includes/ms32.h | 2 +- src/mame/includes/msbc1.h | 2 +- src/mame/includes/msisaac.h | 2 +- src/mame/includes/msx.h | 2 +- src/mame/includes/mtx.h | 2 +- src/mame/includes/mugsmash.h | 2 +- src/mame/includes/multfish.h | 2 +- src/mame/includes/munchmo.h | 2 +- src/mame/includes/mustache.h | 2 +- src/mame/includes/mw8080bw.h | 2 +- src/mame/includes/mystston.h | 2 +- src/mame/includes/mystwarr.h | 2 +- src/mame/includes/mz700.h | 2 +- src/mame/includes/mz80.h | 2 +- src/mame/includes/n64.h | 4 +- src/mame/includes/n8080.h | 2 +- src/mame/includes/namcofl.h | 2 +- src/mame/includes/namcona1.h | 2 +- src/mame/includes/namconb1.h | 2 +- src/mame/includes/namcond1.h | 2 +- src/mame/includes/namcos1.h | 2 +- src/mame/includes/namcos2.h | 4 +- src/mame/includes/namcos21.h | 2 +- src/mame/includes/namcos22.h | 2 +- src/mame/includes/namcos86.h | 2 +- src/mame/includes/naomi.h | 2 +- src/mame/includes/naughtyb.h | 2 +- src/mame/includes/nb1413m3.h | 2 +- src/mame/includes/nb1414m4.h | 2 +- src/mame/includes/nbmj8688.h | 2 +- src/mame/includes/nbmj8891.h | 2 +- src/mame/includes/nbmj8900.h | 2 +- src/mame/includes/nbmj8991.h | 2 +- src/mame/includes/nbmj9195.h | 2 +- src/mame/includes/nc.h | 2 +- src/mame/includes/nemesis.h | 2 +- src/mame/includes/neogeo.h | 6 +- src/mame/includes/nes.h | 2 +- src/mame/includes/newbrain.h | 4 +- src/mame/includes/news.h | 2 +- src/mame/includes/next.h | 2 +- src/mame/includes/ninjakd2.h | 2 +- src/mame/includes/ninjaw.h | 2 +- src/mame/includes/nitedrvr.h | 2 +- src/mame/includes/niyanpai.h | 2 +- src/mame/includes/nmk16.h | 2 +- src/mame/includes/norautp.h | 2 +- src/mame/includes/nova2001.h | 2 +- src/mame/includes/nycaptor.h | 2 +- src/mame/includes/ob68k1a.h | 2 +- src/mame/includes/offtwall.h | 2 +- src/mame/includes/ohmygod.h | 2 +- src/mame/includes/ojankohs.h | 2 +- src/mame/includes/ondra.h | 2 +- src/mame/includes/oneshot.h | 2 +- src/mame/includes/opwolf.h | 2 +- src/mame/includes/orao.h | 2 +- src/mame/includes/orbit.h | 2 +- src/mame/includes/orion.h | 2 +- src/mame/includes/osborne1.h | 2 +- src/mame/includes/osi.h | 8 +- src/mame/includes/othunder.h | 2 +- src/mame/includes/overdriv.h | 2 +- src/mame/includes/p2000t.h | 2 +- src/mame/includes/pacland.h | 2 +- src/mame/includes/pacman.h | 2 +- src/mame/includes/pandoras.h | 2 +- src/mame/includes/paradise.h | 2 +- src/mame/includes/parodius.h | 2 +- src/mame/includes/partner.h | 2 +- src/mame/includes/pass.h | 2 +- src/mame/includes/pastelg.h | 2 +- src/mame/includes/pbaction.h | 2 +- src/mame/includes/pc1251.h | 2 +- src/mame/includes/pc1350.h | 2 +- src/mame/includes/pc1401.h | 2 +- src/mame/includes/pc1403.h | 2 +- src/mame/includes/pc1512.h | 4 +- src/mame/includes/pc4.h | 2 +- src/mame/includes/pc8001.h | 4 +- src/mame/includes/pc8401a.h | 4 +- src/mame/includes/pce.h | 2 +- src/mame/includes/pcktgal.h | 2 +- src/mame/includes/pcw.h | 2 +- src/mame/includes/pcw16.h | 2 +- src/mame/includes/pdp1.h | 2 +- src/mame/includes/pecom.h | 2 +- src/mame/includes/pes.h | 2 +- src/mame/includes/pet.h | 12 +- src/mame/includes/pgm.h | 16 +- src/mame/includes/phc25.h | 2 +- src/mame/includes/phoenix.h | 4 +- src/mame/includes/pingpong.h | 2 +- src/mame/includes/pirates.h | 2 +- src/mame/includes/pitnrun.h | 2 +- src/mame/includes/pk8000.h | 2 +- src/mame/includes/pk8020.h | 2 +- src/mame/includes/pktgaldx.h | 2 +- src/mame/includes/playch10.h | 2 +- src/mame/includes/playmark.h | 2 +- src/mame/includes/plus4.h | 4 +- src/mame/includes/plygonet.h | 2 +- src/mame/includes/pmd85.h | 2 +- src/mame/includes/pocketc.h | 2 +- src/mame/includes/poisk1.h | 2 +- src/mame/includes/pokechmp.h | 2 +- src/mame/includes/polepos.h | 4 +- src/mame/includes/policetr.h | 2 +- src/mame/includes/poly88.h | 2 +- src/mame/includes/poly880.h | 2 +- src/mame/includes/polyplay.h | 2 +- src/mame/includes/poolshrk.h | 2 +- src/mame/includes/pooyan.h | 2 +- src/mame/includes/popeye.h | 2 +- src/mame/includes/popper.h | 2 +- src/mame/includes/portfoli.h | 2 +- src/mame/includes/portrait.h | 2 +- src/mame/includes/powerins.h | 2 +- src/mame/includes/pp01.h | 2 +- src/mame/includes/prehisle.h | 2 +- src/mame/includes/primo.h | 2 +- src/mame/includes/prof180x.h | 2 +- src/mame/includes/prof80.h | 2 +- src/mame/includes/psikyo.h | 2 +- src/mame/includes/psikyo4.h | 2 +- src/mame/includes/psikyosh.h | 2 +- src/mame/includes/psion.h | 4 +- src/mame/includes/psychic5.h | 2 +- src/mame/includes/punchout.h | 2 +- src/mame/includes/px8.h | 2 +- src/mame/includes/qdrmfgp.h | 2 +- src/mame/includes/qix.h | 2 +- src/mame/includes/ql.h | 2 +- src/mame/includes/quasar.h | 2 +- src/mame/includes/quizdna.h | 2 +- src/mame/includes/quizpani.h | 2 +- src/mame/includes/radio86.h | 2 +- src/mame/includes/raiden.h | 2 +- src/mame/includes/raiden2.h | 2 +- src/mame/includes/rallyx.h | 2 +- src/mame/includes/rampart.h | 2 +- src/mame/includes/rastan.h | 2 +- src/mame/includes/rbisland.h | 2 +- src/mame/includes/realbrk.h | 2 +- src/mame/includes/redalert.h | 2 +- src/mame/includes/relief.h | 2 +- src/mame/includes/renegade.h | 2 +- src/mame/includes/retofinv.h | 2 +- src/mame/includes/rltennis.h | 2 +- src/mame/includes/rm380z.h | 2 +- src/mame/includes/rmnimbus.h | 2 +- src/mame/includes/rockrage.h | 2 +- src/mame/includes/rocnrope.h | 2 +- src/mame/includes/rohga.h | 2 +- src/mame/includes/rollerg.h | 2 +- src/mame/includes/rollrace.h | 2 +- src/mame/includes/route16.h | 2 +- src/mame/includes/rpunch.h | 2 +- src/mame/includes/runaway.h | 2 +- src/mame/includes/rungun.h | 2 +- src/mame/includes/s11.h | 8 +- src/mame/includes/sage2.h | 2 +- src/mame/includes/samcoupe.h | 2 +- src/mame/includes/sauro.h | 2 +- src/mame/includes/sbasketb.h | 2 +- src/mame/includes/sbugger.h | 2 +- src/mame/includes/scotrsht.h | 2 +- src/mame/includes/scramble.h | 2 +- src/mame/includes/sderby.h | 2 +- src/mame/includes/segag80r.h | 4 +- src/mame/includes/segag80v.h | 2 +- src/mame/includes/segahang.h | 2 +- src/mame/includes/segaorun.h | 2 +- src/mame/includes/segas16a.h | 2 +- src/mame/includes/segas16b.h | 4 +- src/mame/includes/segas18.h | 2 +- src/mame/includes/segas24.h | 2 +- src/mame/includes/segas32.h | 8 +- src/mame/includes/segasp.h | 2 +- src/mame/includes/segaxbd.h | 16 +- src/mame/includes/segaybd.h | 2 +- src/mame/includes/seibuspi.h | 2 +- src/mame/includes/seicross.h | 2 +- src/mame/includes/senjyo.h | 2 +- src/mame/includes/seta.h | 2 +- src/mame/includes/seta2.h | 2 +- src/mame/includes/sf.h | 2 +- src/mame/includes/sg1000.h | 6 +- src/mame/includes/shadfrce.h | 2 +- src/mame/includes/shangha3.h | 2 +- src/mame/includes/shangkid.h | 2 +- src/mame/includes/shaolins.h | 2 +- src/mame/includes/shisen.h | 2 +- src/mame/includes/shootout.h | 2 +- src/mame/includes/shuuz.h | 2 +- src/mame/includes/sidearms.h | 2 +- src/mame/includes/sidepckt.h | 2 +- src/mame/includes/silkroad.h | 2 +- src/mame/includes/simpl156.h | 2 +- src/mame/includes/simple_st0016.h | 2 +- src/mame/includes/simpsons.h | 2 +- src/mame/includes/skullxbo.h | 2 +- src/mame/includes/skydiver.h | 2 +- src/mame/includes/skyfox.h | 2 +- src/mame/includes/skykid.h | 2 +- src/mame/includes/skyraid.h | 2 +- src/mame/includes/slapfght.h | 2 +- src/mame/includes/slapshot.h | 2 +- src/mame/includes/slapstic.h | 2 +- src/mame/includes/sms.h | 4 +- src/mame/includes/snes.h | 2 +- src/mame/includes/snk.h | 2 +- src/mame/includes/snk6502.h | 4 +- src/mame/includes/snk68.h | 2 +- src/mame/includes/snookr10.h | 2 +- src/mame/includes/snowbros.h | 2 +- src/mame/includes/softbox.h | 2 +- src/mame/includes/solomon.h | 2 +- src/mame/includes/sonson.h | 2 +- src/mame/includes/sorcerer.h | 2 +- src/mame/includes/spacefb.h | 2 +- src/mame/includes/spbactn.h | 2 +- src/mame/includes/spcforce.h | 2 +- src/mame/includes/spdodgeb.h | 2 +- src/mame/includes/special.h | 2 +- src/mame/includes/spectrum.h | 2 +- src/mame/includes/speedatk.h | 2 +- src/mame/includes/speedbal.h | 2 +- src/mame/includes/speedspn.h | 2 +- src/mame/includes/spiders.h | 2 +- src/mame/includes/splash.h | 2 +- src/mame/includes/sprcros2.h | 2 +- src/mame/includes/sprint2.h | 2 +- src/mame/includes/sprint4.h | 2 +- src/mame/includes/sprint8.h | 2 +- src/mame/includes/spy.h | 2 +- src/mame/includes/srmp2.h | 2 +- src/mame/includes/srumbler.h | 2 +- src/mame/includes/sshangha.h | 2 +- src/mame/includes/sslam.h | 2 +- src/mame/includes/ssozumo.h | 2 +- src/mame/includes/sspeedr.h | 2 +- src/mame/includes/ssrj.h | 2 +- src/mame/includes/ssv.h | 2 +- src/mame/includes/ssystem3.h | 2 +- src/mame/includes/stactics.h | 2 +- src/mame/includes/stadhero.h | 2 +- src/mame/includes/starcrus.h | 2 +- src/mame/includes/starfire.h | 2 +- src/mame/includes/starshp1.h | 2 +- src/mame/includes/starwars.h | 2 +- src/mame/includes/stfight.h | 2 +- src/mame/includes/stlforce.h | 2 +- src/mame/includes/strnskil.h | 2 +- src/mame/includes/stv.h | 4 +- src/mame/includes/subs.h | 2 +- src/mame/includes/suna16.h | 2 +- src/mame/includes/suna8.h | 2 +- src/mame/includes/supbtime.h | 2 +- src/mame/includes/super6.h | 2 +- src/mame/includes/super80.h | 2 +- src/mame/includes/superchs.h | 2 +- src/mame/includes/superqix.h | 2 +- src/mame/includes/superslave.h | 2 +- src/mame/includes/suprloco.h | 2 +- src/mame/includes/suprnova.h | 2 +- src/mame/includes/suprridr.h | 2 +- src/mame/includes/suprslam.h | 2 +- src/mame/includes/surpratk.h | 2 +- src/mame/includes/svi318.h | 2 +- src/mame/includes/svision.h | 2 +- src/mame/includes/swtpc09.h | 2 +- src/mame/includes/system1.h | 2 +- src/mame/includes/system16.h | 2 +- src/mame/includes/tagteam.h | 2 +- src/mame/includes/tail2nos.h | 2 +- src/mame/includes/taito_b.h | 2 +- src/mame/includes/taito_f2.h | 2 +- src/mame/includes/taito_f3.h | 2 +- src/mame/includes/taito_h.h | 2 +- src/mame/includes/taito_l.h | 2 +- src/mame/includes/taito_o.h | 2 +- src/mame/includes/taito_x.h | 2 +- src/mame/includes/taito_z.h | 2 +- src/mame/includes/taitoair.h | 2 +- src/mame/includes/taitojc.h | 2 +- src/mame/includes/taitosj.h | 2 +- src/mame/includes/tandy2k.h | 2 +- src/mame/includes/tank8.h | 2 +- src/mame/includes/tankbatt.h | 2 +- src/mame/includes/tankbust.h | 2 +- src/mame/includes/taotaido.h | 2 +- src/mame/includes/targeth.h | 2 +- src/mame/includes/tatsumi.h | 2 +- src/mame/includes/taxidriv.h | 2 +- src/mame/includes/tbowl.h | 2 +- src/mame/includes/tceptor.h | 2 +- src/mame/includes/tdv2324.h | 2 +- src/mame/includes/tecmo.h | 2 +- src/mame/includes/tecmo16.h | 2 +- src/mame/includes/tecmosys.h | 2 +- src/mame/includes/tehkanwc.h | 2 +- src/mame/includes/tek405x.h | 4 +- src/mame/includes/terracre.h | 2 +- src/mame/includes/tetrisp2.h | 4 +- src/mame/includes/thedeep.h | 2 +- src/mame/includes/thepit.h | 2 +- src/mame/includes/thief.h | 2 +- src/mame/includes/thomson.h | 4 +- src/mame/includes/thoop2.h | 2 +- src/mame/includes/thunderj.h | 2 +- src/mame/includes/thunderx.h | 2 +- src/mame/includes/ti85.h | 2 +- src/mame/includes/ti89.h | 2 +- src/mame/includes/tiamc1.h | 4 +- src/mame/includes/tigeroad.h | 2 +- src/mame/includes/tiki100.h | 2 +- src/mame/includes/timelimt.h | 2 +- src/mame/includes/timeplt.h | 2 +- src/mame/includes/tmc1800.h | 10 +- src/mame/includes/tmc2000e.h | 2 +- src/mame/includes/tmc600.h | 2 +- src/mame/includes/tmnt.h | 2 +- src/mame/includes/tnzs.h | 2 +- src/mame/includes/toaplan1.h | 4 +- src/mame/includes/toaplan2.h | 2 +- src/mame/includes/toki.h | 2 +- src/mame/includes/toobin.h | 2 +- src/mame/includes/topspeed.h | 2 +- src/mame/includes/toypop.h | 2 +- src/mame/includes/tp84.h | 2 +- src/mame/includes/trackfld.h | 2 +- src/mame/includes/travrusa.h | 2 +- src/mame/includes/triplhnt.h | 2 +- src/mame/includes/trs80.h | 2 +- src/mame/includes/trs80m2.h | 4 +- src/mame/includes/truco.h | 2 +- src/mame/includes/trucocl.h | 2 +- src/mame/includes/tryout.h | 2 +- src/mame/includes/tsamurai.h | 2 +- src/mame/includes/tsispch.h | 2 +- src/mame/includes/tubep.h | 2 +- src/mame/includes/tumbleb.h | 2 +- src/mame/includes/tumblep.h | 2 +- src/mame/includes/tunhunt.h | 2 +- src/mame/includes/turbo.h | 2 +- src/mame/includes/turrett.h | 4 +- src/mame/includes/tutankhm.h | 2 +- src/mame/includes/twin16.h | 6 +- src/mame/includes/twincobr.h | 2 +- src/mame/includes/tx0.h | 2 +- src/mame/includes/tx1.h | 8 +- src/mame/includes/ultraman.h | 2 +- src/mame/includes/ultratnk.h | 2 +- src/mame/includes/undrfire.h | 2 +- src/mame/includes/unico.h | 2 +- src/mame/includes/usgames.h | 2 +- src/mame/includes/ut88.h | 2 +- src/mame/includes/v1050.h | 2 +- src/mame/includes/vaportra.h | 2 +- src/mame/includes/vastar.h | 2 +- src/mame/includes/vball.h | 2 +- src/mame/includes/vc4000.h | 2 +- src/mame/includes/vcs80.h | 2 +- src/mame/includes/vector06.h | 2 +- src/mame/includes/vectrex.h | 2 +- src/mame/includes/vendetta.h | 2 +- src/mame/includes/vertigo.h | 2 +- src/mame/includes/vic10.h | 2 +- src/mame/includes/vic20.h | 2 +- src/mame/includes/vicdual.h | 2 +- src/mame/includes/victor9k.h | 2 +- src/mame/includes/victory.h | 2 +- src/mame/includes/vidbrain.h | 2 +- src/mame/includes/videopin.h | 2 +- src/mame/includes/vigilant.h | 2 +- src/mame/includes/vindictr.h | 2 +- src/mame/includes/vip.h | 2 +- src/mame/includes/vixen.h | 2 +- src/mame/includes/volfied.h | 2 +- src/mame/includes/vsnes.h | 2 +- src/mame/includes/vtech2.h | 2 +- src/mame/includes/vulgus.h | 2 +- src/mame/includes/wangpc.h | 2 +- src/mame/includes/warpwarp.h | 2 +- src/mame/includes/warriorb.h | 2 +- src/mame/includes/wc90.h | 2 +- src/mame/includes/wc90b.h | 2 +- src/mame/includes/wecleman.h | 2 +- src/mame/includes/welltris.h | 2 +- src/mame/includes/wgp.h | 2 +- src/mame/includes/williams.h | 8 +- src/mame/includes/wiping.h | 2 +- src/mame/includes/wiz.h | 2 +- src/mame/includes/wolfpack.h | 2 +- src/mame/includes/wpc_pin.h | 8 +- src/mame/includes/wrally.h | 2 +- src/mame/includes/wswan.h | 2 +- src/mame/includes/wwfsstar.h | 2 +- src/mame/includes/x07.h | 4 +- src/mame/includes/x1.h | 4 +- src/mame/includes/x68k.h | 2 +- src/mame/includes/xain.h | 2 +- src/mame/includes/xbox.h | 2 +- src/mame/includes/xerox820.h | 6 +- src/mame/includes/xexex.h | 2 +- src/mame/includes/xmen.h | 2 +- src/mame/includes/xor100.h | 2 +- src/mame/includes/xorworld.h | 2 +- src/mame/includes/xxmissio.h | 2 +- src/mame/includes/xybots.h | 2 +- src/mame/includes/xyonix.h | 2 +- src/mame/includes/yiear.h | 2 +- src/mame/includes/yunsun16.h | 2 +- src/mame/includes/yunsung8.h | 2 +- src/mame/includes/z80ne.h | 2 +- src/mame/includes/z88.h | 2 +- src/mame/includes/zac2650.h | 2 +- src/mame/includes/zaccaria.h | 2 +- src/mame/includes/zaxxon.h | 2 +- src/mame/includes/zerozone.h | 2 +- src/mame/includes/zodiack.h | 2 +- src/mame/includes/zx.h | 2 +- src/mame/machine/315-5838_317-0229_comp.cpp | 2 +- src/mame/machine/315-5838_317-0229_comp.h | 2 +- src/mame/machine/315-5881_crypt.cpp | 4 +- src/mame/machine/315-5881_crypt.h | 2 +- src/mame/machine/315_5296.cpp | 2 +- src/mame/machine/315_5296.h | 2 +- src/mame/machine/6883sam.cpp | 3 +- src/mame/machine/6883sam.h | 6 +- src/mame/machine/abc1600mac.cpp | 2 +- src/mame/machine/abc1600mac.h | 2 +- src/mame/machine/abc80kb.cpp | 2 +- src/mame/machine/abc80kb.h | 2 +- src/mame/machine/alpha8201.cpp | 4 +- src/mame/machine/alpha8201.h | 2 +- src/mame/machine/amigakbd.cpp | 2 +- src/mame/machine/amigakbd.h | 2 +- src/mame/machine/amstrad.cpp | 2 +- src/mame/machine/apollo.cpp | 10 +- src/mame/machine/apollo_kbd.cpp | 6 +- src/mame/machine/apollo_kbd.h | 2 +- src/mame/machine/appldriv.cpp | 2 +- src/mame/machine/appldriv.h | 2 +- src/mame/machine/applefdc.cpp | 6 +- src/mame/machine/applefdc.h | 6 +- src/mame/machine/apricotkb.cpp | 2 +- src/mame/machine/apricotkb.h | 2 +- src/mame/machine/apricotkb_hle.cpp | 2 +- src/mame/machine/apricotkb_hle.h | 2 +- src/mame/machine/arkanoid.cpp | 4 +- src/mame/machine/asic65.cpp | 2 +- src/mame/machine/asic65.h | 2 +- src/mame/machine/atari_vg.cpp | 2 +- src/mame/machine/atari_vg.h | 2 +- src/mame/machine/atarifdc.cpp | 2 +- src/mame/machine/atarifdc.h | 2 +- src/mame/machine/atarigen.cpp | 15 +- src/mame/machine/atarigen.h | 12 +- src/mame/machine/awboard.cpp | 4 +- src/mame/machine/awboard.h | 2 +- src/mame/machine/bbc.cpp | 4 +- src/mame/machine/beta.cpp | 2 +- src/mame/machine/beta.h | 2 +- src/mame/machine/bfm_bd1.cpp | 2 +- src/mame/machine/bfm_bd1.h | 2 +- src/mame/machine/bfm_bda.cpp | 2 +- src/mame/machine/bfm_bda.h | 2 +- src/mame/machine/buggychl.cpp | 2 +- src/mame/machine/buggychl.h | 2 +- src/mame/machine/c117.cpp | 6 +- src/mame/machine/c117.h | 2 +- src/mame/machine/cat702.cpp | 2 +- src/mame/machine/cat702.h | 2 +- src/mame/machine/cdi070.cpp | 2 +- src/mame/machine/cdi070.h | 2 +- src/mame/machine/cdicdic.cpp | 2 +- src/mame/machine/cdicdic.h | 2 +- src/mame/machine/cdislave.cpp | 2 +- src/mame/machine/cdislave.h | 2 +- src/mame/machine/coco.cpp | 2 +- src/mame/machine/coco3.cpp | 6 +- src/mame/machine/coco_vhd.cpp | 2 +- src/mame/machine/coco_vhd.h | 2 +- src/mame/machine/compiskb.cpp | 2 +- src/mame/machine/compiskb.h | 2 +- src/mame/machine/cuda.cpp | 2 +- src/mame/machine/cuda.h | 2 +- src/mame/machine/dc-ctrl.cpp | 6 +- src/mame/machine/dc-ctrl.h | 6 +- src/mame/machine/dec_lk201.cpp | 2 +- src/mame/machine/dec_lk201.h | 2 +- src/mame/machine/deco104.cpp | 2 +- src/mame/machine/deco104.h | 2 +- src/mame/machine/deco146.cpp | 4 +- src/mame/machine/deco146.h | 6 +- src/mame/machine/deco222.cpp | 4 +- src/mame/machine/deco222.h | 4 +- src/mame/machine/decocass.cpp | 14 +- src/mame/machine/decocass_tape.cpp | 2 +- src/mame/machine/decocass_tape.h | 2 +- src/mame/machine/decocpu6.cpp | 2 +- src/mame/machine/decocpu6.h | 2 +- src/mame/machine/decocpu7.cpp | 2 +- src/mame/machine/decocpu7.h | 2 +- src/mame/machine/decocrpt.cpp | 8 +- src/mame/machine/decopincpu.cpp | 16 +- src/mame/machine/decopincpu.h | 18 +- src/mame/machine/dmv_keyb.cpp | 2 +- src/mame/machine/dmv_keyb.h | 2 +- src/mame/machine/docg3.cpp | 2 +- src/mame/machine/docg3.h | 2 +- src/mame/machine/egret.cpp | 2 +- src/mame/machine/egret.h | 2 +- src/mame/machine/einstein.cpp | 6 +- src/mame/machine/esqpanel.cpp | 8 +- src/mame/machine/esqpanel.h | 8 +- src/mame/machine/esqvfd.cpp | 8 +- src/mame/machine/esqvfd.h | 8 +- src/mame/machine/fd1089.cpp | 6 +- src/mame/machine/fd1089.h | 6 +- src/mame/machine/fd1094.cpp | 2 +- src/mame/machine/fd1094.h | 2 +- src/mame/machine/fm_scsi.cpp | 2 +- src/mame/machine/fm_scsi.h | 2 +- src/mame/machine/gaelco3d.cpp | 4 +- src/mame/machine/gaelco3d.h | 2 +- src/mame/machine/gdrom.cpp | 2 +- src/mame/machine/gdrom.h | 2 +- src/mame/machine/genpc.cpp | 10 +- src/mame/machine/genpin.h | 2 +- src/mame/machine/hp48.cpp | 10 +- src/mame/machine/ie15_kbd.cpp | 4 +- src/mame/machine/ie15_kbd.h | 4 +- src/mame/machine/igs022.cpp | 2 +- src/mame/machine/igs022.h | 2 +- src/mame/machine/igs025.cpp | 2 +- src/mame/machine/igs025.h | 2 +- src/mame/machine/igs028.cpp | 2 +- src/mame/machine/igs028.h | 2 +- src/mame/machine/inder_sb.cpp | 2 +- src/mame/machine/inder_sb.h | 2 +- src/mame/machine/inder_vid.cpp | 2 +- src/mame/machine/inder_vid.h | 2 +- src/mame/machine/isbc_215g.cpp | 2 +- src/mame/machine/isbc_215g.h | 2 +- src/mame/machine/iteagle_fpga.cpp | 8 +- src/mame/machine/iteagle_fpga.h | 14 +- src/mame/machine/jvs13551.cpp | 5 +- src/mame/machine/jvs13551.h | 6 +- src/mame/machine/k573cass.cpp | 16 +- src/mame/machine/k573cass.h | 16 +- src/mame/machine/k573dio.cpp | 16 +- src/mame/machine/k573dio.h | 2 +- src/mame/machine/k573mcr.cpp | 2 +- src/mame/machine/k573mcr.h | 2 +- src/mame/machine/k573msu.cpp | 2 +- src/mame/machine/k573msu.h | 2 +- src/mame/machine/k573npu.cpp | 2 +- src/mame/machine/k573npu.h | 2 +- src/mame/machine/k7659kb.cpp | 2 +- src/mame/machine/k7659kb.h | 2 +- src/mame/machine/kaneko_calc3.cpp | 2 +- src/mame/machine/kaneko_calc3.h | 2 +- src/mame/machine/kaneko_hit.cpp | 2 +- src/mame/machine/kaneko_hit.h | 2 +- src/mame/machine/kaneko_toybox.cpp | 4 +- src/mame/machine/kaneko_toybox.h | 2 +- src/mame/machine/kc_keyb.cpp | 2 +- src/mame/machine/kc_keyb.h | 2 +- src/mame/machine/konami1.cpp | 2 +- src/mame/machine/konami1.h | 2 +- src/mame/machine/konppc.cpp | 2 +- src/mame/machine/konppc.h | 2 +- src/mame/machine/m1comm.cpp | 2 +- src/mame/machine/m1comm.h | 2 +- src/mame/machine/m20_8086.cpp | 2 +- src/mame/machine/m20_8086.h | 2 +- src/mame/machine/m20_kbd.cpp | 2 +- src/mame/machine/m20_kbd.h | 2 +- src/mame/machine/m24_kbd.cpp | 2 +- src/mame/machine/m24_kbd.h | 2 +- src/mame/machine/m24_z8000.cpp | 2 +- src/mame/machine/m24_z8000.h | 2 +- src/mame/machine/m2comm.cpp | 2 +- src/mame/machine/m2comm.h | 2 +- src/mame/machine/mackbd.cpp | 2 +- src/mame/machine/mackbd.h | 2 +- src/mame/machine/macrtc.cpp | 2 +- src/mame/machine/macrtc.h | 2 +- src/mame/machine/maple-dc.cpp | 2 +- src/mame/machine/maple-dc.h | 2 +- src/mame/machine/mapledev.cpp | 2 +- src/mame/machine/mapledev.h | 2 +- src/mame/machine/mathbox.cpp | 2 +- src/mame/machine/mathbox.h | 2 +- src/mame/machine/mega32x.cpp | 8 +- src/mame/machine/mega32x.h | 8 +- src/mame/machine/megacd.cpp | 8 +- src/mame/machine/megacd.h | 8 +- src/mame/machine/megacdcd.cpp | 2 +- src/mame/machine/megacdcd.h | 2 +- src/mame/machine/meters.cpp | 2 +- src/mame/machine/meters.h | 2 +- src/mame/machine/microdrv.cpp | 12 +- src/mame/machine/microdrv.h | 2 +- src/mame/machine/micropolis.cpp | 9 +- src/mame/machine/micropolis.h | 6 +- src/mame/machine/midikbd.cpp | 2 +- src/mame/machine/midikbd.h | 2 +- src/mame/machine/midwayic.cpp | 10 +- src/mame/machine/midwayic.h | 10 +- src/mame/machine/mie.cpp | 4 +- src/mame/machine/mie.h | 4 +- src/mame/machine/mm1kb.cpp | 2 +- src/mame/machine/mm1kb.h | 2 +- src/mame/machine/ms7004.cpp | 10 +- src/mame/machine/ms7004.h | 2 +- src/mame/machine/msx_matsushita.cpp | 2 +- src/mame/machine/msx_matsushita.h | 2 +- src/mame/machine/msx_s1985.cpp | 2 +- src/mame/machine/msx_s1985.h | 2 +- src/mame/machine/msx_switched.cpp | 2 +- src/mame/machine/msx_switched.h | 2 +- src/mame/machine/msx_systemflags.cpp | 2 +- src/mame/machine/msx_systemflags.h | 2 +- src/mame/machine/n64.cpp | 2 +- src/mame/machine/namco06.cpp | 18 +- src/mame/machine/namco06.h | 4 +- src/mame/machine/namco50.cpp | 2 +- src/mame/machine/namco50.h | 2 +- src/mame/machine/namco51.cpp | 2 +- src/mame/machine/namco51.h | 2 +- src/mame/machine/namco53.cpp | 2 +- src/mame/machine/namco53.h | 2 +- src/mame/machine/namco62.cpp | 2 +- src/mame/machine/namco62.h | 2 +- src/mame/machine/namco_settings.cpp | 4 +- src/mame/machine/namco_settings.h | 2 +- src/mame/machine/namcoio.cpp | 8 +- src/mame/machine/namcoio.h | 8 +- src/mame/machine/namcomcu.cpp | 10 +- src/mame/machine/namcomcu.h | 10 +- src/mame/machine/namcos1.cpp | 8 +- src/mame/machine/naomi.cpp | 2 +- src/mame/machine/naomibd.cpp | 2 +- src/mame/machine/naomibd.h | 2 +- src/mame/machine/naomig1.cpp | 2 +- src/mame/machine/naomig1.h | 2 +- src/mame/machine/naomigd.cpp | 2 +- src/mame/machine/naomigd.h | 2 +- src/mame/machine/naomim1.cpp | 4 +- src/mame/machine/naomim1.h | 2 +- src/mame/machine/naomim2.cpp | 2 +- src/mame/machine/naomim2.h | 2 +- src/mame/machine/naomim4.cpp | 2 +- src/mame/machine/naomim4.h | 2 +- src/mame/machine/naomirom.cpp | 2 +- src/mame/machine/naomirom.h | 2 +- src/mame/machine/nb1413m3.cpp | 2 +- src/mame/machine/nb1414m4.cpp | 2 +- src/mame/machine/nextkbd.cpp | 36 +- src/mame/machine/nextkbd.h | 2 +- src/mame/machine/nextmo.cpp | 2 +- src/mame/machine/nextmo.h | 2 +- src/mame/machine/ng_memcard.cpp | 2 +- src/mame/machine/ng_memcard.h | 2 +- src/mame/machine/ngen_kb.cpp | 2 +- src/mame/machine/ngen_kb.h | 2 +- src/mame/machine/nmk004.cpp | 2 +- src/mame/machine/nmk004.h | 2 +- src/mame/machine/nmk112.cpp | 8 +- src/mame/machine/nmk112.h | 9 +- src/mame/machine/ns10crypt.cpp | 16 +- src/mame/machine/ns10crypt.h | 16 +- src/mame/machine/ns11prot.cpp | 20 +- src/mame/machine/ns11prot.h | 20 +- src/mame/machine/pc1512kb.cpp | 2 +- src/mame/machine/pc1512kb.h | 2 +- src/mame/machine/pc9801_118.cpp | 2 +- src/mame/machine/pc9801_118.h | 2 +- src/mame/machine/pc9801_26.cpp | 2 +- src/mame/machine/pc9801_26.h | 2 +- src/mame/machine/pc9801_86.cpp | 2 +- src/mame/machine/pc9801_86.h | 2 +- src/mame/machine/pc9801_cbus.cpp | 2 +- src/mame/machine/pc9801_cbus.h | 2 +- src/mame/machine/pc9801_kbd.cpp | 2 +- src/mame/machine/pc9801_kbd.h | 2 +- src/mame/machine/pcd_kbd.cpp | 2 +- src/mame/machine/pcd_kbd.h | 2 +- src/mame/machine/pce220_ser.cpp | 4 +- src/mame/machine/pce220_ser.h | 2 +- src/mame/machine/pce_cd.cpp | 2 +- src/mame/machine/pce_cd.h | 2 +- src/mame/machine/pcecommn.h | 2 +- src/mame/machine/pcshare.h | 2 +- src/mame/machine/prof80mmu.cpp | 2 +- src/mame/machine/prof80mmu.h | 2 +- src/mame/machine/psion_pack.cpp | 2 +- src/mame/machine/psion_pack.h | 2 +- src/mame/machine/psxcd.cpp | 2 +- src/mame/machine/psxcd.h | 2 +- src/mame/machine/qimi.cpp | 2 +- src/mame/machine/qimi.h | 2 +- src/mame/machine/qx10kbd.cpp | 2 +- src/mame/machine/qx10kbd.h | 2 +- src/mame/machine/raiden2cop.cpp | 2 +- src/mame/machine/raiden2cop.h | 2 +- src/mame/machine/rmnkbd.cpp | 2 +- src/mame/machine/rmnkbd.h | 2 +- src/mame/machine/rx01.cpp | 2 +- src/mame/machine/rx01.h | 2 +- src/mame/machine/s32comm.cpp | 2 +- src/mame/machine/s32comm.h | 2 +- src/mame/machine/segabb.cpp | 2 +- src/mame/machine/segabb.h | 2 +- src/mame/machine/segaic16.cpp | 11 +- src/mame/machine/segaic16.h | 10 +- src/mame/machine/seicop.cpp | 2 +- src/mame/machine/seicop.h | 2 +- src/mame/machine/sgi.cpp | 2 +- src/mame/machine/sgi.h | 2 +- src/mame/machine/slapstic.cpp | 2 +- src/mame/machine/smartmed.cpp | 6 +- src/mame/machine/smartmed.h | 6 +- src/mame/machine/sonydriv.cpp | 2 +- src/mame/machine/sonydriv.h | 2 +- src/mame/machine/st0016.cpp | 2 +- src/mame/machine/st0016.h | 2 +- src/mame/machine/swim.cpp | 2 +- src/mame/machine/swim.h | 2 +- src/mame/machine/tait8741.cpp | 4 +- src/mame/machine/tait8741.h | 4 +- src/mame/machine/taitoio.cpp | 6 +- src/mame/machine/taitoio.h | 6 +- src/mame/machine/tandy2kb.cpp | 2 +- src/mame/machine/tandy2kb.h | 2 +- src/mame/machine/teleprinter.cpp | 2 +- src/mame/machine/teleprinter.h | 2 +- src/mame/machine/thomson.cpp | 2 +- src/mame/machine/ticket.cpp | 2 +- src/mame/machine/ticket.h | 2 +- src/mame/machine/trs80m2kb.cpp | 2 +- src/mame/machine/trs80m2kb.h | 2 +- src/mame/machine/upd65031.cpp | 42 +- src/mame/machine/upd65031.h | 2 +- src/mame/machine/v1050kb.cpp | 2 +- src/mame/machine/v1050kb.h | 2 +- src/mame/machine/victor9k_fdc.cpp | 8 +- src/mame/machine/victor9k_fdc.h | 2 +- src/mame/machine/victor9kb.cpp | 2 +- src/mame/machine/victor9kb.h | 2 +- src/mame/machine/wangpckb.cpp | 2 +- src/mame/machine/wangpckb.h | 2 +- src/mame/machine/wpc.cpp | 2 +- src/mame/machine/wpc.h | 2 +- src/mame/machine/wpc_lamp.cpp | 2 +- src/mame/machine/wpc_lamp.h | 2 +- src/mame/machine/wpc_out.cpp | 2 +- src/mame/machine/wpc_out.h | 2 +- src/mame/machine/wpc_pic.cpp | 10 +- src/mame/machine/wpc_pic.h | 2 +- src/mame/machine/wpc_shift.cpp | 2 +- src/mame/machine/wpc_shift.h | 2 +- src/mame/machine/x1.cpp | 2 +- src/mame/machine/x68k_hdc.cpp | 2 +- src/mame/machine/x68k_hdc.h | 2 +- src/mame/machine/x68k_kbd.cpp | 2 +- src/mame/machine/x68k_kbd.h | 2 +- src/mame/machine/x820kb.cpp | 2 +- src/mame/machine/x820kb.h | 2 +- src/mame/machine/zndip.cpp | 2 +- src/mame/machine/zndip.h | 2 +- src/mame/machine/zs01.cpp | 8 +- src/mame/machine/zs01.h | 2 +- src/mame/machine/zx8302.cpp | 34 +- src/mame/machine/zx8302.h | 2 +- src/mame/video/733_asr.cpp | 2 +- src/mame/video/733_asr.h | 2 +- src/mame/video/911_vdt.cpp | 2 +- src/mame/video/911_vdt.h | 2 +- src/mame/video/abc1600.cpp | 2 +- src/mame/video/abc1600.h | 2 +- src/mame/video/antic.cpp | 3 +- src/mame/video/antic.h | 6 +- src/mame/video/apollo.cpp | 6 +- src/mame/video/apple2.cpp | 2 +- src/mame/video/apple2.h | 2 +- src/mame/video/atarimo.cpp | 4 +- src/mame/video/atarimo.h | 4 +- src/mame/video/atarirle.cpp | 4 +- src/mame/video/atarirle.h | 2 +- src/mame/video/avgdvg.cpp | 22 +- src/mame/video/avgdvg.h | 22 +- src/mame/video/bfm_adr2.cpp | 2 +- src/mame/video/bfm_adr2.h | 2 +- src/mame/video/bfm_dm01.cpp | 2 +- src/mame/video/bfm_dm01.h | 2 +- src/mame/video/c116.cpp | 2 +- src/mame/video/c116.h | 2 +- src/mame/video/c45.cpp | 2 +- src/mame/video/c45.h | 2 +- src/mame/video/chihiro.cpp | 8 +- src/mame/video/crt.cpp | 2 +- src/mame/video/crt.h | 2 +- src/mame/video/decbac06.cpp | 4 +- src/mame/video/decbac06.h | 4 +- src/mame/video/deckarn.cpp | 6 +- src/mame/video/deckarn.h | 6 +- src/mame/video/decmxc06.cpp | 6 +- src/mame/video/decmxc06.h | 6 +- src/mame/video/deco16ic.cpp | 6 +- src/mame/video/deco16ic.h | 6 +- src/mame/video/deco_zoomspr.cpp | 6 +- src/mame/video/deco_zoomspr.h | 6 +- src/mame/video/decocomn.cpp | 4 +- src/mame/video/decocomn.h | 4 +- src/mame/video/decodmd1.cpp | 4 +- src/mame/video/decodmd1.h | 6 +- src/mame/video/decodmd2.cpp | 4 +- src/mame/video/decodmd2.h | 6 +- src/mame/video/decodmd3.cpp | 4 +- src/mame/video/decodmd3.h | 6 +- src/mame/video/decospr.cpp | 6 +- src/mame/video/decospr.h | 6 +- src/mame/video/excellent_spr.cpp | 2 +- src/mame/video/excellent_spr.h | 2 +- src/mame/video/fuukifg.cpp | 4 +- src/mame/video/fuukifg.h | 4 +- src/mame/video/gb_lcd.cpp | 10 +- src/mame/video/gb_lcd.h | 10 +- src/mame/video/gic.cpp | 4 +- src/mame/video/gic.h | 4 +- src/mame/video/gime.cpp | 11 +- src/mame/video/gime.h | 18 +- src/mame/video/gp9001.cpp | 2 +- src/mame/video/gp9001.h | 2 +- src/mame/video/gtia.cpp | 2 +- src/mame/video/gtia.h | 2 +- src/mame/video/igs017_igs031.cpp | 2 +- src/mame/video/igs017_igs031.h | 2 +- src/mame/video/itech32.cpp | 8 +- src/mame/video/jalblend.cpp | 2 +- src/mame/video/jalblend.h | 2 +- src/mame/video/k001005.cpp | 4 +- src/mame/video/k001005.h | 6 +- src/mame/video/k001006.cpp | 5 +- src/mame/video/k001006.h | 6 +- src/mame/video/k001604.cpp | 6 +- src/mame/video/k001604.h | 6 +- src/mame/video/k007121.cpp | 4 +- src/mame/video/k007121.h | 4 +- src/mame/video/k007342.cpp | 4 +- src/mame/video/k007342.h | 4 +- src/mame/video/k007420.cpp | 4 +- src/mame/video/k007420.h | 4 +- src/mame/video/k037122.cpp | 6 +- src/mame/video/k037122.h | 6 +- src/mame/video/k051316.cpp | 2 +- src/mame/video/k051316.h | 2 +- src/mame/video/k051733.cpp | 2 +- src/mame/video/k051733.h | 2 +- src/mame/video/k051960.cpp | 5 +- src/mame/video/k051960.h | 6 +- src/mame/video/k052109.cpp | 7 +- src/mame/video/k052109.h | 6 +- src/mame/video/k053244_k053245.cpp | 2 +- src/mame/video/k053244_k053245.h | 2 +- src/mame/video/k053246_k053247_k055673.cpp | 10 +- src/mame/video/k053246_k053247_k055673.h | 10 +- src/mame/video/k053250.cpp | 4 +- src/mame/video/k053250.h | 2 +- src/mame/video/k053251.cpp | 2 +- src/mame/video/k053251.h | 2 +- src/mame/video/k053936.cpp | 2 +- src/mame/video/k053936.h | 2 +- src/mame/video/k054000.cpp | 2 +- src/mame/video/k054000.h | 2 +- src/mame/video/k054156_k054157_k056832.cpp | 7 +- src/mame/video/k054156_k054157_k056832.h | 6 +- src/mame/video/k054338.cpp | 5 +- src/mame/video/k054338.h | 2 +- src/mame/video/k055555.cpp | 2 +- src/mame/video/k055555.h | 2 +- src/mame/video/k057714.cpp | 2 +- src/mame/video/k057714.h | 2 +- src/mame/video/k1ge.cpp | 6 +- src/mame/video/k1ge.h | 6 +- src/mame/video/kan_pand.cpp | 6 +- src/mame/video/kan_pand.h | 6 +- src/mame/video/kaneko_grap2.cpp | 6 +- src/mame/video/kaneko_grap2.h | 4 +- src/mame/video/kaneko_spr.cpp | 8 +- src/mame/video/kaneko_spr.h | 8 +- src/mame/video/kaneko_tmap.cpp | 4 +- src/mame/video/kaneko_tmap.h | 4 +- src/mame/video/maria.cpp | 2 +- src/mame/video/maria.h | 6 +- src/mame/video/mb60553.cpp | 4 +- src/mame/video/mb60553.h | 4 +- src/mame/video/mcd212.cpp | 2 +- src/mame/video/mcd212.h | 2 +- src/mame/video/neogeo_spr.cpp | 10 +- src/mame/video/neogeo_spr.h | 10 +- src/mame/video/newport.cpp | 2 +- src/mame/video/newport.h | 2 +- src/mame/video/nick.cpp | 2 +- src/mame/video/nick.h | 2 +- src/mame/video/pc080sn.cpp | 6 +- src/mame/video/pc080sn.h | 6 +- src/mame/video/pc090oj.cpp | 6 +- src/mame/video/pc090oj.h | 6 +- src/mame/video/pc_t1t.cpp | 6 +- src/mame/video/pc_t1t.h | 6 +- src/mame/video/pcd.cpp | 6 +- src/mame/video/pcd.h | 6 +- src/mame/video/powervr2.cpp | 14 +- src/mame/video/powervr2.h | 2 +- src/mame/video/ppu2c0x.cpp | 22 +- src/mame/video/ppu2c0x.h | 20 +- src/mame/video/sega16sp.cpp | 20 +- src/mame/video/sega16sp.h | 20 +- src/mame/video/segaic16.cpp | 4 +- src/mame/video/segaic16.h | 4 +- src/mame/video/segaic16_road.cpp | 2 +- src/mame/video/segaic16_road.h | 2 +- src/mame/video/segaic24.cpp | 10 +- src/mame/video/segaic24.h | 10 +- src/mame/video/seibu_crtc.cpp | 2 +- src/mame/video/seibu_crtc.h | 2 +- src/mame/video/seta001.cpp | 6 +- src/mame/video/seta001.h | 6 +- src/mame/video/sknsspr.cpp | 2 +- src/mame/video/sknsspr.h | 2 +- src/mame/video/st0020.cpp | 6 +- src/mame/video/st0020.h | 6 +- src/mame/video/stic.cpp | 2 +- src/mame/video/stic.h | 2 +- src/mame/video/tc0080vco.cpp | 6 +- src/mame/video/tc0080vco.h | 6 +- src/mame/video/tc0100scn.cpp | 6 +- src/mame/video/tc0100scn.h | 6 +- src/mame/video/tc0110pcr.cpp | 4 +- src/mame/video/tc0110pcr.h | 4 +- src/mame/video/tc0150rod.cpp | 2 +- src/mame/video/tc0150rod.h | 2 +- src/mame/video/tc0180vcu.cpp | 4 +- src/mame/video/tc0180vcu.h | 4 +- src/mame/video/tc0280grd.cpp | 4 +- src/mame/video/tc0280grd.h | 4 +- src/mame/video/tc0360pri.cpp | 2 +- src/mame/video/tc0360pri.h | 2 +- src/mame/video/tc0480scp.cpp | 6 +- src/mame/video/tc0480scp.h | 6 +- src/mame/video/tc0780fpa.cpp | 2 +- src/mame/video/tc0780fpa.h | 2 +- src/mame/video/tecmo_mix.cpp | 2 +- src/mame/video/tecmo_mix.h | 2 +- src/mame/video/tecmo_spr.cpp | 2 +- src/mame/video/tecmo_spr.h | 2 +- src/mame/video/tia.cpp | 6 +- src/mame/video/tia.h | 6 +- src/mame/video/tigeroad_spr.cpp | 2 +- src/mame/video/tigeroad_spr.h | 2 +- src/mame/video/toaplan_scu.cpp | 2 +- src/mame/video/toaplan_scu.h | 2 +- src/mame/video/uv201.cpp | 2 +- src/mame/video/uv201.h | 2 +- src/mame/video/vrender0.cpp | 2 +- src/mame/video/vrender0.h | 4 +- src/mame/video/vs920a.cpp | 4 +- src/mame/video/vs920a.h | 4 +- src/mame/video/vsystem_spr.cpp | 6 +- src/mame/video/vsystem_spr.h | 6 +- src/mame/video/vsystem_spr2.cpp | 6 +- src/mame/video/vsystem_spr2.h | 6 +- src/mame/video/vtvideo.cpp | 8 +- src/mame/video/vtvideo.h | 10 +- src/mame/video/wpc_dmd.cpp | 2 +- src/mame/video/wpc_dmd.h | 2 +- src/mame/video/wswan_video.cpp | 2 +- src/mame/video/wswan_video.h | 2 +- src/mame/video/ygv608.cpp | 6 +- src/mame/video/ygv608.h | 6 +- src/mame/video/zx8301.cpp | 2 +- src/mame/video/zx8301.h | 4 +- src/osd/modules/debugger/osx/debugconsole.mm | 2 +- src/osd/modules/debugger/osx/deviceinfoviewer.mm | 2 +- .../debugger/qt/deviceinformationwindow.cpp | 8 +- .../modules/debugger/qt/deviceinformationwindow.h | 2 +- src/osd/modules/debugger/qt/mainwindow.cpp | 2 +- src/osd/modules/debugger/win/consolewininfo.cpp | 2 +- 5545 files changed, 14691 insertions(+), 14299 deletions(-) create mode 100644 src/mame/drivers/csc.cpp (limited to 'src') diff --git a/src/devices/bus/a1bus/a1bus.cpp b/src/devices/bus/a1bus/a1bus.cpp index b0ea52156ca..c3ebc73c6de 100644 --- a/src/devices/bus/a1bus/a1bus.cpp +++ b/src/devices/bus/a1bus/a1bus.cpp @@ -24,19 +24,21 @@ const device_type A1BUS_SLOT = &device_creator; //------------------------------------------------- // a1bus_slot_device - constructor //------------------------------------------------- -a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *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) + device_slot_interface(mconfig, *this), + m_a1bus_tag(nullptr), + m_a1bus_slottag(nullptr) { } -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) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_a1bus_tag(nullptr), m_a1bus_slottag(nullptr) { } -void a1bus_slot_device::static_set_a1bus_slot(device_t &device, std::string tag, std::string slottag) +void a1bus_slot_device::static_set_a1bus_slot(device_t &device, const char *tag, const char *slottag) { a1bus_slot_device &a1bus_card = dynamic_cast(device); a1bus_card.m_a1bus_tag = tag; @@ -60,7 +62,7 @@ void a1bus_slot_device::device_start() const device_type A1BUS = &device_creator; -void a1bus_device::static_set_cputag(device_t &device, std::string tag) +void a1bus_device::static_set_cputag(device_t &device, const char *tag) { a1bus_device &a1bus = downcast(device); a1bus.m_cputag = tag; @@ -74,17 +76,17 @@ void a1bus_device::static_set_cputag(device_t &device, std::string tag) // a1bus_device - constructor //------------------------------------------------- -a1bus_device::a1bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a1bus_device::a1bus_device(const machine_config &mconfig, const char *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_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr) { } -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) : +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) : 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_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr) { } //------------------------------------------------- @@ -138,7 +140,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, std::string tag, UINT8 *data) +void a1bus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) { // printf("install_bank: %s @ %x->%x mask %x mirror %x\n", tag, start, end, mask, mirror); m_maincpu = machine().device(m_cputag); @@ -167,7 +169,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_next(nullptr) + m_a1bus_tag(nullptr), m_a1bus_slottag(nullptr), m_next(nullptr) { } @@ -180,7 +182,7 @@ device_a1bus_card_interface::~device_a1bus_card_interface() { } -void device_a1bus_card_interface::static_set_a1bus_tag(device_t &device, std::string tag, std::string slottag) +void device_a1bus_card_interface::static_set_a1bus_tag(device_t &device, const char *tag, const char *slottag) { device_a1bus_card_interface &a1bus_card = dynamic_cast(device); a1bus_card.m_a1bus_tag = tag; diff --git a/src/devices/bus/a1bus/a1bus.h b/src/devices/bus/a1bus/a1bus.h index 70b9532167b..e9726073ddb 100644 --- a/src/devices/bus/a1bus/a1bus.h +++ b/src/devices/bus/a1bus/a1bus.h @@ -49,18 +49,17 @@ class a1bus_slot_device : public device_t, { public: // construction/destruction - 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); + 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); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_a1bus_slot(device_t &device, std::string tag, std::string slottag); + static void static_set_a1bus_slot(device_t &device, const char *tag, const char *slottag); protected: // configuration - std::string m_a1bus_tag; - std::string m_a1bus_slottag; + const char *m_a1bus_tag, *m_a1bus_slottag; }; // device type definition @@ -73,11 +72,11 @@ class a1bus_device : public device_t { public: // construction/destruction - 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); + 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); // inline configuration - static void static_set_cputag(device_t &device, std::string tag); + static void static_set_cputag(device_t &device, const char *tag); template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(device).m_out_irq_cb.set_callback(object); } template static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast(device).m_out_nmi_cb.set_callback(object); } @@ -88,7 +87,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, std::string tag, UINT8 *data); + void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data); DECLARE_WRITE_LINE_MEMBER( irq_w ); DECLARE_WRITE_LINE_MEMBER( nmi_w ); @@ -105,7 +104,7 @@ protected: devcb_write_line m_out_nmi_cb; device_a1bus_card_interface *m_device; - std::string m_cputag; + const char *m_cputag; }; @@ -136,11 +135,10 @@ 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, std::string tag, std::string slottag); + static void static_set_a1bus_tag(device_t &device, const char *tag, const char *slottag); public: a1bus_device *m_a1bus; - std::string m_a1bus_tag; - std::string m_a1bus_slottag; + const char *m_a1bus_tag, *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 090aa58bfcd..7168133647c 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, std::string tag, device_t *owner, UINT32 clock) : +a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 c63353979dd..482704b31cf 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, 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); + 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); // 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 e9a29649c97..912401a0642 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, std::string tag, device_t *owner, UINT32 clock) : +a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 738d1bcbcc2..d395468891b 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, 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); + 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); // 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 7c6b0cb40af..3e701a636fd 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_sn1(*this, SN1_TAG), @@ -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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_aesms_device::a2bus_aesms_device(const machine_config &mconfig, const char *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 fad3d592470..b02792afe9a 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -54,13 +54,13 @@ protected: class a2bus_alfam2_device : public a2bus_sn76489_device { public: - a2bus_alfam2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class a2bus_aesms_device : public a2bus_sn76489_device { public: - a2bus_aesms_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_aesms_device(const machine_config &mconfig, const char *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 d62e29e8a6b..cb647b6476b 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_z80(*this, Z80_TAG), m_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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, const char *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 53e21d5751a..e1bb4b4d685 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, 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); + 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); // 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 2ef20951e61..dcad400f8b1 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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_ARCADEBOARD, "Third Millenium Engineering Arcade Board", tag, owner, clock, "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, std: { } -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) : +a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG), diff --git a/src/devices/bus/a2bus/a2arcadebd.h b/src/devices/bus/a2bus/a2arcadebd.h index e16f7faff0a..1268244ca9f 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, 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); + 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); // 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 1ef42988001..5fd03495c87 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 - constructor //------------------------------------------------- -a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *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) + device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr) { } -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) : +a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr) { } -void a2bus_slot_device::static_set_a2bus_slot(device_t &device, std::string tag, std::string slottag) +void a2bus_slot_device::static_set_a2bus_slot(device_t &device, const char *tag, const char *slottag) { a2bus_slot_device &a2bus_card = dynamic_cast(device); a2bus_card.m_a2bus_tag = tag; @@ -124,7 +124,7 @@ void a2bus_slot_device::device_start() const device_type A2BUS = &device_creator; -void a2bus_device::static_set_cputag(device_t &device, std::string tag) +void a2bus_device::static_set_cputag(device_t &device, const char *tag) { a2bus_device &a2bus = downcast(device); a2bus.m_cputag = tag; @@ -138,19 +138,19 @@ void a2bus_device::static_set_cputag(device_t &device, std::string tag) // a2bus_device - constructor //------------------------------------------------- -a2bus_device::a2bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_device::a2bus_device(const machine_config &mconfig, const char *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_slot_irq_mask(0), m_slot_nmi_mask(0) + m_out_inh_cb(*this), m_cputag(nullptr), m_slot_irq_mask(0), m_slot_nmi_mask(0) { } -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) : +a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_maincpu_space(nullptr), m_out_irq_cb(*this), m_out_nmi_cb(*this), - m_out_inh_cb(*this), m_slot_irq_mask(0), m_slot_nmi_mask(0) + m_out_inh_cb(*this), m_cputag(nullptr), 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_slot(0), m_next(nullptr) + m_a2bus_tag(nullptr), m_a2bus_slottag(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, std::string tag, std::string slottag) +void device_a2bus_card_interface::static_set_a2bus_tag(device_t &device, const char *tag, const char *slottag) { device_a2bus_card_interface &a2bus_card = dynamic_cast(device); a2bus_card.m_a2bus_tag = tag; @@ -320,7 +320,7 @@ void device_a2bus_card_interface::static_set_a2bus_tag(device_t &device, std::st void device_a2bus_card_interface::set_a2bus_device() { // extract the slot number from the last digit of the slot tag - int tlen = m_a2bus_slottag.length(); + int tlen = strlen(m_a2bus_slottag); 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 7bfa03213c8..07d4e57781d 100644 --- a/src/devices/bus/a2bus/a2bus.h +++ b/src/devices/bus/a2bus/a2bus.h @@ -63,18 +63,17 @@ class a2bus_slot_device : public device_t, { public: // construction/destruction - 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); + 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); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_a2bus_slot(device_t &device, std::string tag, std::string slottag); + static void static_set_a2bus_slot(device_t &device, const char *tag, const char *slottag); protected: // configuration - std::string m_a2bus_tag; - std::string m_a2bus_slottag; + const char *m_a2bus_tag, *m_a2bus_slottag; }; // device type definition @@ -89,11 +88,11 @@ class a2bus_device : public device_t friend class a2bus_mcms2_device; public: // construction/destruction - 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); + 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); // inline configuration - static void static_set_cputag(device_t &device, std::string tag); + static void static_set_cputag(device_t &device, const char *tag); template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(device).m_out_irq_cb.set_callback(object); } template static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast(device).m_out_nmi_cb.set_callback(object); } template static devcb_base &set_out_inh_callback(device_t &device, _Object object) { return downcast(device).m_out_inh_cb.set_callback(object); } @@ -129,7 +128,7 @@ protected: devcb_write8 m_out_inh_cb; device_a2bus_card_interface *m_device_list[8]; - std::string m_cputag; + const char *m_cputag; UINT8 m_slot_irq_mask; UINT8 m_slot_nmi_mask; @@ -187,11 +186,10 @@ 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, std::string tag, std::string slottag); + static void static_set_a2bus_tag(device_t &device, const char *tag, const char *slottag); public: a2bus_device *m_a2bus; - std::string m_a2bus_tag; - std::string m_a2bus_slottag; + const char *m_a2bus_tag, *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 d259e49cbdc..aa7f6336ce2 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (65C02 firmware, www.dreher.net)", tag, owner, clock, "a2cffa2", __FILE__), device_nvram_interface(mconfig, *this) { } -a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (6502 firmware, www.dreher.net)", tag, owner, clock, "a2cffa02", __FILE__), device_nvram_interface(mconfig, *this) { diff --git a/src/devices/bus/a2bus/a2cffa.h b/src/devices/bus/a2bus/a2cffa.h index 9444ee48a9b..4215bde504f 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const 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, std::string tag, device_t *owner, UINT32 clock); + a2bus_cffa2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a2bus_cffa2_6502_device(const machine_config &mconfig, const char *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 e17edcb4870..6e33d0be8fa 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr) { } -a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, const char *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 461822fe3ab..e7751089e33 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, 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); + 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); // 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 ce7e603a765..488b675a5f9 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_fdc(*this, FDC_TAG), m_rom(nullptr) { } -a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_floppy_device(mconfig, A2BUS_DISKII, "Apple Disk II controller", tag, owner, clock, "a2diskii", __FILE__) { } -a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_floppy_device(mconfig, A2BUS_IWM_FDC, "Apple IWM floppy card", tag, owner, clock, "a2iwm_flop", __FILE__) { } diff --git a/src/devices/bus/a2bus/a2diskii.h b/src/devices/bus/a2bus/a2diskii.h index d803926581c..9e01464893e 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -49,13 +49,13 @@ private: class a2bus_diskii_device: public a2bus_floppy_device { public: - a2bus_diskii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class a2bus_iwmflop_device: public a2bus_floppy_device { public: - a2bus_iwmflop_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_iwmflop_device(const machine_config &mconfig, const char *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 fd9533c879a..474e228b6fa 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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, const char *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 7826e7cadcb..28cfa664be0 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, std::string tag, device_t *owner, UINT32 clock); + a2bus_diskiing_device(const machine_config &mconfig, const char *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 71350591e0d..0cd70077cea 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_dac(*this, DAC_TAG), m_volume(0), m_lastdac(0) { } -a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, const char *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 d7448a7a671..ce349ab15d9 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, 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); + 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); // 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 e8601235b46..f1d4836d37b 100644 --- a/src/devices/bus/a2bus/a2eauxslot.cpp +++ b/src/devices/bus/a2bus/a2eauxslot.cpp @@ -26,19 +26,21 @@ const device_type A2EAUXSLOT_SLOT = &device_creator; //------------------------------------------------- // a2eauxslot_slot_device - constructor //------------------------------------------------- -a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *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) + device_slot_interface(mconfig, *this), + m_a2eauxslot_tag(nullptr), + m_a2eauxslot_slottag(nullptr) { } -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) : +a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr) { } -void a2eauxslot_slot_device::static_set_a2eauxslot_slot(device_t &device, std::string tag, std::string slottag) +void a2eauxslot_slot_device::static_set_a2eauxslot_slot(device_t &device, const char *tag, const char *slottag) { a2eauxslot_slot_device &a2eauxslot_card = dynamic_cast(device); a2eauxslot_card.m_a2eauxslot_tag = tag; @@ -62,7 +64,7 @@ void a2eauxslot_slot_device::device_start() const device_type A2EAUXSLOT = &device_creator; -void a2eauxslot_device::static_set_cputag(device_t &device, std::string tag) +void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag) { a2eauxslot_device &a2eauxslot = downcast(device); a2eauxslot.m_cputag = tag; @@ -76,17 +78,17 @@ void a2eauxslot_device::static_set_cputag(device_t &device, std::string tag) // a2eauxslot_device - constructor //------------------------------------------------- -a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *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_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr) { } -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) : +a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_out_irq_cb(*this), - m_out_nmi_cb(*this), m_device(nullptr) + m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr) { } //------------------------------------------------- @@ -153,7 +155,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_slot(0), m_next(nullptr) + m_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr), m_slot(0), m_next(nullptr) { } @@ -166,7 +168,7 @@ device_a2eauxslot_card_interface::~device_a2eauxslot_card_interface() { } -void device_a2eauxslot_card_interface::static_set_a2eauxslot_tag(device_t &device, std::string tag, std::string slottag) +void device_a2eauxslot_card_interface::static_set_a2eauxslot_tag(device_t &device, const char *tag, const char *slottag) { device_a2eauxslot_card_interface &a2eauxslot_card = dynamic_cast(device); a2eauxslot_card.m_a2eauxslot_tag = tag; diff --git a/src/devices/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h index 04972cfa347..06d83a9435d 100644 --- a/src/devices/bus/a2bus/a2eauxslot.h +++ b/src/devices/bus/a2bus/a2eauxslot.h @@ -47,18 +47,17 @@ class a2eauxslot_slot_device : public device_t, { public: // construction/destruction - 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); + 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); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_a2eauxslot_slot(device_t &device, std::string tag, std::string slottag); + static void static_set_a2eauxslot_slot(device_t &device, const char *tag, const char *slottag); protected: // configuration - std::string m_a2eauxslot_tag; - std::string m_a2eauxslot_slottag; + const char *m_a2eauxslot_tag, *m_a2eauxslot_slottag; }; // device type definition @@ -72,11 +71,11 @@ class a2eauxslot_device : public device_t { public: // construction/destruction - 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); + 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); // inline configuration - static void static_set_cputag(device_t &device, std::string tag); + static void static_set_cputag(device_t &device, const char *tag); template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(device).m_out_irq_cb.set_callback(object); } template static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast(device).m_out_nmi_cb.set_callback(object); } @@ -101,7 +100,7 @@ protected: devcb_write_line m_out_nmi_cb; device_a2eauxslot_card_interface *m_device; - std::string m_cputag; + const char *m_cputag; }; @@ -136,11 +135,10 @@ public: void lower_slot_nmi() { m_a2eauxslot->set_nmi_line(CLEAR_LINE); } // inline configuration - static void static_set_a2eauxslot_tag(device_t &device, std::string tag, std::string slottag); + static void static_set_a2eauxslot_tag(device_t &device, const char *tag, const char *slottag); public: a2eauxslot_device *m_a2eauxslot; - std::string m_a2eauxslot_tag; - std::string m_a2eauxslot_slottag; + const char *m_a2eauxslot_tag, *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 f388782337f..e6be96b5d85 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) { } -a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_ECHOII, "Street Electronics Echo II", tag, owner, clock, "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 64f974d141f..70a83b5fd8b 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, 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); + a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides 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 f718df1ea56..c3e9af48cac 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; // LIVE DEVICE //************************************************************************** -a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2EAUX_EXT80COL, "Apple IIe Extended 80-Column Card", tag, owner, clock, "a2eext80", __FILE__), device_a2eauxslot_card_interface(mconfig, *this) { } -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) : +a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2eauxslot_card_interface(mconfig, *this) { diff --git a/src/devices/bus/a2bus/a2eext80col.h b/src/devices/bus/a2bus/a2eext80col.h index 3152e357546..01c56a7a714 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, 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); + 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); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2eramworks3.cpp b/src/devices/bus/a2bus/a2eramworks3.cpp index ea70075436f..b7d6897b82d 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; // LIVE DEVICE //************************************************************************** -a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2EAUX_RAMWORKS3, "Applied Engineering RamWorks III", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2eauxslot_card_interface(mconfig, *this), m_bank(0) { diff --git a/src/devices/bus/a2bus/a2eramworks3.h b/src/devices/bus/a2bus/a2eramworks3.h index 28d4a41c305..7978a405512 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, 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); + 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); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2estd80col.cpp b/src/devices/bus/a2bus/a2estd80col.cpp index 102e6176ab9..706f32d6a55 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; // LIVE DEVICE //************************************************************************** -a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2EAUX_STD80COL, "Apple IIe Standard 80-Column Card", tag, owner, clock, "a2estd80", __FILE__), device_a2eauxslot_card_interface(mconfig, *this) { } -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) : +a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2eauxslot_card_interface(mconfig, *this) { diff --git a/src/devices/bus/a2bus/a2estd80col.h b/src/devices/bus/a2bus/a2estd80col.h index ccf73070d6a..3c76459e951 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, 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); + 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); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp index f335ac5e181..fa2744c995e 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ncr5380(*this, SCSI_5380_TAG), @@ -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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, const char *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 52c464e457d..d4d07ce04ea 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, 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); + 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); // 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 0a25aafebda..9a0b21dca36 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; // LIVE DEVICE //************************************************************************** -a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_LANG, "Apple II Language Card", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this) { diff --git a/src/devices/bus/a2bus/a2lang.h b/src/devices/bus/a2bus/a2lang.h index da600f06b23..2fd14b5bd86 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, 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); + 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); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp index 17cf0e7bc2d..ad7f621d6c8 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_mcms(*this, ENGINE_TAG) { } -a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr) { } -a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mcms_device::mcms_device(const machine_config &mconfig, const char *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 afbf0d80ae5..5f48b165a12 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, std::string tag, device_t *owner, UINT32 clock); + mcms_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, 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); + 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); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp index 2c58b61d256..9832b3160e2 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_memexp_device(mconfig, A2BUS_MEMEXP, "Apple II Memory Expansion Card", tag, owner, clock, "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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_memexp_device(mconfig, A2BUS_RAMFACTOR, "Applied Engineering RamFactor", tag, owner, clock, "a2ramfac", __FILE__) { m_isramfactor = true; diff --git a/src/devices/bus/a2bus/a2memexp.h b/src/devices/bus/a2bus/a2memexp.h index a99f94eb89c..8ce49163db1 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -54,13 +54,13 @@ private: class a2bus_memexpapple_device : public a2bus_memexp_device { public: - a2bus_memexpapple_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class a2bus_ramfactor_device : public a2bus_memexp_device { public: - a2bus_ramfactor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_ramfactor_device(const machine_config &mconfig, const char *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 41423ddfdd2..79281f85ee2 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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_MIDI, "6850 MIDI card", tag, owner, clock, "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, std::string { } -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) : +a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ptm(*this, MIDI_PTM_TAG), diff --git a/src/devices/bus/a2bus/a2midi.h b/src/devices/bus/a2bus/a2midi.h index d8d37d2241a..9f3abfe0f7f 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, 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); + 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); // 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 cc53ae3f6cd..749c14621fa 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_via1(*this, VIA1_TAG), @@ -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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_mockingboard_device::a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_ayboard_device(mconfig, A2BUS_MOCKINGBOARD, "Sweet Micro Systems Mockingboard", tag, owner, clock, "a2mockbd", __FILE__) { m_isPhasor = false; m_PhasorNative = false; } -a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_ayboard_device(mconfig, A2BUS_PHASOR, "Applied Engineering Phasor", tag, owner, clock, "a2phasor", __FILE__) { m_isPhasor = true; m_PhasorNative = false; } -a2bus_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_ayboard_device(mconfig, A2BUS_ECHOPLUS, "Street Electronics Echo Plus", tag, owner, clock, "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 e9771d771bf..4e7025bbe59 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -65,13 +65,13 @@ private: class a2bus_mockingboard_device : public a2bus_ayboard_device { public: - a2bus_mockingboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class a2bus_phasor_device : public a2bus_ayboard_device { public: - a2bus_phasor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_phasor_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a2bus_echoplus_device(const machine_config &mconfig, const char *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 9613445725f..f47f964f192 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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *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, std::string ta { } -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) : +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) : 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 83481d66a8d..997e4a342a6 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, 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); + 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); // 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 e63cb32a0a0..7cdabc64b74 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_dac(*this, DAC_TAG) { } -a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SAM, "Don't Ask Software SAM", tag, owner, clock, "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 541303ad108..5574a75c27c 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, 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); + a2bus_sam_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides 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 d9e0c0cb48a..50a715893bf 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ncr5380(*this, SCSI_5380_TAG), @@ -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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SCSI, "Apple II SCSI Card", tag, owner, clock, "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 b82213d6053..b6132577846 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, 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); + a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides 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 757f268d9ab..e7477c468c6 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_z80(*this, Z80_TAG), m_bEnabled(false), m_FirstZ80Boot(false) { } -a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SOFTCARD, "Microsoft SoftCard", tag, owner, clock, "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 9a2101d67a9..906d8e14c12 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, 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); + a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides 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 2fa361f573d..d2765ebc557 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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SSC, "Apple Super Serial Card", tag, owner, clock, "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, std::string ta { } -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) : +a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_dsw1(*this, "DSW1"), diff --git a/src/devices/bus/a2bus/a2ssc.h b/src/devices/bus/a2bus/a2ssc.h index e3297f41345..bca78273307 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, 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); + 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); // 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 125057060b4..d47e7770937 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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_SWYFT, "IAI SwyftCard", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_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 9714689744f..564a76ac6b9 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, 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); + 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); 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 35bd88add2a..e8cc3d338c9 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_6809(*this, M6809_TAG), m_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0) { } -a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_THEMILL, "Stellation Two The Mill", tag, owner, clock, "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 7fdade36f17..763aec5f9df 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, 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); + a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides 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 60518688e1e..881acd496ce 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG), m_rom(nullptr), m_dataout(0) { } -a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_THUNDERCLOCK, "ThunderWare ThunderClock Plus", tag, owner, clock, "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 898491fdb5a..55ab8fe4389 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, 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); + a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides 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 932424f6aa0..6f7722e46ea 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_ultraterm_device::a2bus_ultraterm_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_ultratermenh_device::a2bus_ultratermenh_device(const machine_config &mconfig, const char *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 957cf2ae5d3..cbd435106cf 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -59,7 +59,7 @@ private: class a2bus_ultraterm_device : public a2bus_videx160_device { public: - a2bus_ultraterm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_ultraterm_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a2bus_ultratermenh_device(const machine_config &mconfig, const char *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 fe994dcb38b..4fc271c604f 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_videx80_device(mconfig, A2BUS_VIDEOTERM, "Videx VideoTerm", tag, owner, clock, "a2vidtrm", __FILE__) { } -a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_videx80_device(mconfig, A2BUS_IBSAP16, "IBS AP-16 80 column card", tag, owner, clock, "a2ap16", __FILE__) { } -a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_videx80_device(mconfig, A2BUS_IBSAP16ALT, "IBS AP-16 80 column card (alt. version)", tag, owner, clock, "a2ap16a", __FILE__) { } -a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_videx80_device(mconfig, A2BUS_VTC1, "Unknown VideoTerm clone #1", tag, owner, clock, "a2vtc1", __FILE__) { } -a2bus_vtc2_device::a2bus_vtc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_vtc2_device::a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_videx80_device(mconfig, A2BUS_VTC2, "Unknown VideoTerm clone #2", tag, owner, clock, "a2vtc2", __FILE__) { } -a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, const char *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 024cfa16ba7..654103879ec 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -60,7 +60,7 @@ public: class a2bus_videoterm_device : public a2bus_videx80_device { public: - a2bus_videoterm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_videoterm_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a2bus_ap16_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a2bus_ap16alt_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a2bus_vtc1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a2bus_vtc2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a2bus_aevm80_device(const machine_config &mconfig, const char *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 343978daeca..f917d179ffd 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, "Applied Engineering Vulcan IDE controller", tag, owner, clock, "a2vulcan", __FILE__) { } -a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, const char *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 6a961abaf24..25871c70fcb 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -55,7 +55,7 @@ private: class a2bus_vulcan_device : public a2bus_vulcanbase_device { public: - a2bus_vulcan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_vulcan_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a2bus_vulcangold_device(const machine_config &mconfig, const char *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 d8b83825d68..8213a63e010 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_ata(*this, ZIPDRIVE_ATA_TAG), m_rom(nullptr), m_lastdata(0) { } -a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : a2bus_zipdrivebase_device(mconfig, A2BUS_ZIPDRIVE, "Zip Technologies ZipDrive", tag, owner, clock, "a2zipdrv", __FILE__) { } diff --git a/src/devices/bus/a2bus/a2zipdrive.h b/src/devices/bus/a2bus/a2zipdrive.h index 71ac4baed7d..43af97dd532 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -54,7 +54,7 @@ private: class a2bus_zipdrive_device : public a2bus_zipdrivebase_device { public: - a2bus_zipdrive_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2bus_zipdrive_device(const machine_config &mconfig, const char *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 0c31cb9d641..c8f93b725d1 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, const char *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 83a6add1402..256ebd45ca3 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, 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); + 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); // 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 6caf19439a7..870fc194bfb 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_fdc(*this, 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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, const char *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 f448134c71b..b47aba0b10f 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, 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); + 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); // 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 373efb48e26..e85db228ad2 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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) { } -a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) { } -a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_tms(*this, TMS_TAG) diff --git a/src/devices/bus/a2bus/ezcgi.h b/src/devices/bus/a2bus/ezcgi.h index bfcf64de5f3..275ec0fd77e 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, 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); + 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); // 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, 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); + 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); // 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, 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); + 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); // 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 45b8589f734..5357f3cc31d 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0) { } -a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, A2BUS_LASER128, "VTech Laser 128 Internal Device", tag, owner, clock, "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 db73a34efd4..55c46f63730 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, 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); + a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides 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 012b850f025..3d4e11d3487 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, const char *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 bbb4f7da770..669487f1ec4 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, 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); + 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); // 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 80bbb452586..4616bf54ecf 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; // LIVE DEVICE //************************************************************************** -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, const char *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 4609e1cb47f..c70f188c955 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, 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); + 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); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/ramcard16k.cpp b/src/devices/bus/a2bus/ramcard16k.cpp index c5332917b29..1d679b2be8c 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; // LIVE DEVICE //************************************************************************** -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, const char *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 180b09f66a4..b604801a362 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, 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); + 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); protected: virtual void device_start() override; diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp index ec0a8eb2cc5..9b8543613f2 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_a2bus_card_interface(mconfig, *this), m_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, std::string tag, device_t *owner, UINT32 clock) : +a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, const char *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 b8f62830051..d1442593efc 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, 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); + 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); // 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 67c9fd1bb8c..0509753a1c3 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, std::string tag) +void device_a78_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +a78_cart_slot_device::a78_cart_slot_device(const machine_config &mconfig, const char *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 622a4ba405c..cbdc38741f2 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + a78_cart_slot_device(const machine_config &mconfig, const char *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 7a8236425fd..2ec5b34e0e9 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; const device_type A78_ROM_P450_VB = &device_creator; -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_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_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, std::string tag, device_t *owner, UINT32 clock) +a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a78_megacart_device::a78_megacart_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a78_rom_p450_vb_device::a78_rom_p450_vb_device(const machine_config &mconfig, const char *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 6ad4d2780d7..1decc581446 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + a78_megacart_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a78_rom_p450_vb_device(const machine_config &mconfig, const char *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 c2118524341..3448fb85808 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, const char *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 ea853ca036c..3f8d7422d8b 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, std::string tag, device_t *owner, UINT32 clock); + a78_hiscore_device(const machine_config &mconfig, const char *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 264d844c8c2..d7f2f41b7fd 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_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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +a78_rom_device::a78_rom_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +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_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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +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_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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a78_rom_abs_device::a78_rom_abs_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a78_rom_act_device::a78_rom_act_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a78_rom_p450_device::a78_rom_p450_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a78_rom_p450_pokey_device::a78_rom_p450_pokey_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +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_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, std::string tag, device_t *owner, UINT32 clock) +a78_rom_p450_sg9_device::a78_rom_p450_sg9_device(const machine_config &mconfig, const char *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 93a30672966..7c7f6507e38 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, 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); + 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); // 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, 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); + 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); // 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + a78_rom_sg_pokey_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + a78_rom_abs_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a78_rom_act_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a78_rom_p450_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a78_rom_p450_pokey_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a78_rom_p450_sg9_device(const machine_config &mconfig, const char *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 33f1079a015..af05c663440 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; const device_type A78_XM = &device_creator; -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_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_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, std::string tag, device_t *owner, UINT32 clock) +a78_xboard_device::a78_xboard_device(const machine_config &mconfig, const char *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, std::string } -a78_xm_device::a78_xm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +a78_xm_device::a78_xm_device(const machine_config &mconfig, const char *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 c02c8a91d8c..772a6c0e3e6 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + a78_xm_device(const machine_config &mconfig, const char *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 19f51ea9c7d..b2e46a421da 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, std::string tag) +void device_a800_cart_interface::rom_alloc(UINT32 size, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) : +a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, const char *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, std: } -a5200_cart_slot_device::a5200_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a5200_cart_slot_device::a5200_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +xegs_cart_slot_device::xegs_cart_slot_device(const machine_config &mconfig, const char *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 d20816ad5d6..6efdd0839e9 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + a5200_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + xegs_cart_slot_device(const machine_config &mconfig, const char *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 aa3b843a096..54f45ecb208 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 - constructor //------------------------------------------------- -a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, const char *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) + , device_slot_interface(mconfig, *this), m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr) { } -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) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr) { } -void a8sio_slot_device::static_set_a8sio_slot(device_t &device, std::string tag, std::string slottag) +void a8sio_slot_device::static_set_a8sio_slot(device_t &device, const char *tag, const char *slottag) { a8sio_slot_device &a8sio_ext = dynamic_cast(device); a8sio_ext.m_a8sio_tag = tag; @@ -98,7 +98,7 @@ const device_type A8SIO = &device_creator; // a8sio_device - constructor //------------------------------------------------- -a8sio_device::a8sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +a8sio_device::a8sio_device(const machine_config &mconfig, const char *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, std::string tag, devic { } -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) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , m_out_clock_in_cb(*this) , m_out_data_in_cb(*this) @@ -182,6 +182,7 @@ 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) { } @@ -194,7 +195,7 @@ device_a8sio_card_interface::~device_a8sio_card_interface() { } -void device_a8sio_card_interface::static_set_a8sio_tag(device_t &device, std::string tag, std::string slottag) +void device_a8sio_card_interface::static_set_a8sio_tag(device_t &device, const char *tag, const char *slottag) { device_a8sio_card_interface &a8sio_card = dynamic_cast(device); a8sio_card.m_a8sio_tag = tag; diff --git a/src/devices/bus/a800/a8sio.h b/src/devices/bus/a800/a8sio.h index 60a54d53cf0..0a06c0c93b8 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, 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); + 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); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_a8sio_slot(device_t &device, std::string tag, std::string slottag); + static void static_set_a8sio_slot(device_t &device, const char *tag, const char *slottag); protected: // configuration - std::string m_a8sio_tag; - std::string m_a8sio_slottag; + const char *m_a8sio_tag; + const char *m_a8sio_slottag; }; @@ -80,8 +80,8 @@ class a8sio_device : public device_t { public: // construction/destruction - 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); + 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); // inline configuration template static devcb_base &set_clock_in_callback(device_t &device, _Object object) { return downcast(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, std::string tag, std::string slottag); + static void static_set_a8sio_tag(device_t &device, const char *tag, const char *slottag); virtual DECLARE_WRITE_LINE_MEMBER( motor_w ); public: a8sio_device *m_a8sio; - std::string m_a8sio_tag; - std::string m_a8sio_slottag; + const char *m_a8sio_tag; + const char *m_a8sio_slottag; }; diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp index 15e273c7096..3a6406d44a1 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, std::string tag, device_t *owner, UINT32 clock) +a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, const char *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, std: { } -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) +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) : 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 94b63b0894f..d3bb24bbc4f 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, 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); + 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); // 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 3671352cc34..5cdc7e72126 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; const device_type A800_ROM_OSS91 = &device_creator; -a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a800_rom_oss34_device::a800_rom_oss34_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a800_rom_oss43_device::a800_rom_oss43_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a800_rom_oss91_device::a800_rom_oss91_device(const machine_config &mconfig, const char *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 2eee7810b9e..20524eedd64 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, std::string tag, device_t *owner, UINT32 clock); + a800_rom_oss8k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a800_rom_oss34_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a800_rom_oss43_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a800_rom_oss91_device(const machine_config &mconfig, const char *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 4fdae4c4b7b..1a21ab92039 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; const device_type A5200_ROM_BBSB = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +a800_rom_device::a800_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a800_rom_bbsb_device::a800_rom_bbsb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +xegs_rom_device::xegs_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a800_rom_williams_device::a800_rom_williams_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a800_rom_express_device::a800_rom_express_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a800_rom_turbo_device::a800_rom_turbo_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a800_rom_telelink2_device::a800_rom_telelink2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a800_rom_microcalc_device::a800_rom_microcalc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a5200_rom_2chips_device::a5200_rom_2chips_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a5200_rom_bbsb_device::a5200_rom_bbsb_device(const machine_config &mconfig, const char *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 03ed54272ab..f02b5be43ef 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + a800_rom_bbsb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a800_rom_williams_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a800_rom_express_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a800_rom_blizzard_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a800_rom_turbo_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a800_rom_telelink2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a800_rom_microcalc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + xegs_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a5200_rom_2chips_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a5200_rom_bbsb_device(const machine_config &mconfig, const char *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 c5981e225ae..44204cd7fa7 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +a800_rom_spartados_device::a800_rom_spartados_device(const machine_config &mconfig, const char *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 586d1c7f7b1..5588cb464fd 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, std::string tag, device_t *owner, UINT32 clock); + a800_rom_spartados_device(const machine_config &mconfig, const char *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 34fa28a8de4..dc2b88106ae 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_abcbus_card_interface(mconfig, *this) { } -abc890_t::abc890_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +abc890_t::abc890_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +abc_expansion_unit_t::abc_expansion_unit_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +abc894_t::abc894_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +abc850_t::abc850_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +abc852_t::abc852_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +abc856_t::abc856_t(const machine_config &mconfig, const char *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 aefebfe0249..0cedef00e45 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + abc_expansion_unit_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + abc894_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + abc850_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + abc852_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + abc856_t(const machine_config &mconfig, const char *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 5ef954a49e5..4bec92bc417 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, std::string tag, device_t *owner, UINT32 clock) : +abcbus_slot_t::abcbus_slot_t(const machine_config &mconfig, const char *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 e676078db25..24ecb23b7ff 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, std::string tag, device_t *owner, UINT32 clock); + abcbus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template void set_irq_callback(_irq irq) { m_write_irq.set_callback(irq); } template 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 c84c857689c..6a7c4cc5f4d 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, std::string tag, device_t *owner, UINT32 clock) : +abc_fd2_t::abc_fd2_t(const machine_config &mconfig, const char *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 b3c53467cea..752c97d818b 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, std::string tag, device_t *owner, UINT32 clock); + abc_fd2_t(const machine_config &mconfig, const char *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 0d0e0d29c08..7450f60819e 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, std::string tag, device_t *owner, UINT32 clock) +abc_hdc_device::abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC_HDC, "ABC HDC", tag, owner, clock, "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 53a67561a03..565a3302a88 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, std::string tag, device_t *owner, UINT32 clock); + abc_hdc_device(const machine_config &mconfig, const char *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 9efd8f38041..32bc5e619bc 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, std::string tag, device_t *owner, UINT32 clock) +luxor_55_10828_device::luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, LUXOR_55_10828, "Luxor 55 10828", tag, owner, clock, "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 e04f9caf51a..1d48f042013 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, std::string tag, device_t *owner, UINT32 clock); + luxor_55_10828_device(const machine_config &mconfig, const char *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 b7245a93b6f..733aee9538e 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, std::string tag, device_t *owner, UINT32 clock) +luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, LUXOR_55_21046, "Luxor 55 21046", tag, owner, clock, "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, std: { } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +abc830_device::abc830_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +abc832_device::abc832_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +abc834_device::abc834_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +abc838_device::abc838_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +abc850_floppy_device::abc850_floppy_device(const machine_config &mconfig, const char *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 b1916bf5e62..da6a5ef5c66 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + abc830_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + abc832_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + abc834_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + abc838_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + abc850_floppy_device(const machine_config &mconfig, const char *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 537a33eabf2..f506c1b8e01 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, std::string tag, device_t *owner, UINT32 clock) +luxor_55_21056_device::luxor_55_21056_device(const machine_config &mconfig, const char *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 5263ec87443..c5fde193476 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, std::string tag, device_t *owner, UINT32 clock); + luxor_55_21056_device(const machine_config &mconfig, const char *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 3b60d9306d0..3f5c5ea76f5 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, std::string tag, device_t *owner, UINT32 clock) : +luxor_4105_device::luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, LUXOR_4105, "Luxor 4105", tag, owner, clock, "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 71925983463..b1c2731db8d 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, std::string tag, device_t *owner, UINT32 clock); + luxor_4105_device(const machine_config &mconfig, const char *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 92756bb837d..c7fbd2f3f31 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, std::string tag, device_t *owner, UINT32 clock) : +abc_memory_card_t::abc_memory_card_t(const machine_config &mconfig, const char *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 eab6ac18d68..7fb79f435fe 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, std::string tag, device_t *owner, UINT32 clock); + abc_memory_card_t(const machine_config &mconfig, const char *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 0d702bcd0ec..a91e29bd9c7 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 - constructor //------------------------------------------------- -abc80_16kb_ram_card_t::abc80_16kb_ram_card_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +abc80_16kb_ram_card_t::abc80_16kb_ram_card_t(const machine_config &mconfig, const char *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 ec6eb42529c..1be225d3008 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, std::string tag, device_t *owner, UINT32 clock); + abc80_16kb_ram_card_t(const machine_config &mconfig, const char *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 0cda86586a0..fe4d93ac2e7 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, std::string tag, device_t *owner, UINT32 clock) +abc_sio_device::abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC_SIO, "ABC SIO", tag, owner, clock, "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 ef44545bd88..e76b4ad07a4 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, std::string tag, device_t *owner, UINT32 clock); + abc_sio_device(const machine_config &mconfig, const char *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 b7f04ffbffd..bd1184c15c5 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, std::string tag, device_t *owner, UINT32 clock) +abc_slutprov_device::abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC_SLUTPROV, "Slutprov", tag, owner, clock, "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 e8b533eb44f..f5b7cf661fb 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, std::string tag, device_t *owner, UINT32 clock); + abc_slutprov_device(const machine_config &mconfig, const char *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 78ffcea8096..449f4697a48 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, std::string tag, device_t *owner, UINT32 clock) +turbo_kontroller_device::turbo_kontroller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TURBO_KONTROLLER, "Turbo-Kontroller", tag, owner, clock, "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 dda38cd6f00..b4678c4b14c 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, std::string tag, device_t *owner, UINT32 clock); + turbo_kontroller_device(const machine_config &mconfig, const char *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 1a95eecaa4d..9d22dc0a6cd 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, std::string tag, device_t *owner, UINT32 clock) +abc_uni800_device::abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC_UNI800, "UNI-800", tag, owner, clock, "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 94d57681324..be1d9086c4e 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, std::string tag, device_t *owner, UINT32 clock); + abc_uni800_device(const machine_config &mconfig, const char *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 ff11b75977b..ecf70d0864b 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, std::string tag, device_t *owner, UINT32 clock) : +abc77_device::abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC77, "Luxor ABC 77", tag, owner, clock, "abc77", __FILE__), abc_keyboard_interface(mconfig, *this), m_maincpu(*this, I8035_TAG), @@ -446,7 +446,7 @@ abc77_device::abc77_device(const machine_config &mconfig, std::string tag, devic { } -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) : +abc77_device::abc77_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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, std::string tag, device_t *owner, UINT32 clock) : +abc55_device::abc55_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : abc77_device(mconfig, ABC55, "Luxor ABC 55", tag, owner, clock, "abc55", __FILE__) { } diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h index 6283989fe3c..340dd86f8c6 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, 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); + abc77_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides 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, std::string tag, device_t *owner, UINT32 clock); + abc55_device(const machine_config &mconfig, const char *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 deae6c27c3a..511b1fe7c91 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, std::string tag, device_t *owner, UINT32 clock) +abc800_keyboard_device::abc800_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC800_KEYBOARD, "ABC-800 Keyboard", tag, owner, clock, "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 6f0872415e7..61e55826d54 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, std::string tag, device_t *owner, UINT32 clock); + abc800_keyboard_device(const machine_config &mconfig, const char *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 e03b68fd62a..8dc4d9e75c7 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, std::string tag, device_t *owner, UINT32 clock) : +abc99_device::abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC99, "Luxor ABC 99", tag, owner, clock, "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 aef36067156..5ca05436a0b 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, std::string tag, device_t *owner, UINT32 clock); + abc99_device(const machine_config &mconfig, const char *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 78398af3d3e..6eeab0fdc67 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, std::string tag, device_t *owner, UINT32 clock) : +abc_keyboard_port_device::abc_keyboard_port_device(const machine_config &mconfig, const char *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 96d9efb5327..513350acc53 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, std::string tag, device_t *owner, UINT32 clock); + abc_keyboard_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_rx_handler(device_t &device, _Object object) { return downcast(device).m_out_rx_handler.set_callback(object); } template static devcb_base &set_out_trxc_handler(device_t &device, _Object object) { return downcast(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 8c6ee5d283a..1ae12b1156f 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 - constructor //------------------------------------------------- -adamlink_device::adamlink_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +adamlink_device::adamlink_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAMLINK, "AdamLink modem", tag, owner, clock, "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 c3fa0ea1761..25818966ef6 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, std::string tag, device_t *owner, UINT32 clock); + adamlink_device(const machine_config &mconfig, const char *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 47e8f8ca385..3c43a400ff0 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, std::string tag, device_t *owner, UINT32 clock) : +adam_expansion_slot_device::adam_expansion_slot_device(const machine_config &mconfig, const char *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 51847b7d499..bd764c667c9 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, std::string tag, device_t *owner, UINT32 clock); + adam_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~adam_expansion_slot_device() { } template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp index 490c01493ff..54d4240f7db 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, std::string tag, device_t *owner, UINT32 clock) +powermate_ide_device::powermate_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_IDE, "Powermate HP IDE", tag, owner, clock, "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 91eaa71842a..f26f42a3c1d 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, std::string tag, device_t *owner, UINT32 clock); + powermate_ide_device(const machine_config &mconfig, const char *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 0278f38fe93..6852de8959a 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 - constructor //------------------------------------------------- -adam_ram_expansion_device::adam_ram_expansion_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +adam_ram_expansion_device::adam_ram_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_RAM, "Adam 64KB RAM expansion", tag, owner, clock, "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 49e2e34a31c..5fabdd7e602 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, std::string tag, device_t *owner, UINT32 clock); + adam_ram_expansion_device(const machine_config &mconfig, const char *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 b17ebc8a551..487ce1b22d9 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, std::string tag, device_t *owner, UINT32 clock) : +adamnet_slot_device::adamnet_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +adamnet_device::adamnet_device(const machine_config &mconfig, const char *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 (entry->m_device->tag() == device->tag()) + if (!strcmp(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 5f8b0d800b7..5ce906d270d 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, std::string tag, device_t *owner, UINT32 clock); + adamnet_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + adamnet_slot_device(const machine_config &mconfig, const char *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 fa37cfdb7c8..2a2f674d0c3 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, std::string tag, device_t *owner, UINT32 clock) +adam_digital_data_pack_device::adam_digital_data_pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_DDP, "Adam DDP", tag, owner, clock, "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 e514a546bf5..1a2a2402d03 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, std::string tag, device_t *owner, UINT32 clock); + adam_digital_data_pack_device(const machine_config &mconfig, const char *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 731c61b40bf..e83ac70766d 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, std::string tag, device_t *owner, UINT32 clock) +adam_fdc_device::adam_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_FDC, "Adam FDC", tag, owner, clock, "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 72230d4e011..a8cd3d17648 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, std::string tag, device_t *owner, UINT32 clock); + adam_fdc_device(const machine_config &mconfig, const char *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 0499dbc3450..a9cc31b8edf 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, std::string tag, device_t *owner, UINT32 clock) +adam_keyboard_device::adam_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_KB, "Adam keyboard", tag, owner, clock, "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 8c392ab0364..a9cb98450dd 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, std::string tag, device_t *owner, UINT32 clock); + adam_keyboard_device(const machine_config &mconfig, const char *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 fc302d397df..7de2db87b2e 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, std::string tag, device_t *owner, UINT32 clock) +adam_printer_device::adam_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_PRN, "Adam printer", tag, owner, clock, "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 e671dce4a2c..13025fe5393 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, std::string tag, device_t *owner, UINT32 clock); + adam_printer_device(const machine_config &mconfig, const char *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 ee1afeee648..29da38c0b7b 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, std::string tag, device_t *owner, UINT32 clock) +adam_spi_device::adam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ADAM_SPI, "Adam SPI", tag, owner, clock, "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 7341a3dbbd2..81abae409e3 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, std::string tag, device_t *owner, UINT32 clock); + adam_spi_device(const machine_config &mconfig, const char *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 bd1849061c0..dc2727d2117 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, std::string tag, device_t *owner, UINT32 clock) : +a2052_device::a2052_device(const machine_config &mconfig, const char *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 d107d43690c..0c06bac9395 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, std::string tag, device_t *owner, UINT32 clock); + a2052_device(const machine_config &mconfig, const char *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 50368699611..4cf44853c46 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, std::string tag, device_t *owner, UINT32 clock) : +a2232_device::a2232_device(const machine_config &mconfig, const char *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 e6d69df130b..2611d243bdb 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, std::string tag, device_t *owner, UINT32 clock); + a2232_device(const machine_config &mconfig, const char *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 376e8cd2879..1d66ba99f6e 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, std::string tag, +dmac_hdc_device::dmac_hdc_device(const machine_config &mconfig, device_type type, const char *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, std::string tag, device_t *owner, UINT32 clock) : +a590_device::a590_device(const machine_config &mconfig, const char *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, std::string tag, device_ { } -a2091_device::a2091_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +a2091_device::a2091_device(const machine_config &mconfig, const char *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 f787d51f260..488585fd0cb 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, std::string tag, + dmac_hdc_device(const machine_config &mconfig, device_type type, const char *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, std::string tag, device_t *owner, UINT32 clock); + a590_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a2091_device(const machine_config &mconfig, const char *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 510ad153466..03711e56f1c 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, std::string tag, +action_replay_device::action_replay_device(const machine_config &mconfig, device_type type, const char *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, std::string tag, device_t *owner, UINT32 clock) : +action_replay_mk1_device::action_replay_mk1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +action_replay_mk2_device::action_replay_mk2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +action_replay_mk3_device::action_replay_mk3_device(const machine_config &mconfig, const char *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 f9f50173e3a..7e1eb942796 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, std::string tag, + action_replay_device(const machine_config &mconfig, device_type type, const char *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, std::string tag, device_t *owner, UINT32 clock); + action_replay_mk1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + action_replay_mk2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + action_replay_mk3_device(const machine_config &mconfig, const char *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 45ca9968307..6f21e86d9be 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, std::string tag, device_t *owner, UINT32 clock) : +buddha_device::buddha_device(const machine_config &mconfig, const char *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 171cf6ef2d9..f8e213db69d 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, std::string tag, device_t *owner, UINT32 clock); + buddha_device(const machine_config &mconfig, const char *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 b5a8e2768c9..72f4eaed43d 100644 --- a/src/devices/bus/amiga/zorro/zorro.cpp +++ b/src/devices/bus/amiga/zorro/zorro.cpp @@ -21,20 +21,22 @@ const device_type ZORRO_SLOT = &device_creator; // zorro_slot_device - constructor //------------------------------------------------- -zorro_slot_device::zorro_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +zorro_slot_device::zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ZORRO_SLOT, "Zorro slot", tag, owner, clock, "zorro_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_zorro_tag(nullptr) { } zorro_slot_device::zorro_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) : + const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_zorro_tag(nullptr) { } -void zorro_slot_device::set_zorro_slot(device_t &device, device_t *owner, std::string zorro_tag) +void zorro_slot_device::set_zorro_slot(device_t &device, device_t *owner, const char *zorro_tag) { zorro_slot_device &zorro_card = dynamic_cast(device); zorro_card.m_owner = owner; @@ -66,9 +68,10 @@ void zorro_slot_device::device_start() //------------------------------------------------- zorro_device::zorro_device(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 char *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) @@ -79,7 +82,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, std::string tag) +void zorro_device::set_cputag(device_t &device, const char *tag) { zorro_device &zorro = downcast(device); zorro.m_cputag = tag; @@ -117,7 +120,7 @@ const device_type EXP_SLOT = &device_creator; // exp_slot_device - constructor //------------------------------------------------- -exp_slot_device::exp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +exp_slot_device::exp_slot_device(const machine_config &mconfig, const char *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) @@ -125,7 +128,7 @@ exp_slot_device::exp_slot_device(const machine_config &mconfig, std::string tag, } exp_slot_device::exp_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) : + const char *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) @@ -183,7 +186,7 @@ const device_type ZORRO2 = &device_creator; // zorro2_device - constructor //------------------------------------------------- -zorro2_device::zorro2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +zorro2_device::zorro2_device(const machine_config &mconfig, const char *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), @@ -194,7 +197,7 @@ zorro2_device::zorro2_device(const machine_config &mconfig, std::string tag, dev } zorro2_device::zorro2_device(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 char *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 ad52934f200..fb14b7f09ca 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, std::string tag, device_t *owner, UINT32 clock); + zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); zorro_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); + const char *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, std::string zorro_tag); + static void set_zorro_slot(device_t &device, device_t *owner, const char *zorro_tag); protected: // configuration - std::string m_zorro_tag; + const char *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, - std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // static configuration helpers - static void set_cputag(device_t &device, std::string tag); + static void set_cputag(device_t &device, const char *tag); template static devcb_base &set_int2_handler(device_t &device, _Object object) { return downcast(device).m_int2_handler.set_callback(object); } @@ -285,7 +285,7 @@ protected: virtual void device_start() override; private: - std::string m_cputag; + const char *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, std::string tag, device_t *owner, UINT32 clock); + exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); exp_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); + const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template static devcb_base &set_ipl_handler(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + zorro2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); zorro2_device(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 char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~zorro2_device(); template 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 c4f89d584dd..9eb83e4f12c 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; const device_type APF_ROM_SPACEDST = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +apf_rom_device::apf_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +apf_basic_device::apf_basic_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +apf_spacedst_device::apf_spacedst_device(const machine_config &mconfig, const char *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 54706a528a5..d7c3b748014 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + apf_basic_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + apf_spacedst_device(const machine_config &mconfig, const char *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 20e1cc287ed..eb2e17d9f80 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, std::string tag) +void device_apf_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +apf_cart_slot_device::apf_cart_slot_device(const machine_config &mconfig, const char *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 5266b2d17ab..e8260ab55bc 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + apf_cart_slot_device(const machine_config &mconfig, const char *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 bca4c71705c..5dd7eb5ae58 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(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, std::string tag) +void apricot_expansion_bus_device::set_iop_tag(device_t &device, device_t *owner, const char *tag) { apricot_expansion_bus_device &bus = dynamic_cast(device); bus.m_iop_tag = tag; diff --git a/src/devices/bus/apricot/expansion.h b/src/devices/bus/apricot/expansion.h index 94a5f4f8fbd..fc581f50fb4 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, std::string tag, device_t *owner, UINT32 clock); + apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); apricot_expansion_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); + const char *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, std::string tag, device_t *owner, UINT32 clock); + apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~apricot_expansion_bus_device(); template static devcb_base &set_dma1_handler(device_t &device, _Object object) @@ -137,8 +137,8 @@ public: { return downcast(device).m_int3_handler.set_callback(object); } // inline configuration - 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); + 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); void add_card(device_apricot_expansion_card_interface *card); @@ -174,8 +174,8 @@ private: devcb_write_line m_int3_handler; // configuration - std::string m_cpu_tag; - std::string m_iop_tag; + const char *m_cpu_tag; + const char *m_iop_tag; }; // device type definition diff --git a/src/devices/bus/apricot/ram.cpp b/src/devices/bus/apricot/ram.cpp index f72356e3a99..2221ae37227 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, std::string tag, device_t *owner, UINT32 clock) : +apricot_256k_ram_device::apricot_256k_ram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +apricot_128k_ram_device::apricot_128k_ram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +apricot_512k_ram_device::apricot_512k_ram_device(const machine_config &mconfig, const char *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 0f7eefd7e99..c2b2f771953 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, std::string tag, device_t *owner, UINT32 clock); + apricot_256k_ram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + apricot_128k_ram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + apricot_512k_ram_device(const machine_config &mconfig, const char *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 d1734061b56..5a6186aa8de 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; const device_type ARCADIA_ROM_GOLF = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +arcadia_golf_device::arcadia_golf_device(const machine_config &mconfig, const char *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 57b51cb7baf..3e1c55e60c0 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + arcadia_golf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/arcadia/slot.cpp b/src/devices/bus/arcadia/slot.cpp index 760b899bc38..3a6aee846ab 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, std::string tag) +void device_arcadia_cart_interface::rom_alloc(UINT32 size, const char *tag) { if (m_rom == nullptr) { @@ -62,7 +62,7 @@ void device_arcadia_cart_interface::rom_alloc(UINT32 size, std::string tag) //------------------------------------------------- // arcadia_cart_slot_device - constructor //------------------------------------------------- -arcadia_cart_slot_device::arcadia_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +arcadia_cart_slot_device::arcadia_cart_slot_device(const machine_config &mconfig, const char *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 1bbf8467f23..e018b40595d 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + arcadia_cart_slot_device(const machine_config &mconfig, const char *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 5c81eb6b4ef..2d6e7eb51b3 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, std::string tag, device_t *owner, UINT32 clock) : +astrocade_exp_device::astrocade_exp_device(const machine_config &mconfig, const char *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 31326a2db29..b2d6e3643ea 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, std::string tag, device_t *owner, UINT32 clock); + astrocade_exp_device(const machine_config &mconfig, const char *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 c63a13af887..95ebb6816aa 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_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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +astrocade_blueram_16k_device::astrocade_blueram_16k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +astrocade_blueram_32k_device::astrocade_blueram_32k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +astrocade_viper_sys1_device::astrocade_viper_sys1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +astrocade_whiteram_device::astrocade_whiteram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +astrocade_rl64ram_device::astrocade_rl64ram_device(const machine_config &mconfig, const char *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 b279056b9cb..673e7bef8d9 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + astrocade_blueram_16k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + astrocade_blueram_32k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + astrocade_viper_sys1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + astrocade_whiteram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + astrocade_rl64ram_device(const machine_config &mconfig, const char *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 31a9bc0934f..201a4d1afe6 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_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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +astrocade_rom_256k_device::astrocade_rom_256k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +astrocade_rom_512k_device::astrocade_rom_512k_device(const machine_config &mconfig, const char *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 531e10bbbb2..28fcb0d43bb 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + astrocade_rom_256k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + astrocade_rom_512k_device(const machine_config &mconfig, const char *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 0faaf550865..8ae7bbe8c15 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, std::string tag) +void device_astrocade_cart_interface::rom_alloc(UINT32 size, const char *tag) { if (m_rom == nullptr) { @@ -62,7 +62,7 @@ void device_astrocade_cart_interface::rom_alloc(UINT32 size, std::string tag) //------------------------------------------------- // astrocade_cart_slot_device - constructor //------------------------------------------------- -astrocade_cart_slot_device::astrocade_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +astrocade_cart_slot_device::astrocade_cart_slot_device(const machine_config &mconfig, const char *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 2a22a3a64a0..1a28ccf4b96 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + astrocade_cart_slot_device(const machine_config &mconfig, const char *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 d28e7f49ca8..0438cc58997 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 - constructor //------------------------------------------------- -bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, const char *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) + device_slot_interface(mconfig, *this), m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr) { } -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) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr) { } -void bml3bus_slot_device::static_set_bml3bus_slot(device_t &device, std::string tag, std::string slottag) +void bml3bus_slot_device::static_set_bml3bus_slot(device_t &device, const char *tag, const char *slottag) { bml3bus_slot_device &bml3bus_card = dynamic_cast(device); bml3bus_card.m_bml3bus_tag = tag; @@ -96,7 +96,7 @@ void bml3bus_slot_device::device_start() const device_type BML3BUS = &device_creator; -void bml3bus_device::static_set_cputag(device_t &device, std::string tag) +void bml3bus_device::static_set_cputag(device_t &device, const char *tag) { bml3bus_device &bml3bus = downcast(device); bml3bus.m_cputag = tag; @@ -110,19 +110,19 @@ void bml3bus_device::static_set_cputag(device_t &device, std::string tag) // bml3bus_device - constructor //------------------------------------------------- -bml3bus_device::bml3bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +bml3bus_device::bml3bus_device(const machine_config &mconfig, const char *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_out_firq_cb(*this), m_cputag(nullptr) { } -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) : +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) : 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_out_firq_cb(*this), m_cputag(nullptr) { } //------------------------------------------------- @@ -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_slot(0), m_next(nullptr) + m_bml3bus_tag(nullptr), m_bml3bus_slottag(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, std::string tag, std::string slottag) +void device_bml3bus_card_interface::static_set_bml3bus_tag(device_t &device, const char *tag, const char *slottag) { device_bml3bus_card_interface &bml3bus_card = dynamic_cast(device); bml3bus_card.m_bml3bus_tag = tag; @@ -227,7 +227,7 @@ void device_bml3bus_card_interface::static_set_bml3bus_tag(device_t &device, std 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.c_str()); + int tlen = strlen(m_bml3bus_slottag); 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 a7c9b82d63a..36c20f4159e 100644 --- a/src/devices/bus/bml3/bml3bus.h +++ b/src/devices/bus/bml3/bml3bus.h @@ -56,18 +56,17 @@ class bml3bus_slot_device : public device_t, { public: // construction/destruction - 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); + 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); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_bml3bus_slot(device_t &device, std::string tag, std::string slottag); + static void static_set_bml3bus_slot(device_t &device, const char *tag, const char *slottag); protected: // configuration - std::string m_bml3bus_tag; - std::string m_bml3bus_slottag; + const char *m_bml3bus_tag, *m_bml3bus_slottag; }; // device type definition @@ -80,11 +79,11 @@ class bml3bus_device : public device_t { public: // construction/destruction - 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); + 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); // inline configuration - static void static_set_cputag(device_t &device, std::string tag); + static void static_set_cputag(device_t &device, const char *tag); template static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast(device).m_out_nmi_cb.set_callback(object); } template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(device).m_out_irq_cb.set_callback(object); } template static devcb_base &set_out_firq_callback(device_t &device, _Object object) { return downcast(device).m_out_firq_cb.set_callback(object); } @@ -113,7 +112,7 @@ protected: devcb_write_line m_out_firq_cb; device_bml3bus_card_interface *m_device_list[BML3BUS_MAX_SLOTS]; - std::string m_cputag; + const char *m_cputag; }; @@ -143,11 +142,10 @@ public: void lower_slot_firq() { m_bml3bus->set_firq_line(CLEAR_LINE); } // inline configuration - static void static_set_bml3bus_tag(device_t &device, std::string tag, std::string slottag); + static void static_set_bml3bus_tag(device_t &device, const char *tag, const char *slottag); public: bml3bus_device *m_bml3bus; - std::string m_bml3bus_tag; - std::string m_bml3bus_slottag; + const char *m_bml3bus_tag, *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 105fac45a7f..0b0d4f519e2 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, std::string tag, device_t *owner, UINT32 clock) : +bml3bus_kanji_device::bml3bus_kanji_device(const machine_config &mconfig, const char *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 443b04cff36..8a1c8dd24df 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, std::string tag, device_t *owner, UINT32 clock); + bml3bus_kanji_device(const machine_config &mconfig, const char *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 9435c1499aa..911d72c725e 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, std::string tag, device_t *owner, UINT32 clock) : +bml3bus_mp1802_device::bml3bus_mp1802_device(const machine_config &mconfig, const char *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 75dcddf1747..de42c95261a 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, std::string tag, device_t *owner, UINT32 clock); + bml3bus_mp1802_device(const machine_config &mconfig, const char *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 3622e65a1cd..e1b2317b7c6 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, std::string tag, device_t *owner, UINT32 clock) : +bml3bus_mp1805_device::bml3bus_mp1805_device(const machine_config &mconfig, const char *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 0f79aa21eda..57ffdfefcaa 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, std::string tag, device_t *owner, UINT32 clock); + bml3bus_mp1805_device(const machine_config &mconfig, const char *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 63de9efa15f..c79e85fa90a 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, std::string tag, device_t *owner, UINT32 clock) : +bw2_expansion_slot_device::bw2_expansion_slot_device(const machine_config &mconfig, const char *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 4e05e8362e6..b9d4fbcc0d8 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, std::string tag, device_t *owner, UINT32 clock); + bw2_expansion_slot_device(const machine_config &mconfig, const char *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 7cc916768be..16f5da689cc 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, std::string tag, device_t *owner, UINT32 clock) +bw2_ramcard_device::bw2_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BW2_RAMCARD, "RAMCARD", tag, owner, clock, "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 ec4975f9674..da66c4d670d 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, std::string tag, device_t *owner, UINT32 clock); + bw2_ramcard_device(const machine_config &mconfig, const char *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 bfe8c19c6b1..2964073aa1a 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, std::string tag, device_t *owner, UINT32 clock) : +c64_16kb_cartridge_device::c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_16KB, "C64 16KB EPROM cartridge", tag, owner, clock, "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 78a07d07e20..fd4b7a50fcb 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, std::string tag, device_t *owner, UINT32 clock); + c64_16kb_cartridge_device(const machine_config &mconfig, const char *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 fd36ad3dd9e..2dd54543203 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, std::string tag, device_t *owner, UINT32 clock) : +c64_4dxh_device::c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_4DXH, "C64 DXH 4-Player Adapter", tag, owner, clock, "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 f1133ab4df2..a8a0a684fe5 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, std::string tag, device_t *owner, UINT32 clock); + c64_4dxh_device(const machine_config &mconfig, const char *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 2002b98b14b..749053fde32 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, std::string tag, device_t *owner, UINT32 clock) : +c64_4ksa_device::c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_4KSA, "C64 Kingsoft 4-Player Adapter", tag, owner, clock, "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 311917056a7..bbb61e0bf73 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, std::string tag, device_t *owner, UINT32 clock); + c64_4ksa_device(const machine_config &mconfig, const char *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 d93911e0928..56266f5d916 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, std::string tag, device_t *owner, UINT32 clock) : +c64_4tba_device::c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_4TBA, "C64 Tie Break Adapter", tag, owner, clock, "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 8b467ecc7ca..c7505d0d49a 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, std::string tag, device_t *owner, UINT32 clock); + c64_4tba_device(const machine_config &mconfig, const char *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 1be704eafb1..d93e629aaa7 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, std::string tag, device_t *owner, UINT32 clock) : +c64_bn1541_device::c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_BN1541, "C64 Burst Nibbler 1541/1571 Parallel Cable", tag, owner, clock, "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().c_str()); + if (LOG) logerror("Parallel device %s\n", subdevice->tag()); // 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 6c906beca80..a3f0a1834b6 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, std::string tag, device_t *owner, UINT32 clock); + c64_bn1541_device(const machine_config &mconfig, const char *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 56b900183ea..25accd52fa0 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 - constructor //------------------------------------------------- -c128_comal80_cartridge_device::c128_comal80_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c128_comal80_cartridge_device::c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C128_COMAL80, "C128 COMAL 80 cartridge", tag, owner, clock, "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 59c65fab5da..e403cd8b10f 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, std::string tag, device_t *owner, UINT32 clock); + c128_comal80_cartridge_device(const machine_config &mconfig, const char *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 fe61c4b9ffa..fe751585099 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, std::string tag, device_t *owner, UINT32 clock) : +partner128_t::partner128_t(const machine_config &mconfig, const char *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 37a91031a9c..1ba872ca121 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, std::string tag, device_t *owner, UINT32 clock); + partner128_t(const machine_config &mconfig, const char *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 34e76c3785a..b72c9182b7c 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 - constructor //------------------------------------------------- -c64_comal80_cartridge_device::c64_comal80_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_comal80_cartridge_device::c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_COMAL80, "C64 COMAL 80 cartridge", tag, owner, clock, "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 f7d0a630e6c..b77adf1a8bd 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, std::string tag, device_t *owner, UINT32 clock); + c64_comal80_cartridge_device(const machine_config &mconfig, const char *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 b45b87d8fed..33659b4e977 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, std::string tag, device_t *owner, UINT32 clock) : +c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_CPM, "C64 CP/M cartridge", tag, owner, clock, "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 e1914a49986..1e10bc810ce 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, std::string tag, device_t *owner, UINT32 clock); + c64_cpm_cartridge_device(const machine_config &mconfig, const char *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 01b7fa270f1..8e73f0801f1 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, std::string tag, device_t *owner, UINT32 clock) : +c64_currah_speech_cartridge_device::c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_CURRAH_SPEECH, "C64 Currah Speech", tag, owner, clock, "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 4913c19b582..1ca31571bbd 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, std::string tag, device_t *owner, UINT32 clock); + c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *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 301e8945f00..f4c86f20db5 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, std::string tag, device_t *owner, UINT32 clock) : +c64_dela_ep256_cartridge_device::c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_DELA_EP256, "C64 Dela 256KB EPROM cartridge", tag, owner, clock, "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 8ed17515807..df5ce8580e5 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, std::string tag, device_t *owner, UINT32 clock); + c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *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 237413cab7c..25aeb844deb 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, std::string tag, device_t *owner, UINT32 clock) : +c64_dela_ep64_cartridge_device::c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_DELA_EP64, "C64 Rex 64KB EPROM cartridge", tag, owner, clock, "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 9347bd1cd7a..db1da8feca0 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, std::string tag, device_t *owner, UINT32 clock); + c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *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 688e40a47d0..dc3a036cb14 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, std::string tag, device_t *owner, UINT32 clock) : +c64_dela_ep7x8_cartridge_device::c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_DELA_EP7X8, "C64 Dela 7x8KB EPROM cartridge", tag, owner, clock, "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 3842dc9efba..904eda891e2 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, std::string tag, device_t *owner, UINT32 clock); + c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *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 d1eec518d24..d52af7ba74e 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 - constructor //------------------------------------------------- -c64_dinamic_cartridge_device::c64_dinamic_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_dinamic_cartridge_device::c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_DINAMIC, "C64 Dinamic cartridge", tag, owner, clock, "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 d02946dd10d..234f14c43eb 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, std::string tag, device_t *owner, UINT32 clock); + c64_dinamic_cartridge_device(const machine_config &mconfig, const char *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 f504847fda7..6e98707587a 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 - constructor //------------------------------------------------- -c64_dqbb_cartridge_device::c64_dqbb_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_dqbb_cartridge_device::c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_DQBB, "C64 Double Quick Brown Box cartridge", tag, owner, clock, "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 a19b8beef5b..f826cf5e165 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, std::string tag, device_t *owner, UINT32 clock); + c64_dqbb_cartridge_device(const machine_config &mconfig, const char *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 97c180b87b9..db7e35b3067 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_exos_cartridge_device - constructor //------------------------------------------------- -c64_exos_cartridge_device::c64_exos_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_exos_cartridge_device::c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_EXOS, "C64 ExOS cartridge", tag, owner, clock, "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 ce0db0da503..7f4785098f4 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, std::string tag, device_t *owner, UINT32 clock); + c64_exos_cartridge_device(const machine_config &mconfig, const char *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 b2513711114..47e2a20cc14 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, std::string tag, device_t *owner, UINT32 clock) : +c64_expansion_slot_device::c64_expansion_slot_device(const machine_config &mconfig, const char *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 ce283e7b0a7..d72a91475be 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, std::string tag, device_t *owner, UINT32 clock); + c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_nmi.set_callback(object); } diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp index 437b0a28c2d..0757ae94e76 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, std::string tag, device_t *owner, UINT32 clock) : +c64_final_chesscard_device::c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_FCC, "Final ChessCard", tag, owner, clock, "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 79c0aa3d335..a2952e34c0f 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, std::string tag, device_t *owner, UINT32 clock); + c64_final_chesscard_device(const machine_config &mconfig, const char *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 6cf7b11ac23..4087201c5cb 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, std::string tag, device_t *owner, UINT32 clock) : +c64_final_cartridge_device::c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_FINAL, "C64 Final cartridge", tag, owner, clock, "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 01aa4fd29bd..cbf7fab0b73 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, std::string tag, device_t *owner, UINT32 clock); + c64_final_cartridge_device(const machine_config &mconfig, const char *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 090213dd980..a72963123ba 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, std::string tag, device_t *owner, UINT32 clock) : +c64_final3_cartridge_device::c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_FINAL3, "C64 Final Cartridge III", tag, owner, clock, "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 ef7aa4c9ac9..42c1e1aa9f8 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, std::string tag, device_t *owner, UINT32 clock); + c64_final3_cartridge_device(const machine_config &mconfig, const char *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 f4a1da22e5b..971521773a7 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 - constructor //------------------------------------------------- -c64_fun_play_cartridge_device::c64_fun_play_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_fun_play_cartridge_device::c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_FUN_PLAY, "C64 Fun Play cartridge", tag, owner, clock, "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 58e77a8481e..8e4e7528eb7 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, std::string tag, device_t *owner, UINT32 clock); + c64_fun_play_cartridge_device(const machine_config &mconfig, const char *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 9b93f3e138b..3b6acc54d2a 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, std::string tag, device_t *owner, UINT32 clock) : +c64_geocable_device::c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_GEOCABLE, "C64 geoCable", tag, owner, clock, "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 dcbbdd666e8..6b823b9a668 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, std::string tag, device_t *owner, UINT32 clock); + c64_geocable_device(const machine_config &mconfig, const char *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 ee66fdde137..ccdcebedc40 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 - constructor //------------------------------------------------- -c64_georam_cartridge_device::c64_georam_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_georam_cartridge_device::c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_GEORAM, "C64 GeoRAM cartridge", tag, owner, clock, "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 9b90267e2fa..bf1a431244d 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, std::string tag, device_t *owner, UINT32 clock); + c64_georam_cartridge_device(const machine_config &mconfig, const char *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 4bbfb8972ff..01def305dd5 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, std::string tag, device_t *owner, UINT32 clock) : +c64_ide64_cartridge_device::c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_IDE64, "C64 IDE64 cartridge", tag, owner, clock, "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 9895ca50adc..cfe6e1cd27f 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, std::string tag, device_t *owner, UINT32 clock); + c64_ide64_cartridge_device(const machine_config &mconfig, const char *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 6b02fef96fc..974c9df0cb5 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, std::string tag, device_t *owner, UINT32 clock) : +c64_ieee488_device::c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_IEEE488, "IEEE-488", tag, owner, clock, "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 dea4499da84..ca11ff7f5dc 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, std::string tag, device_t *owner, UINT32 clock); + c64_ieee488_device(const machine_config &mconfig, const char *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 ca5e22eaac4..2826920320f 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 - constructor //------------------------------------------------- -c64_kingsoft_cartridge_device::c64_kingsoft_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_kingsoft_cartridge_device::c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_KINGSOFT, "C64 Kingsoft cartridge", tag, owner, clock, "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 dec43f4870c..ab9dea5d935 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, std::string tag, device_t *owner, UINT32 clock); + c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *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 45c1e16fe45..b285d35b221 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, std::string tag, device_t *owner, UINT32 clock) : +c64_mach5_cartridge_device::c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_MACH5, "C64 MACH5 cartridge", tag, owner, clock, "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 c5c3f2cb45f..a41114ccffe 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, std::string tag, device_t *owner, UINT32 clock); + c64_mach5_cartridge_device(const machine_config &mconfig, const char *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 2928aedf201..e315b4eeba0 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_neoram_cartridge_device - constructor //------------------------------------------------- -c64_neoram_cartridge_device::c64_neoram_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_neoram_cartridge_device::c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_NEORAM, "C64 NeoRAM cartridge", tag, owner, clock, "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 90bedd9a06e..f9e28d23c0a 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, std::string tag, device_t *owner, UINT32 clock); + c64_neoram_cartridge_device(const machine_config &mconfig, const char *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 c76bc9c40b5..496651a1b25 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 - constructor //------------------------------------------------- -c64_ocean_cartridge_device::c64_ocean_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_ocean_cartridge_device::c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_OCEAN, "C64 Ocean cartridge", tag, owner, clock, "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 8598c53d8b7..49697d758e7 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, std::string tag, device_t *owner, UINT32 clock); + c64_ocean_cartridge_device(const machine_config &mconfig, const char *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 d45c2927726..b6df18e03c1 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 - constructor //------------------------------------------------- -c64_pagefox_cartridge_device::c64_pagefox_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_pagefox_cartridge_device::c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_PAGEFOX, "C64 Pagefox cartridge", tag, owner, clock, "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 fbc0c582cbc..7b68ce54c07 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, std::string tag, device_t *owner, UINT32 clock); + c64_pagefox_cartridge_device(const machine_config &mconfig, const char *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 b8094728da3..4feb8022b08 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, std::string tag, device_t *owner, UINT32 clock) : +c64_partner_cartridge_device::c64_partner_cartridge_device(const machine_config &mconfig, const char *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 05769f499e1..640cb7daab5 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, std::string tag, device_t *owner, UINT32 clock); + c64_partner_cartridge_device(const machine_config &mconfig, const char *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 6b2e52169fd..bd61247eed3 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_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, std::string tag, device_t *owner, UINT32 clock); + c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/c64/rex.cpp b/src/devices/bus/c64/rex.cpp index 5e55e54e345..5a4a0abaf78 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 - constructor //------------------------------------------------- -c64_rex_cartridge_device::c64_rex_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_rex_cartridge_device::c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_REX, "C64 Rex cartridge", tag, owner, clock, "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 58c80ade38b..d5f17dfdd5b 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, std::string tag, device_t *owner, UINT32 clock); + c64_rex_cartridge_device(const machine_config &mconfig, const char *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 17b936e4300..ecb5e3983e4 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, std::string tag, device_t *owner, UINT32 clock) : +c64_rex_ep256_cartridge_device::c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_REX_EP256, "C64 Rex 256KB EPROM cartridge", tag, owner, clock, "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 6bf18ee4e38..abd5f53618b 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, std::string tag, device_t *owner, UINT32 clock); + c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *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 a50a446cced..1a074958aa0 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 - constructor //------------------------------------------------- -c64_ross_cartridge_device::c64_ross_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_ross_cartridge_device::c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_ROSS, "C64 Ross cartridge", tag, owner, clock, "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 feae79caf76..6f88948927b 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, std::string tag, device_t *owner, UINT32 clock); + c64_ross_cartridge_device(const machine_config &mconfig, const char *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 f73b9007246..8c3f7291620 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, std::string tag, device_t *owner, UINT32 clock) : +c64_sfx_sound_expander_cartridge_device::c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SFX_SOUND_EXPANDER, "C64 SFX Sound Expander cartridge", tag, owner, clock, "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 6d0bf440d0d..b51fd23e751 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, std::string tag, device_t *owner, UINT32 clock); + c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *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 f4a05961cc9..4ae1dd4ab75 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_standard_cartridge_device - constructor //------------------------------------------------- -c64_standard_cartridge_device::c64_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_standard_cartridge_device::c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_STD, "C64 standard cartridge", tag, owner, clock, "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 64f05e1faef..16bbdb9f4ff 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, std::string tag, device_t *owner, UINT32 clock); + c64_standard_cartridge_device(const machine_config &mconfig, const char *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 42898aaca35..f299246e118 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_system3_cartridge_device - constructor //------------------------------------------------- -c64_system3_cartridge_device::c64_system3_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_system3_cartridge_device::c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_SYSTEM3, "C64 System 3 cartridge", tag, owner, clock, "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 51f8a2d726b..fef5c100217 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, std::string tag, device_t *owner, UINT32 clock); + c64_system3_cartridge_device(const machine_config &mconfig, const char *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 061cc7a6cdb..9ce8c14f22a 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, std::string tag, device_t *owner, UINT32 clock) : +c64_tdos_cartridge_device::c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_TDOS, "C64 TDOS cartridge", tag, owner, clock, "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 7754f728ba9..42c08cbd1c8 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, std::string tag, device_t *owner, UINT32 clock); + c64_tdos_cartridge_device(const machine_config &mconfig, const char *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 8333d807826..1dd43b2011d 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, std::string tag, device_t *owner, UINT32 clock) : +c64_turbo232_cartridge_device::c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_TURBO232, "C64 Turbo232 cartridge", tag, owner, clock, "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 f59b2fdb684..4f80cec374f 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, std::string tag, device_t *owner, UINT32 clock); + c64_turbo232_cartridge_device(const machine_config &mconfig, const char *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 7e86462817c..d635ffec656 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 - constructor //------------------------------------------------- -c64_vizastar_cartridge_device::c64_vizastar_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_vizastar_cartridge_device::c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_VIZASTAR, "VizaStar 64 XL4", tag, owner, clock, "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 1cf800beb8d..4c24f9705be 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, std::string tag, device_t *owner, UINT32 clock); + c64_vizastar_cartridge_device(const machine_config &mconfig, const char *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 09fc6c0b341..3288e492a43 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 - constructor //------------------------------------------------- -c64_vizawrite_cartridge_device::c64_vizawrite_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_vizawrite_cartridge_device::c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_VW64, "VizaWrite 64", tag, owner, clock, "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 7b51c0362f3..906ca3b0b27 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, std::string tag, device_t *owner, UINT32 clock); + c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *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 5cb79c90352..d625fa5ea7d 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, std::string tag, device_t *owner, UINT32 clock) : +c64_warp_speed_cartridge_device::c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_WARP_SPEED, "C64 Warp Speed cartridge", tag, owner, clock, "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 05ffa39019b..b3eeca48809 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, std::string tag, device_t *owner, UINT32 clock); + c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *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 8b27430453b..6a758428a1f 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_zaxxon_cartridge_device - constructor //------------------------------------------------- -c64_zaxxon_cartridge_device::c64_zaxxon_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64_zaxxon_cartridge_device::c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_ZAXXON, "C64 Zaxxon cartridge", tag, owner, clock, "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 381dff60c41..28b8eecc911 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, std::string tag, device_t *owner, UINT32 clock); + c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *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 51356ef95cd..a31c58a7aaf 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 - constructor //------------------------------------------------- -cbm2_24k_cartridge_device::cbm2_24k_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +cbm2_24k_cartridge_device::cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CBM2_24K, "24K RAM/ROM cartridge", tag, owner, clock, "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 7c4334edfed..6d39d0dd5d5 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, std::string tag, device_t *owner, UINT32 clock); + cbm2_24k_cartridge_device(const machine_config &mconfig, const char *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 7869aef5817..fd4993760c3 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, std::string tag, device_t *owner, UINT32 clock) : +cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mconfig, const char *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 c91349e0e2f..ce5daf10dbb 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, std::string tag, device_t *owner, UINT32 clock); + cbm2_expansion_slot_device(const machine_config &mconfig, const char *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 b2e2a087529..e0e9bf667ba 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) : +cbm2_hrg_a_t::cbm2_hrg_a_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +cbm2_hrg_b_t::cbm2_hrg_b_t(const machine_config &mconfig, const char *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 2562e4c8971..67e0f25ad90 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual const rom_entry *device_rom_region() const 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, std::string tag, device_t *owner, UINT32 clock); + cbm2_hrg_a_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cbm2_hrg_b_t(const machine_config &mconfig, const char *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 0a98dd10450..e6e697927dc 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 - constructor //------------------------------------------------- -cbm2_standard_cartridge_device::cbm2_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +cbm2_standard_cartridge_device::cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CBM2_STD, "CBM-II standard cartridge", tag, owner, clock, "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 553e5d95c0e..1645958e40b 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, std::string tag, device_t *owner, UINT32 clock); + cbm2_standard_cartridge_device(const machine_config &mconfig, const char *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 373736b709d..b6271071a9b 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, std::string tag, device_t *owner, UINT32 clock) : +cbm2_user_port_device::cbm2_user_port_device(const machine_config &mconfig, const char *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 89dda70b95c..58810f02f3f 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, std::string tag, device_t *owner, UINT32 clock); + cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~cbm2_user_port_device() { } template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp index 0ee77d48ce9..da2cf7197c0 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) : +c1526_t::c1526_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner // c4023_t - constructor //------------------------------------------------- -c4023_t::c4023_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c4023_t::c4023_t(const machine_config &mconfig, const char *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 98510b774bf..deba3be2ce7 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + c1526_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + c4023_t(const machine_config &mconfig, const char *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 1c3e48f0929..6e1be701b64 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +c1540_t::c1540_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner // c1541_t - constructor //------------------------------------------------- -c1541_t::c1541_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c1541_t::c1541_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner // c1541c_t - constructor //------------------------------------------------- -c1541c_t::c1541c_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c1541c_t::c1541c_t(const machine_config &mconfig, const char *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, std::string tag, device_t *own // c1541ii_t - constructor //------------------------------------------------- -c1541ii_t::c1541ii_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c1541ii_t::c1541ii_t(const machine_config &mconfig, const char *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, std::string tag, device_t *o // sx1541_t - constructor //------------------------------------------------- -sx1541_t::sx1541_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sx1541_t::sx1541_t(const machine_config &mconfig, const char *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, std::string tag, device_t *own // fsd1_t - constructor //------------------------------------------------- -fsd1_t::fsd1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +fsd1_t::fsd1_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, // fsd2_t - constructor //------------------------------------------------- -fsd2_t::fsd2_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +fsd2_t::fsd2_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, // csd1_t - constructor //------------------------------------------------- -csd1_t::csd1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +csd1_t::csd1_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, // c1541_dolphin_dos_t - constructor //------------------------------------------------- -c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, const char *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, std::str // c1541_professional_dos_v1_t - constructor //------------------------------------------------- -c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +indus_gt_t::indus_gt_t(const machine_config &mconfig, const char *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 19fff953a76..df03b9429af 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -105,7 +105,7 @@ class c1540_t : public c1541_base_t { public: // construction/destruction - c1540_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + c1540_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + c1541_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + c1541c_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + c1541ii_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sx1541_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + fsd1_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + fsd2_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + csd1_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + c1541_dolphin_dos_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + c1541_professional_dos_v1_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + indus_gt_t(const machine_config &mconfig, const char *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 ff907c7a537..976455387ae 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +c1571_t::c1571_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner // c1570_t - constructor //------------------------------------------------- -c1570_t::c1570_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c1570_t::c1570_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner // c1571cr_t - constructor //------------------------------------------------- -c1571cr_t::c1571cr_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c1571cr_t::c1571cr_t(const machine_config &mconfig, const char *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, std::string tag, device_t *o // mini_chief_t - constructor //------------------------------------------------- -mini_chief_t::mini_chief_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mini_chief_t::mini_chief_t(const machine_config &mconfig, const char *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 0a09a24a5fb..cd0da9a3a3d 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + c1570_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + c1571cr_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mini_chief_t(const machine_config &mconfig, const char *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 892e3980ddf..e13317654a2 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +c1581_t::c1581_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner // c1563_t - constructor //------------------------------------------------- -c1563_t::c1563_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c1563_t::c1563_t(const machine_config &mconfig, const char *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 f1a3ac04dae..adcbaf63468 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + c1563_t(const machine_config &mconfig, const char *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 a5258e65e8f..970baa2f941 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, std::string tag, device_t *owner, UINT32 clock) +c64_nl10_interface_device::c64_nl10_interface_device(const machine_config &mconfig, const char *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 8f6a4613b43..143758c98e4 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, std::string tag, device_t *owner, UINT32 clock); + c64_nl10_interface_device(const machine_config &mconfig, const char *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 7bde16f342f..7e893614f3f 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, std::string tag, device_t *owner, UINT32 clock) : +cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cbm_iec_device::cbm_iec_device(const machine_config &mconfig, const char *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().c_str(), SIGNAL_NAME[signal], state); + if (LOG) logerror("CBM IEC: '%s' %s %u\n", tag(), 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 (entry->m_device->tag()==device->tag()) + if (!strcmp(entry->m_device->tag(), device->tag())) { if (entry->m_line[signal] != state) { - if (LOG) logerror("CBM IEC: '%s' %s %u\n", device->tag().c_str(), SIGNAL_NAME[signal], state); + if (LOG) logerror("CBM IEC: '%s' %s %u\n", device->tag(), 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 93a6136bd76..d950a8c19e1 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, std::string tag, device_t *owner, UINT32 clock); + cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template void set_srq_callback(_write wr) { m_write_srq.set_callback(wr); } template 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, std::string tag, device_t *owner, UINT32 clock); + cbm_iec_slot_device(const machine_config &mconfig, const char *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 5ee2b05f7b8..d3025700fa7 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, std::string tag, device_t *owner, UINT32 clock) +cmd_hd_device::cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CMD_HD, "HD", tag, owner, clock, "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 b19af5c3089..2a1a244affe 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, std::string tag, device_t *owner, UINT32 clock); + cmd_hd_device(const machine_config &mconfig, const char *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 232291e9607..d9c2e5ed303 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; -centronics_device::centronics_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +centronics_device::centronics_device(const machine_config &mconfig, const char *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 6631d713466..51f13348051 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, std::string tag, device_t *owner, UINT32 clock); + centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_strobe_handler(device_t &device, _Object object) { return downcast(device).m_strobe_handler.set_callback(object); } template static devcb_base &set_data0_handler(device_t &device, _Object object) { return downcast(device).m_data0_handler.set_callback(object); } diff --git a/src/devices/bus/centronics/digiblst.cpp b/src/devices/bus/centronics/digiblst.cpp index c510d94d7d7..9fdbfd5c279 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, std::string tag, device_t *owner, UINT32 clock) +centronics_digiblaster_device::centronics_digiblaster_device(const machine_config &mconfig, const char *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 f12d0616f4b..cec32eef1e9 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, std::string tag, device_t *owner, UINT32 clock); + centronics_digiblaster_device(const machine_config &mconfig, const char *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 2d6aef97c25..de9b1138ec8 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dempa_shinbunsha_joystick_device::dempa_shinbunsha_joystick_device(const machine_config &mconfig, const char *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 ac9450ae5d8..c23ddf87e11 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, std::string tag, device_t *owner, UINT32 clock); + dempa_shinbunsha_joystick_device(const machine_config &mconfig, const char *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 7e3d8f207e1..c8a1acc54a6 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, std::string tag, device_t *owner, UINT32 clock) : +epson_ex800_t::epson_ex800_t(const machine_config &mconfig, const char *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 bc14909b896..2b28229c0df 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, std::string tag, device_t *owner, UINT32 clock); + epson_ex800_t(const machine_config &mconfig, const char *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 6a6e632bdc0..546c6e9439b 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, std::string tag, device_t *owner, UINT32 clock) : +epson_lx800_t::epson_lx800_t(const machine_config &mconfig, const char *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, std::string tag, dev { } -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) : +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) : 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 044d97a36c3..89e88ceb6d9 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, 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); + 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); // 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 1cfdbc37818..3c599360dd8 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, std::string tag, device_t *owner, UINT32 clock) : +epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, const char *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, std::string tag, d { } -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) +epson_ap2000_t::epson_ap2000_t(const machine_config &mconfig, const char *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 491874e73d3..072f30500bd 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, std::string tag, + epson_lx810l_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); epson_lx810l_t(const machine_config &mconfig, device_type type, - const char *name, std::string tag, device_t *owner, + const char *name, const char *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, std::string tag, + epson_ap2000_t(const machine_config &mconfig, const char *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 2bb400c63fc..8ef53e54513 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, std::string tag, device_t *owner, UINT32 clock) : +nec_p72_t::nec_p72_t(const machine_config &mconfig, const char *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, std::string 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, const char *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 0aac9f9f23d..ef7c67f85f1 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, std::string tag, + nec_p72_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); nec_p72_t(const machine_config &mconfig, device_type type, - const char *name, std::string tag, device_t *owner, + const char *name, const char *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 d8d5943ccfb..50ca485c094 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, std::string tag, device_t *owner, UINT32 clock) : +centronics_printer_device::centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CENTRONICS_PRINTER, "Centronics Printer", tag, owner, clock, "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 e5337d1401f..7e0ce223e7f 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, std::string tag, device_t *owner, UINT32 clock); + centronics_printer_device(const machine_config &mconfig, const char *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 05ba12b9e32..632d921ef9c 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 - constructor //------------------------------------------------- -expansion_slot_device::expansion_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +expansion_slot_device::expansion_slot_device(const machine_config &mconfig, const char *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 5d5c620a9bb..c465561d300 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, std::string tag, device_t *owner, UINT32 clock); + expansion_slot_device(const machine_config &mconfig, const char *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 4a719c7b7e3..c3099cd533c 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, std::string tag, device_t *owner, UINT32 clock) : +cgenie_fdc_device::cgenie_fdc_device(const machine_config &mconfig, const char *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 74a0dd809c1..540b2febebe 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, std::string tag, device_t *owner, UINT32 clock); + cgenie_fdc_device(const machine_config &mconfig, const char *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 0edf3f01f7b..de520ba0669 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, std::string tag, device_t *owner, UINT32 clock) : +cgenie_joystick_device::cgenie_joystick_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: pa_w %02x\n", tag(), 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().c_str(), data); + logerror("%s: pb_r %02x\n", tag(), data); return data; } diff --git a/src/devices/bus/cgenie/parallel/joystick.h b/src/devices/bus/cgenie/parallel/joystick.h index 950f8fc5e26..bbdb32e5444 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, std::string tag, device_t *owner, UINT32 clock); + cgenie_joystick_device(const machine_config &mconfig, const char *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 88e426c5f46..d147a550135 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 - constructor //------------------------------------------------- -parallel_slot_device::parallel_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +parallel_slot_device::parallel_slot_device(const machine_config &mconfig, const char *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 7f721a69df8..3c8bd6bf8c0 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, std::string tag, device_t *owner, UINT32 clock); + parallel_slot_device(const machine_config &mconfig, const char *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 267e53deb00..f9963844dd5 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, std::string tag, device_t *owner, UINT32 clock) : +cgenie_printer_device::cgenie_printer_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: pa_w %02x\n", tag(), 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().c_str(), data); + logerror("%s: pa_w %02x\n", tag(), 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 97ae6942db8..6faec62f308 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, std::string tag, device_t *owner, UINT32 clock); + cgenie_printer_device(const machine_config &mconfig, const char *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 05ba7bc14fa..858e52ad2e3 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; const device_type CHANF_ROM_MULTI_FINAL = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +chanf_rom_device::chanf_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +chanf_maze_device::chanf_maze_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +chanf_hangman_device::chanf_hangman_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +chanf_chess_device::chanf_chess_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +chanf_multi_old_device::chanf_multi_old_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +chanf_multi_final_device::chanf_multi_final_device(const machine_config &mconfig, const char *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 1114302d97e..4591865ec05 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + chanf_maze_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + chanf_hangman_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + chanf_chess_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + chanf_multi_old_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + chanf_multi_final_device(const machine_config &mconfig, const char *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 5665c841957..72045151cca 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, std::string tag) +void device_channelf_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +channelf_cart_slot_device::channelf_cart_slot_device(const machine_config &mconfig, const char *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 e2619f6eee6..78ee692640e 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + channelf_cart_slot_device(const machine_config &mconfig, const char *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 b9fee1a1476..a1b9c673c4b 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 - constructor //------------------------------------------------- -coco_232_device::coco_232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +coco_232_device::coco_232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_232, "CoCo RS-232 PAK", tag, owner, clock, "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 f96c7afd580..708d89cccf4 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, std::string tag, device_t *owner, UINT32 clock); + coco_232_device(const machine_config &mconfig, const char *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 ad7581bff23..e48b3e565d1 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, std::string tag, device_t *owner, UINT32 clock) +beckerport_device::beckerport_device(const machine_config &mconfig, const char *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 87cbd5fb707..1d1fe71c3d3 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, std::string tag, device_t *owner, UINT32 clock); + beckerport_device(const machine_config &mconfig, const char *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 4efe5cb6f9a..6e434ea3e0a 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 - constructor //------------------------------------------------- -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) +coco_fdc_device::coco_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cococart_interface( mconfig, *this ), 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, std::string tag, device_t *owner, UINT32 clock) +coco_fdc_device::coco_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_FDC, "CoCo FDC", tag, owner, clock, "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 - constructor //------------------------------------------------- -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) +dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : coco_fdc_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dragon_fdc_device::dragon_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : coco_fdc_device(mconfig, DRAGON_FDC, "Dragon FDC", tag, owner, clock, "dragon_fdc", __FILE__) { } @@ -613,7 +613,7 @@ const device_type SDTANDY_FDC = &device_creator; // sdtandy_fdc_device - constructor //------------------------------------------------- -sdtandy_fdc_device::sdtandy_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sdtandy_fdc_device::sdtandy_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : dragon_fdc_device(mconfig, SDTANDY_FDC, "SDTANDY FDC", tag, owner, clock, "sdtandy_fdc", __FILE__) { } @@ -645,7 +645,7 @@ const device_type COCO_FDC_V11 = &device_creator; // coco_fdc_v11_device - constructor //------------------------------------------------- -coco_fdc_v11_device::coco_fdc_v11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +coco_fdc_v11_device::coco_fdc_v11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : coco_fdc_device(mconfig, COCO_FDC_V11, "CoCo FDC v1.1", tag, owner, clock, "coco_fdc_v11", __FILE__) { } @@ -673,7 +673,7 @@ ROM_END const device_type COCO3_HDB1 = &device_creator; -coco3_hdb1_device::coco3_hdb1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +coco3_hdb1_device::coco3_hdb1_device(const machine_config &mconfig, const char *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 - constructor //------------------------------------------------- -cp400_fdc_device::cp400_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cp400_fdc_device::cp400_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : coco_fdc_device(mconfig, CP400_FDC, "CP400 FDC", tag, owner, clock, "cp400_fdc", __FILE__) { } diff --git a/src/devices/bus/coco/coco_fdc.h b/src/devices/bus/coco/coco_fdc.h index ddca5d388d2..2799d15e0ee 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + coco_fdc_v11_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + coco3_hdb1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cp400_fdc_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + sdtandy_fdc_device(const machine_config &mconfig, const char *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 b94f6eb6e84..18033158c45 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 - constructor //------------------------------------------------- -coco_multipak_device::coco_multipak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +coco_multipak_device::coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_MULTIPAK, "CoCo Multi-Pak Interface", tag, owner, clock, "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 7892351110b..3ffb91413eb 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, std::string tag, device_t *owner, UINT32 clock); + coco_multipak_device(const machine_config &mconfig, const char *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 d792c7db143..8f02d8612db 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 - constructor //------------------------------------------------- -coco_orch90_device::coco_orch90_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +coco_orch90_device::coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_ORCH90, "CoCo Orch-90 PAK", tag, owner, clock, "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 9d6cc76884f..0dcc521ba85 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, std::string tag, device_t *owner, UINT32 clock); + coco_orch90_device(const machine_config &mconfig, const char *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 711a2ffa2d6..1a861fa3bed 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 - constructor //------------------------------------------------- -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) +coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr) { } -coco_pak_device::coco_pak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +coco_pak_device::coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_PAK, "CoCo Program PAK", tag, owner, clock, "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_device - constructor //------------------------------------------------- -coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : coco_pak_device(mconfig, COCO_PAK_BANKED, "CoCo Program PAK (Banked)", tag, owner, clock, "cocopak_banked", __FILE__) { } diff --git a/src/devices/bus/coco/coco_pak.h b/src/devices/bus/coco/coco_pak.h index 019046e04fd..7915fd9923d 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + coco_pak_banked_device(const machine_config &mconfig, const char *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 fe84d67a2da..66cbc1dc121 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 - constructor //------------------------------------------------- -cococart_slot_device::cococart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +cococart_slot_device::cococart_slot_device(const machine_config &mconfig, const char *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 2762d742c3b..f92459b4388 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, std::string tag, device_t *owner, UINT32 clock); + cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &static_set_cart_callback(device_t &device, _Object object) { return downcast(device).m_cart_callback.set_callback(object); } template static devcb_base &static_set_nmi_callback(device_t &device, _Object object) { return downcast(device).m_nmi_callback.set_callback(object); } diff --git a/src/devices/bus/coleco/ctrl.cpp b/src/devices/bus/coleco/ctrl.cpp index f2dcd08c56e..5b53be7c3cf 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, std::string tag, device_t *owner, UINT32 clock) : +colecovision_control_port_device::colecovision_control_port_device(const machine_config &mconfig, const char *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 c11a5bc75f0..a8c82ee23c4 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, std::string tag, device_t *owner, UINT32 clock); + colecovision_control_port_device(const machine_config &mconfig, const char *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 ce2e2b8d771..05a53b584a5 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, std::string tag, device_t *owner, UINT32 clock) : +colecovision_cartridge_slot_device::colecovision_cartridge_slot_device(const machine_config &mconfig, const char *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 4c146f88e8e..e64e3c8d6d1 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, std::string tag, device_t *owner, UINT32 clock); + colecovision_cartridge_slot_device(const machine_config &mconfig, const char *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 13d9407cdc5..a00a1d89f4c 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, std::string tag, device_t *owner, UINT32 clock) : +coleco_hand_controller_t::coleco_hand_controller_t(const machine_config &mconfig, const char *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 f65831c42c3..a43632e66db 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, std::string tag, device_t *owner, UINT32 clock); + coleco_hand_controller_t(const machine_config &mconfig, const char *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 e92d1cb81c8..01a62b49323 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, std::string tag, device_t *owner, UINT32 clock) : +coleco_super_action_controller_t::coleco_super_action_controller_t(const machine_config &mconfig, const char *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 614fce08d3f..51dcfae357f 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, std::string tag, device_t *owner, UINT32 clock); + coleco_super_action_controller_t(const machine_config &mconfig, const char *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 c9fb068ebfa..f66a0463eae 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_creatorrw_w(state); } @@ -74,7 +74,7 @@ class compucolor_floppy_device : public device_t, { public: // construction/destruction - compucolor_floppy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + compucolor_floppy_device(const machine_config &mconfig, const char *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 9f20a87c5da..b9cc57b836f 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, std::string tag, device_t *owner, UINT32 clock) : +comx_clm_device::comx_clm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_CLM, "COMX 80 Column Card", tag, owner, clock, "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 7d831fc41df..131a57b2cd9 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, std::string tag, device_t *owner, UINT32 clock); + comx_clm_device(const machine_config &mconfig, const char *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 bb48207f7bf..56be84b4902 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, std::string tag, device_t *owner, UINT32 clock) : +comx_epr_device::comx_epr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_EPR, "COMX-35 F&M EPROM Switchboard", tag, owner, clock, "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 b0b1a75f592..3d30b7e312a 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, std::string tag, device_t *owner, UINT32 clock); + comx_epr_device(const machine_config &mconfig, const char *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 95034532aac..cd64a1b49a8 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, std::string tag, device_t *owner, UINT32 clock) : +comx_expansion_slot_device::comx_expansion_slot_device(const machine_config &mconfig, const char *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 4286ea488e5..02325753396 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, std::string tag, device_t *owner, UINT32 clock); + comx_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~comx_expansion_slot_device() { } template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } diff --git a/src/devices/bus/comx35/expbox.cpp b/src/devices/bus/comx35/expbox.cpp index d752e3f0e31..ce0dec61006 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, std::string tag, device_t *owner, UINT32 clock) : +comx_eb_device::comx_eb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_EB, "COMX-35E Expansion Box", tag, owner, clock, "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 3e2267f90c5..0b479c79326 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, std::string tag, device_t *owner, UINT32 clock); + comx_eb_device(const machine_config &mconfig, const char *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 7b5e1cc9a73..e2c5066873a 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, std::string tag, device_t *owner, UINT32 clock) : +comx_fd_device::comx_fd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_FD, "COMX FD", tag, owner, clock, "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 c2fe9e34fed..cdcb23a363e 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, std::string tag, device_t *owner, UINT32 clock); + comx_fd_device(const machine_config &mconfig, const char *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 a5c73ff2da9..2408693f1b8 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, std::string tag, device_t *owner, UINT32 clock) : +comx_joy_device::comx_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_JOY, "COMX JoyCard", tag, owner, clock, "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 5d2fde3d87b..318c5265069 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, std::string tag, device_t *owner, UINT32 clock); + comx_joy_device(const machine_config &mconfig, const char *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 af7479e24b9..2f36fffd9bd 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, std::string tag, device_t *owner, UINT32 clock) : +comx_prn_device::comx_prn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_PRN, "COMX-35 Printer Card", tag, owner, clock, "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 4c942a06acf..8f0a2d2fcaf 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, std::string tag, device_t *owner, UINT32 clock); + comx_prn_device(const machine_config &mconfig, const char *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 bfe694d83d7..0e096c5dc15 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 - constructor //------------------------------------------------- -comx_ram_device::comx_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +comx_ram_device::comx_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_RAM, "COMX-35 RAM Card", tag, owner, clock, "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 d76261a7103..c74a54066f4 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, std::string tag, device_t *owner, UINT32 clock); + comx_ram_device(const machine_config &mconfig, const char *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 b5cfd571e8d..e74b62978d6 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, std::string tag, device_t *owner, UINT32 clock) : +comx_thm_device::comx_thm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMX_THM, "COMX-35 Thermal Printer Card", tag, owner, clock, "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 5fae0807a47..7d16f2a3d06 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, std::string tag, device_t *owner, UINT32 clock); + comx_thm_device(const machine_config &mconfig, const char *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 545be8cc46e..87e5af428ce 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_amdrum_device::cpc_amdrum_device(const machine_config &mconfig, const char *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 65afa46e131..5a3df11d273 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, std::string tag, device_t *owner, UINT32 clock); + cpc_amdrum_device(const machine_config &mconfig, const char *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 139762255e1..c4cbc0b0b1f 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_brunword4_device::cpc_brunword4_device(const machine_config &mconfig, const char *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 12b6b46e0bf..4a65bf3402d 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, std::string tag, device_t *owner, UINT32 clock); + cpc_brunword4_device(const machine_config &mconfig, const char *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 68a9e673e81..1bff1c869a0 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_pds_device::cpc_pds_device(const machine_config &mconfig, const char *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 61175271584..54d68e431fd 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, std::string tag, device_t *owner, UINT32 clock); + cpc_pds_device(const machine_config &mconfig, const char *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 849ffd3e9b3..d0d59ea4452 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_rom_device::cpc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_ROM, "ROM Box", tag, owner, clock, "cpc_rom", __FILE__), device_cpc_expansion_card_interface(mconfig, *this) { @@ -79,7 +79,7 @@ const device_type ROMSLOT = &device_creator; // rom_image_device - constructor //------------------------------------------------- -rom_image_device::rom_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rom_image_device::rom_image_device(const machine_config &mconfig, const char *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 cfb3b66a9aa..ee758aba761 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, std::string tag, device_t *owner, UINT32 clock); + rom_image_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cpc_rom_device(const machine_config &mconfig, const char *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 6b5d965d3f5..ccf4165edf1 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, const char *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, std::string ta { } -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_ams_rs232_device::cpc_ams_rs232_device(const machine_config &mconfig, const char *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 e355d1242c4..0124a685ea8 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + cpc_ams_rs232_device(const machine_config &mconfig, const char *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 827efdce9c0..a86847d100c 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_ssa1_device::cpc_ssa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_SSA1, "SSA-1", tag, owner, clock, "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, std::string tag, { } -cpc_dkspeech_device::cpc_dkspeech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +cpc_dkspeech_device::cpc_dkspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_DKSPEECH, "DK'Tronics Speech Synthesiser", tag, owner, clock, "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 1d30b99ceb8..e47112511f5 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, std::string tag, device_t *owner, UINT32 clock); + cpc_ssa1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cpc_dkspeech_device(const machine_config &mconfig, const char *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 1d6f76627cd..69ad0887282 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_expansion_slot_device::cpc_expansion_slot_device(const machine_config &mconfig, const char *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 0ffe527d971..ffde80ef655 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, std::string tag, device_t *owner, UINT32 clock); + cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~cpc_expansion_slot_device(); template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(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 02ec3187c1c..c9b4adb1a2d 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_ddi1_device::cpc_ddi1_device(const machine_config &mconfig, const char *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 c1f93f81179..600098a3e53 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, std::string tag, device_t *owner, UINT32 clock); + cpc_ddi1_device(const machine_config &mconfig, const char *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 5736a54111c..9876263c323 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_doubler_device::cpc_doubler_device(const machine_config &mconfig, const char *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 dca244ec910..6c429618789 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, std::string tag, device_t *owner, UINT32 clock); + cpc_doubler_device(const machine_config &mconfig, const char *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 338bfc3f342..3e19640be8e 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_hd20_device::cpc_hd20_device(const machine_config &mconfig, const char *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 f0dd5d296ca..3d4f48837fd 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, std::string tag, device_t *owner, UINT32 clock); + cpc_hd20_device(const machine_config &mconfig, const char *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 67600fde21e..c289db92ddd 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, std::string tag, device_t *owner, UINT32 clock) : +al_magicsound_device::al_magicsound_device(const machine_config &mconfig, const char *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 633548417e9..519e820bac4 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, std::string tag, device_t *owner, UINT32 clock); + al_magicsound_device(const machine_config &mconfig, const char *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 bdc6ccba58c..bb4354041bc 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_multiface2_device::cpc_multiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPC_MFACE2, "Multiface II", tag, owner, clock, "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 fe0ade65d6e..c64872af18b 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, std::string tag, device_t *owner, UINT32 clock); + cpc_multiface2_device(const machine_config &mconfig, const char *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 9d4ffb8730b..8d6fd109453 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_playcity_device::cpc_playcity_device(const machine_config &mconfig, const char *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 d361e9f8777..757ffb23c45 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, std::string tag, device_t *owner, UINT32 clock); + cpc_playcity_device(const machine_config &mconfig, const char *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 6c002d93236..e4304323932 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_smartwatch_device::cpc_smartwatch_device(const machine_config &mconfig, const char *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 d28aa477eb2..b4741bed193 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, std::string tag, device_t *owner, UINT32 clock); + cpc_smartwatch_device(const machine_config &mconfig, const char *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 d6d65b829e1..c80d22da6c6 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_symbiface2_device::cpc_symbiface2_device(const machine_config &mconfig, const char *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 94bd83479f6..04bc55bae4d 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, std::string tag, device_t *owner, UINT32 clock); + cpc_symbiface2_device(const machine_config &mconfig, const char *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 a914a4883eb..311918e9bda 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, std::string tag, device_t *owner, UINT32 clock) : +cpc_transtape_device::cpc_transtape_device(const machine_config &mconfig, const char *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 6d42e395e29..bb1a70e6ecc 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, std::string tag, device_t *owner, UINT32 clock); + cpc_transtape_device(const machine_config &mconfig, const char *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 24eb7942a36..875a2b40fbc 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; const device_type CRVISION_ROM_18K = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +crvision_rom_device::crvision_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +crvision_rom6k_device::crvision_rom6k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +crvision_rom8k_device::crvision_rom8k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +crvision_rom10k_device::crvision_rom10k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +crvision_rom12k_device::crvision_rom12k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +crvision_rom16k_device::crvision_rom16k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +crvision_rom18k_device::crvision_rom18k_device(const machine_config &mconfig, const char *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 31ba846ab97..8a025d6c5d1 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + crvision_rom6k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + crvision_rom8k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + crvision_rom10k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + crvision_rom12k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + crvision_rom16k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + crvision_rom18k_device(const machine_config &mconfig, const char *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 82f3ddd0d96..74c9eb28645 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, std::string tag) +void device_crvision_cart_interface::rom_alloc(UINT32 size, const char *tag) { if (m_rom == nullptr) { @@ -62,7 +62,7 @@ void device_crvision_cart_interface::rom_alloc(UINT32 size, std::string tag) //------------------------------------------------- // crvision_cart_slot_device - constructor //------------------------------------------------- -crvision_cart_slot_device::crvision_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +crvision_cart_slot_device::crvision_cart_slot_device(const machine_config &mconfig, const char *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 d69db100645..d3bb02d6790 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + crvision_cart_slot_device(const machine_config &mconfig, const char *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 8c545dc397c..ab1b079405d 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, std::string tag, device_t *owner, UINT32 clock) : +dmvcart_slot_device::dmvcart_slot_device(const machine_config &mconfig, const char *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 89f02e424c6..da7f8f68d35 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, std::string tag, device_t *owner, UINT32 clock); + dmvcart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~dmvcart_slot_device(); template static devcb_base &set_prog_read_callback(device_t &device, _Object object) { return downcast(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 eb37e5709da..0a49a824df0 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 - constructor //------------------------------------------------- -dmv_k210_device::dmv_k210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_k210_device::dmv_k210_device(const machine_config &mconfig, const char *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 c96801106d1..1939c5c051e 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, std::string tag, device_t *owner, UINT32 clock); + dmv_k210_device(const machine_config &mconfig, const char *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 ee8299bbc58..cd1c55a39a6 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 - constructor //------------------------------------------------- -dmv_k220_device::dmv_k220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_k220_device::dmv_k220_device(const machine_config &mconfig, const char *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 12b1329d997..0f405946ec6 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, std::string tag, device_t *owner, UINT32 clock); + dmv_k220_device(const machine_config &mconfig, const char *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 3beccbdf7ac..5f5dd5f509d 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_k230_device - constructor //------------------------------------------------- -dmv_k230_device::dmv_k230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_k230_device::dmv_k230_device(const machine_config &mconfig, const char *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, std::string tag, { } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +dmv_k231_device::dmv_k231_device(const machine_config &mconfig, const char *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, std::string tag, // dmv_k234_device - constructor //------------------------------------------------- -dmv_k234_device::dmv_k234_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_k234_device::dmv_k234_device(const machine_config &mconfig, const char *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, std::string tag, // dmv_k235_device - constructor //------------------------------------------------- -dmv_k235_device::dmv_k235_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_k235_device::dmv_k235_device(const machine_config &mconfig, const char *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 993e449f2aa..d05d6ef8317 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + dmv_k231_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + dmv_k234_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + dmv_k235_device(const machine_config &mconfig, const char *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 4ef0a841960..8668f7ab81f 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 - constructor //------------------------------------------------- -dmv_k233_device::dmv_k233_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_k233_device::dmv_k233_device(const machine_config &mconfig, const char *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 4860b4644c6..f736dee2d4a 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, std::string tag, device_t *owner, UINT32 clock); + dmv_k233_device(const machine_config &mconfig, const char *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 98f1984ddf1..5bc586c09b5 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_k801_device - constructor //------------------------------------------------- -dmv_k801_device::dmv_k801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_k801_device::dmv_k801_device(const machine_config &mconfig, const char *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, std::string tag, { } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +dmv_k211_device::dmv_k211_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +dmv_k212_device::dmv_k212_device(const machine_config &mconfig, const char *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, std::string tag, // dmv_k213_device - constructor //------------------------------------------------- -dmv_k213_device::dmv_k213_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_k213_device::dmv_k213_device(const machine_config &mconfig, const char *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 9c74b5f1a84..0b67b6c5d71 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, 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); + 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); // 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + dmv_k212_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + dmv_k213_device(const machine_config &mconfig, const char *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 83fd0cbf187..00de36c9c24 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 - constructor //------------------------------------------------- -dmv_k803_device::dmv_k803_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_k803_device::dmv_k803_device(const machine_config &mconfig, const char *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 75531d3bab3..c6a7d70af4d 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, std::string tag, device_t *owner, UINT32 clock); + dmv_k803_device(const machine_config &mconfig, const char *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 3b671841385..9e79c9d90d6 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 - constructor //------------------------------------------------- -dmv_k806_device::dmv_k806_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_k806_device::dmv_k806_device(const machine_config &mconfig, const char *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 0e1b2d564c9..1c25f9b6102 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, std::string tag, device_t *owner, UINT32 clock); + dmv_k806_device(const machine_config &mconfig, const char *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 997bcd6d199..b53bc26a63c 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_ram_device - constructor //------------------------------------------------- -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +dmv_k200_device::dmv_k200_device(const machine_config &mconfig, const char *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, std::string tag, // dmv_k202_device - constructor //------------------------------------------------- -dmv_k202_device::dmv_k202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_k202_device::dmv_k202_device(const machine_config &mconfig, const char *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, std::string tag, // dmv_k208_device - constructor //------------------------------------------------- -dmv_k208_device::dmv_k208_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_k208_device::dmv_k208_device(const machine_config &mconfig, const char *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 848e2848de1..3aceebe9165 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + dmv_k200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; @@ -50,7 +50,7 @@ class dmv_k202_device : { public: // construction/destruction - dmv_k202_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dmv_k202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; @@ -59,7 +59,7 @@ class dmv_k208_device : { public: // construction/destruction - dmv_k208_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dmv_k208_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/ecbbus/ecbbus.cpp b/src/devices/bus/ecbbus/ecbbus.cpp index 0425835e1f9..c96d49da103 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 - constructor //------------------------------------------------- -ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, const char *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_num(0), m_bus(nullptr) + device_slot_interface(mconfig, *this), m_bus_tag(nullptr), m_bus_num(0), m_bus(nullptr) { } @@ -37,7 +37,7 @@ ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, std::strin // static_set_ecbbus_slot - //------------------------------------------------- -void ecbbus_slot_device::static_set_ecbbus_slot(device_t &device, std::string tag, int num) +void ecbbus_slot_device::static_set_ecbbus_slot(device_t &device, const char *tag, int num) { ecbbus_slot_device &ecbbus_card = dynamic_cast(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, std::string tag, device_t *owner, UINT32 clock) : +ecbbus_device::ecbbus_device(const machine_config &mconfig, const char *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 478de6871b0..90bb67bced9 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, std::string tag, device_t *owner, UINT32 clock); + ecbbus_slot_device(const machine_config &mconfig, const char *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, std::string tag, int num); + static void static_set_ecbbus_slot(device_t &device, const char *tag, int num); private: // configuration - std::string m_bus_tag; + const char *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, std::string tag, device_t *owner, UINT32 clock); + ecbbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_nmi.set_callback(object); } diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index baab230eb08..75ba3961754 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, std::string tag, device_t *owner, UINT32 clock) : +grip_device::grip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ECB_GRIP21, "GRIP-2.1", tag, owner, clock, "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 1c3561fb316..7f7abe6d0a1 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, std::string tag, device_t *owner, UINT32 clock); + grip_device(const machine_config &mconfig, const char *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 71da0802380..ed60ccc2d28 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; const device_type E01S = &device_creator; -e01s_device::e01s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e01s_device::e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :e01_device(mconfig, E01S, "Acorn FileStore E01S", tag, owner, clock, "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, std::string tag, device_t *owner, UINT32 clock) +e01_device::e01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, E01, "Acorn FileStore E01", tag, owner, clock, "e01" , __FILE__), device_econet_interface(mconfig, *this), m_maincpu(*this, R65C102_TAG), @@ -402,7 +402,7 @@ e01_device::e01_device(const machine_config &mconfig, std::string tag, device_t } -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) +e01_device::e01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_econet_interface(mconfig, *this), m_maincpu(*this, R65C102_TAG), diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h index ef3d1fcb4bd..e83b9a0b6bd 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, 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); + e01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + e01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); enum { @@ -121,7 +121,7 @@ class e01s_device : public e01_device { public: // construction/destruction - e01s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/econet/econet.cpp b/src/devices/bus/econet/econet.cpp index cd5615b1d10..e56d843db32 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, std::string tag, device_t *owner, UINT32 clock) : +econet_slot_device::econet_slot_device(const machine_config &mconfig, const char *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().c_str(), SIGNAL_NAME[signal], state); + if (LOG) logerror("Econet: '%s' %s %u\n", tag(), 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 (entry->m_device->tag() == device->tag()) + if (!strcmp(entry->m_device->tag(), device->tag())) { if (entry->m_line[signal] != state) { - if (LOG) logerror("Econet: '%s' %s %u\n", device->tag().c_str(), SIGNAL_NAME[signal], state); + if (LOG) logerror("Econet: '%s' %s %u\n", device->tag(), 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, std::string tag, device_t *owner, UINT32 clock) : +econet_device::econet_device(const machine_config &mconfig, const char *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 625baa35358..e37cf989696 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, std::string tag, device_t *owner, UINT32 clock); + econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_clk_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_clk.set_callback(object); } template static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + econet_slot_device(const machine_config &mconfig, const char *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 9fd7d6b6754..d5910c07ee3 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, std::string tag, device_t *owner, UINT32 clock) : +ep64_exdos_device::ep64_exdos_device(const machine_config &mconfig, const char *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 80658598bb9..dac02daa1b4 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, std::string tag, device_t *owner, UINT32 clock); + ep64_exdos_device(const machine_config &mconfig, const char *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 85bd3e67651..8f9ef82fd19 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, std::string tag, device_t *owner, UINT32 clock) : +ep64_expansion_bus_slot_device::ep64_expansion_bus_slot_device(const machine_config &mconfig, const char *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 ff2aa946d70..a80f05b76f9 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, std::string tag, device_t *owner, UINT32 clock); + ep64_expansion_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void static_set_dave_tag(device_t &device, std::string tag) { downcast(device).m_dave.set_tag(tag); } + static void static_set_dave_tag(device_t &device, const char* tag) { downcast(device).m_dave.set_tag(tag); } template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_nmi.set_callback(object); } template static devcb_base &set_wait_wr_callback(device_t &device, _Object object) { return downcast(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 c0608102709..88e50bb9cdc 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, std::string tag, device_t *owner, UINT32 clock) : +epson_sio_device::epson_sio_device(const machine_config &mconfig, const char *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 c856e101c1c..c59b3d6ddc1 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, std::string tag, device_t *owner, UINT32 clock); + epson_sio_device(const machine_config &mconfig, const char *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 7f2799c7b0a..7096aee3fce 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, std::string tag, device_t *owner, UINT32 clock) : +epson_pf10_device::epson_pf10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, EPSON_PF10, "EPSON PF-10 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().c_str(), m_port1); + logerror("%s: port1_r(%02x)\n", tag(), m_port1); return m_port1; } WRITE8_MEMBER( epson_pf10_device::port1_w ) { - logerror("%s: port1_w(%02x)\n", tag().c_str(), data); + logerror("%s: port1_w(%02x)\n", tag(), data); } READ8_MEMBER( epson_pf10_device::port2_r ) { - logerror("%s: port2_r(%02x)\n", tag().c_str(), m_port2); + logerror("%s: port2_r(%02x)\n", tag(), 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().c_str(), data); + logerror("%s: port2_w(%02x)\n", tag(), data); } READ8_MEMBER( epson_pf10_device::fdc_r ) { - logerror("%s: fdc_r @ %04x\n", tag().c_str(), offset); + logerror("%s: fdc_r @ %04x\n", tag(), offset); return 0xff; } WRITE8_MEMBER( epson_pf10_device::fdc_w ) { - logerror("%s: fdc_w @ %04x (%02x)\n", tag().c_str(), offset, data); + logerror("%s: fdc_w @ %04x (%02x)\n", tag(), offset, data); } WRITE8_MEMBER( epson_pf10_device::fdc_tc_w ) { - logerror("%s: fdc_tc_w(%02x)\n", tag().c_str(), data); + logerror("%s: fdc_tc_w(%02x)\n", tag(), data); } diff --git a/src/devices/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h index 9907ab82dfa..4a648bbd997 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, std::string tag, device_t *owner, UINT32 clock); + epson_pf10_device(const machine_config &mconfig, const char *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 bec456149cc..07fdf31e858 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, std::string tag, device_t *owner, UINT32 clock) : +epson_tf20_device::epson_tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, EPSON_TF20, "EPSON TF-20 Dual Floppy 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().c_str()); + logerror("%s: tc off\n", tag()); 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 8172cf91b6d..3e76b3dab27 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, std::string tag, device_t *owner, UINT32 clock); + epson_tf20_device(const machine_config &mconfig, const char *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 9130f4ddd29..55555a8d4b2 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, std::string tag) +void device_gb_cart_interface::rom_alloc(UINT32 size, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_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, std::string tag, device_t *owner, UINT32 clock) : +gb_cart_slot_device::gb_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +megaduck_cart_slot_device::megaduck_cart_slot_device(const machine_config &mconfig, const char *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 3f6109e7d2d..a0108ec03c7 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + megaduck_cart_slot_device(const machine_config &mconfig, const char *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 3526d4658a2..cfac868834f 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; const device_type GB_ROM_SM3SP = &device_creator; -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) +gb_rom_mbc_device::gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_gb_cart_interface( mconfig, *this ), m_ram_enable(0) { } -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_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_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, std::string tag, device_t *owner, UINT32 clock) +gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MBC1, "GB MBC1 Carts", tag, owner, clock, "gb_rom_mbc1", __FILE__), m_mode(0), m_mask(0x1f), m_shift(0) { } -gb_rom_mbc2_device::gb_rom_mbc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_mbc2_device::gb_rom_mbc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MBC2, "GB MBC2 Carts", tag, owner, clock, "gb_rom_mbc2", __FILE__) { } -gb_rom_mbc3_device::gb_rom_mbc3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_mbc3_device::gb_rom_mbc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MBC3, "GB MBC3 Carts", tag, owner, clock, "gb_rom_mbc3", __FILE__) { } -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_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MBC5, "GB MBC5 Carts", tag, owner, clock, "gb_rom_mbc5", __FILE__) { } -gb_rom_mbc6_device::gb_rom_mbc6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_mbc6_device::gb_rom_mbc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MBC6, "GB MBC6 Carts", tag, owner, clock, "gb_rom_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, std::string tag, device_t *owner, UINT32 clock) +gb_rom_mbc7_device::gb_rom_mbc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MBC7, "GB MBC7 Carts", tag, owner, clock, "gb_rom_mbc7", __FILE__) { } -gb_rom_m161_device::gb_rom_m161_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_m161_device::gb_rom_m161_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +gb_rom_mmm01_device::gb_rom_mmm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_MMM01, "GB MMM01 Carts", tag, owner, clock, "gb_rom_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, std::string tag, device_t *owner, UINT32 clock) +gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source), 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, std::string tag, device_t *owner, UINT32 clock) +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_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, std::string tag, device_t *owner, UINT32 clock) +gb_rom_188in1_device::gb_rom_188in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +gb_rom_sintax_device::gb_rom_sintax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_SINTAX, "GB MBC5 Sintax Carts", tag, owner, clock, "gb_rom_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, std::string tag, device_t *owner, UINT32 clock) +gb_rom_chongwu_device::gb_rom_chongwu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_mbc5_device(mconfig, GB_ROM_CHONGWU, "GB Chong Wu Xiao Jing Ling", tag, owner, clock, "gb_rom_chongwu", __FILE__), m_protection_checked(0) { } -gb_rom_licheng_device::gb_rom_licheng_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_licheng_device::gb_rom_licheng_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +gb_rom_digimon_device::gb_rom_digimon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_mbc5_device(mconfig, GB_ROM_DIGIMON, "GB Digimon", tag, owner, clock, "gb_rom_digimon", __FILE__) { } -gb_rom_rockman8_device::gb_rom_rockman8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_rockman8_device::gb_rom_rockman8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_ROCKMAN8, "GB MBC1 Rockman 8", tag, owner, clock, "gb_rom_rockman8", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0) { } -gb_rom_sm3sp_device::gb_rom_sm3sp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_sm3sp_device::gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_mbc_device(mconfig, GB_ROM_SM3SP, "GB MBC1 Super Mario 3 Special", tag, owner, clock, "gb_rom_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 b1d52c865e9..f1041e4541f 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, std::string 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, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_mbc2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_mbc3_device(const machine_config &mconfig, const char *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, 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); + gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + gb_rom_mbc5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() 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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_mbc6_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_mbc7_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_m161_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_mmm01_device(const machine_config &mconfig, const char *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, 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); + 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); // device-level overrides virtual void device_start() override; @@ -231,7 +231,7 @@ public: }; // construction/destruction - gb_rom_sachen_mmc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gb_rom_sachen_mmc2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_188in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_sintax_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_chongwu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_licheng_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_digimon_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_rockman8_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_sm3sp_device(const machine_config &mconfig, const char *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 130d16b52dc..ff10094c3d0 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; const device_type MEGADUCK_ROM = &device_creator; -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) +gb_rom_device::gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_gb_cart_interface( mconfig, *this ) { } -gb_rom_device::gb_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_device::gb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GB_STD_ROM, "GB Carts", tag, owner, clock, "gb_rom", __FILE__), device_gb_cart_interface( mconfig, *this ) { } -gb_rom_tama5_device::gb_rom_tama5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_tama5_device::gb_rom_tama5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_device(mconfig, GB_ROM_TAMA5, "GB Tamagotchi", tag, owner, clock, "gb_rom_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, std::string tag, device_t *owner, UINT32 clock) +gb_rom_wisdom_device::gb_rom_wisdom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_device(mconfig, GB_ROM_WISDOM, "GB Wisdom Tree Carts", tag, owner, clock, "gb_rom_wisdom", __FILE__) { } -gb_rom_yong_device::gb_rom_yong_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_yong_device::gb_rom_yong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_device(mconfig, GB_ROM_YONG, "GB Yong Yong Carts", tag, owner, clock, "gb_rom_yong", __FILE__) { } -gb_rom_atvrac_device::gb_rom_atvrac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_atvrac_device::gb_rom_atvrac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_device(mconfig, GB_ROM_ATVRAC, "GB ATV Racin'", tag, owner, clock, "gb_rom_atvrac", __FILE__) { } -gb_rom_lasama_device::gb_rom_lasama_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_rom_lasama_device::gb_rom_lasama_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_rom_device(mconfig, GB_ROM_LASAMA, "GB LaSaMa", tag, owner, clock, "gb_rom_lasama", __FILE__) { } -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) +megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_gb_cart_interface( mconfig, *this ) { } -megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MEGADUCK_ROM, "MegaDuck Carts", tag, owner, clock, "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 9e0932ad2fb..343d30195b0 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, 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); + gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + gb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() 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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_tama5_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_wisdom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_yong_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_atvrac_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gb_rom_lasama_device(const machine_config &mconfig, const char *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, 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); + megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + megaduck_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/gamegear/ggext.cpp b/src/devices/bus/gamegear/ggext.cpp index bce50a8c527..fa09f4272a1 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, std::string tag, device_t *owner, UINT32 clock) : +gg_ext_port_device::gg_ext_port_device(const machine_config &mconfig, const char *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 ac65aac63b4..0388838daaa 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, std::string tag, device_t *owner, UINT32 clock); + gg_ext_port_device(const machine_config &mconfig, const char *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 067c98687e1..54b9139b433 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 - constructor //------------------------------------------------- -sms_ctrl_adaptor_device::sms_ctrl_adaptor_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +sms_ctrl_adaptor_device::sms_ctrl_adaptor_device(const machine_config &mconfig, const char *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 eaebc9f7c29..e06dc76163f 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, std::string tag, device_t *owner, UINT32 clock); + sms_ctrl_adaptor_device(const machine_config &mconfig, const char *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 83ee37755ff..217f3f9e954 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, std::string tag) +void device_gba_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, const char *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 55a01a30827..9d9a6a48be7 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + gba_cart_slot_device(const machine_config &mconfig, const char *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 13e773bca18..8e857dfe004 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; const device_type GBA_ROM_FLASH1M = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +gba_rom_device::gba_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, const char *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 d9f58bddac4..f9a3c16cb2e 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + gba_rom_sram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gba_rom_flash_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gba_rom_flash1m_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gba_rom_eeprom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gba_rom_eeprom64_device(const machine_config &mconfig, const char *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 969d0a0bfa9..3767ddae724 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_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) +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) : 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +generic_ram_32k_plain_device::generic_ram_32k_plain_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +generic_ram_64k_plain_device::generic_ram_64k_plain_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +generic_ram_128k_plain_device::generic_ram_128k_plain_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +generic_ram_32k_linear_device::generic_ram_32k_linear_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +generic_ram_64k_linear_device::generic_ram_64k_linear_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +generic_ram_128k_linear_device::generic_ram_128k_linear_device(const machine_config &mconfig, const char *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 673015f2020..487aa5aae1b 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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + generic_ram_32k_plain_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + generic_ram_64k_plain_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + generic_ram_128k_plain_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + generic_ram_32k_linear_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + generic_ram_64k_linear_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + generic_ram_128k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/generic/rom.cpp b/src/devices/bus/generic/rom.cpp index d1358c458af..a816040e229 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_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) +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) : 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +generic_rom_plain_device::generic_rom_plain_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +generic_rom_linear_device::generic_rom_linear_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +generic_romram_plain_device::generic_romram_plain_device(const machine_config &mconfig, const char *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 7e889c19388..73489ab0932 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, std::string 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, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + generic_romram_plain_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + generic_rom_linear_device(const machine_config &mconfig, const char *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 ea8f532c18d..4f3af4df411 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, std::string tag) +void device_generic_cart_interface::rom_alloc(size_t size, int width, endianness_t endian, const char *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, std::string tag, device_t *owner, UINT32 clock) : +generic_slot_device::generic_slot_device(const machine_config &mconfig, const char *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 0e13b5ff788..6a12c1cd84c 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, std::string tag); + virtual void rom_alloc(size_t size, int width, endianness_t end, const char *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, std::string tag, device_t *owner, UINT32 clock); + generic_slot_device(const machine_config &mconfig, const char *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(device).m_device_image_load = callback; } diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp index 880c924660b..0e455c35b67 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, std::string tag, device_t *owner, UINT32 clock) +c2031_device::c2031_device(const machine_config &mconfig, const char *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 e9753cba6d6..ccc2c31621a 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, std::string tag, device_t *owner, UINT32 clock); + c2031_device(const machine_config &mconfig, const char *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 dd5f99e5455..55dd8f9a072 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) : +c2040_t::c2040_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner // c3040_t - constructor //------------------------------------------------- -c3040_t::c3040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c3040_t::c3040_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner // c4040_t - constructor //------------------------------------------------- -c4040_t::c4040_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c4040_t::c4040_t(const machine_config &mconfig, const char *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 fd102976e8d..74539e6524d 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + c3040_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + c4040_t(const machine_config &mconfig, const char *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 47908c8745c..b39ab1d23a3 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, std::string tag, device_t *owner, UINT32 clock) : +c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, const char *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 d4f5a1ef5d3..a056a8f0b60 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, std::string tag, device_t *owner, UINT32 clock); + c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_sync.set_callback(object); } template static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_ready.set_callback(object); } diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp index 710cd8e03bb..ead9fad37a5 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) : +c8050_t::c8050_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner // c8250_t - constructor //------------------------------------------------- -c8250_t::c8250_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c8250_t::c8250_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner // c8250lp_t - constructor //------------------------------------------------- -c8250lp_t::c8250lp_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c8250lp_t::c8250lp_t(const machine_config &mconfig, const char *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, std::string tag, device_t *o // sfd1001_t - constructor //------------------------------------------------- -sfd1001_t::sfd1001_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +sfd1001_t::sfd1001_t(const machine_config &mconfig, const char *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 a9cb8b27546..71bd9ae42cf 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + c8250_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + c8250lp_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sfd1001_t(const machine_config &mconfig, const char *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 039187f2b9f..5e2e91676c0 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, std::string tag, device_t *owner, UINT32 clock) : +c8050_fdc_t::c8050_fdc_t(const machine_config &mconfig, const char *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 9a1fb1592eb..4f82962f524 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, std::string tag, device_t *owner, UINT32 clock); + c8050_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_sync.set_callback(object); } template static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_ready.set_callback(object); } diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp index bf24ae43de8..05c39c7ffdd 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, std::string tag, device_t *owner, UINT32 clock) : +c8280_t::c8280_t(const machine_config &mconfig, const char *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 1118ca60bcb..a7f17aaf55c 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, std::string tag, device_t *owner, UINT32 clock); + c8280_t(const machine_config &mconfig, const char *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 136c96fb7c6..68b63589ed9 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_DOS_TAG), @@ -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, std::string tag, device_t *owner, UINT32 clock) +d9060_t::d9060_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner // d9090_t - constructor //------------------------------------------------- -d9090_t::d9090_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +d9090_t::d9090_t(const machine_config &mconfig, const char *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 8cc737c620f..104daec4a11 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -98,7 +98,7 @@ class d9060_t : public d9060_base_t { public: // construction/destruction - d9060_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + d9060_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + d9090_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp index dbf6efb89fc..c03f147250d 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, std::string tag, device_t *owner, UINT32 clock) +hardbox_device::hardbox_device(const machine_config &mconfig, const char *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 d76b824c2df..cbaa26d335c 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, std::string tag, device_t *owner, UINT32 clock); + hardbox_device(const machine_config &mconfig, const char *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 7dc9f17a6f7..38a1f538404 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, std::string tag, device_t *owner, UINT32 clock) : +ieee488_slot_device::ieee488_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ieee488_device::ieee488_device(const machine_config &mconfig, const char *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().c_str(), SIGNAL_NAME[signal], state); + if (LOG) logerror("%s IEEE488: '%s' %s %u\n", machine().describe_context(), tag(), 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 (entry->m_device->tag() == device->tag()) + if (!strcmp(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().c_str(), SIGNAL_NAME[signal], state); + if (LOG) logerror("%s IEEE488: '%s' %s %u\n", machine().describe_context(), device->tag(), 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().c_str(), data); + if (LOG) logerror("%s IEEE488: '%s' DIO %02x\n", machine().describe_context(), tag(), data); m_dio = data; } @@ -327,11 +327,11 @@ void ieee488_device::set_data(device_t *device, UINT8 data) while (entry) { - if (entry->m_device->tag() == device->tag()) + if (!strcmp(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().c_str(), data); + if (LOG) logerror("%s IEEE488: '%s' DIO %02x\n", machine().describe_context(), device->tag(), data); entry->m_dio = data; } } diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h index 96fea841c5b..f14189e83d9 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, std::string tag, device_t *owner, UINT32 clock); + ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template void set_eoi_callback(_write wr) { m_write_eoi.set_callback(wr); } template 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, std::string tag, device_t *owner, UINT32 clock); + ieee488_slot_device(const machine_config &mconfig, const char *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 58d3bfd9e73..bdb11f6d261 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, std::string tag, device_t *owner, UINT32 clock) +mshark_device::mshark_device(const machine_config &mconfig, const char *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 cfe3ab1bc28..50a9c967244 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, std::string tag, device_t *owner, UINT32 clock); + mshark_device(const machine_config &mconfig, const char *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 97dae5c2c39..0536b4aba07 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, std::string tag, device_t *owner, UINT32 clock) +softbox_device::softbox_device(const machine_config &mconfig, const char *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 122638fa04f..d8de28d031c 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, std::string tag, device_t *owner, UINT32 clock); + softbox_device(const machine_config &mconfig, const char *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 abb41dd073f..cea944b9eaf 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, std::string tag, device_t *owner, UINT32 clock) : +imi5000h_device::imi5000h_device(const machine_config &mconfig, const char *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 1f748388e8e..cb37319f6c1 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, std::string tag, device_t *owner, UINT32 clock); + imi5000h_device(const machine_config &mconfig, const char *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 01101cceeb5..8d6baaf0ef1 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, std::string tag, device_t *owner, UINT32 clock) : +imi7000_slot_device::imi7000_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +imi7000_bus_device::imi7000_bus_device(const machine_config &mconfig, const char *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 5f9ba38a72a..e374fedb6d9 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, std::string tag, device_t *owner, UINT32 clock); + imi7000_bus_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + imi7000_slot_device(const machine_config &mconfig, const char *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 4f619f3ed3c..b855bb73143 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +intv_ecs_device::intv_ecs_device(const machine_config &mconfig, const char *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 7057e9429de..3dc2f37e7b6 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, std::string tag, device_t *owner, UINT32 clock); + intv_ecs_device(const machine_config &mconfig, const char *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 c037fe3bbac..74b5664a6fc 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; const device_type INTV_ROM_WSMLB = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +intv_rom_device::intv_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +intv_ram_device::intv_ram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +intv_gfact_device::intv_gfact_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +intv_wsmlb_device::intv_wsmlb_device(const machine_config &mconfig, const char *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 887c67f0ea8..ec1b153071d 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + intv_ram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + intv_gfact_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/intv/slot.cpp b/src/devices/bus/intv/slot.cpp index 55fcc4a834e..87f36e14bac 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, std::string tag) +void device_intv_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +intv_cart_slot_device::intv_cart_slot_device(const machine_config &mconfig, const char *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 b5b77544df6..7d970f18a52 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + intv_cart_slot_device(const machine_config &mconfig, const char *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 d60bc7c82b3..ea2c7db82f4 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +intv_voice_device::intv_voice_device(const machine_config &mconfig, const char *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 5bba4e23c27..0301c6d67b0 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, std::string tag, device_t *owner, UINT32 clock); + intv_voice_device(const machine_config &mconfig, const char *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 c6ffb3251e1..ba2cbf36137 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 - constructor //------------------------------------------------- -iq151_disc2_device::iq151_disc2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iq151_disc2_device::iq151_disc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_DISC2, "IQ151 Disc2", tag, owner, clock, "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 40a4e8da827..37bb1c7c26d 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, std::string tag, device_t *owner, UINT32 clock); + iq151_disc2_device(const machine_config &mconfig, const char *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 99ae6859e5b..4d4a5f93bef 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 - constructor //------------------------------------------------- -iq151_grafik_device::iq151_grafik_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iq151_grafik_device::iq151_grafik_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_GRAFIK, "IQ151 grafik", tag, owner, clock, "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 61479a37e6f..47a6287ec91 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, std::string tag, device_t *owner, UINT32 clock); + iq151_grafik_device(const machine_config &mconfig, const char *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 07a89d1bb36..3d4ef7abe05 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, std::string tag, device_t *owner, UINT32 clock) : +iq151cart_slot_device::iq151cart_slot_device(const machine_config &mconfig, const char *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 003624480d4..292362f0d45 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, std::string tag, device_t *owner, UINT32 clock); + iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~iq151cart_slot_device(); template static devcb_base &set_out_irq0_callback(device_t &device, _Object object) { return downcast(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 806bd83b64a..1a8e9d182a0 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 - constructor //------------------------------------------------- -iq151_minigraf_device::iq151_minigraf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iq151_minigraf_device::iq151_minigraf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_MINIGRAF, "IQ151 Minigraf", tag, owner, clock, "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 0e649aa0673..6632fa31aa4 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, std::string tag, device_t *owner, UINT32 clock); + iq151_minigraf_device(const machine_config &mconfig, const char *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 b7812c65334..99da92c6d61 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 - constructor //------------------------------------------------- -iq151_ms151a_device::iq151_ms151a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iq151_ms151a_device::iq151_ms151a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_MS151A, "IQ151 MS151A", tag, owner, clock, "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 5db01006c3a..1d794e1081d 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, std::string tag, device_t *owner, UINT32 clock); + iq151_ms151a_device(const machine_config &mconfig, const char *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 d6e0d025144..3229e2ac2f8 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_rom_device - constructor //------------------------------------------------- -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) : +iq151_rom_device::iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_iq151cart_interface(mconfig, *this), 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, std::string tag, device_t *owner, UINT32 clock) +iq151_basic6_device::iq151_basic6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : iq151_rom_device(mconfig, IQ151_BASIC6, "IQ151 BASIC6", tag, owner, clock, "iq151_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, std::string tag, device_t *owner, UINT32 clock) +iq151_basicg_device::iq151_basicg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : iq151_rom_device(mconfig, IQ151_BASICG, "IQ151 BASICG", tag, owner, clock, "iq151_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, std::string tag, device_t *owner, UINT32 clock) +iq151_amos1_device::iq151_amos1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : iq151_rom_device(mconfig, IQ151_AMOS1, "IQ151 AMOS cart 1", tag, owner, clock, "iq151_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, std::string tag, device_t *owner, UINT32 clock) +iq151_amos2_device::iq151_amos2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : iq151_rom_device(mconfig, IQ151_AMOS2, "IQ151 AMOS cart 2", tag, owner, clock, "iq151_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, std::string tag, device_t *owner, UINT32 clock) +iq151_amos3_device::iq151_amos3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : iq151_rom_device(mconfig, IQ151_AMOS3, "IQ151 AMOS cart 3", tag, owner, clock, "iq151_amos3", __FILE__), m_active(true) { diff --git a/src/devices/bus/iq151/rom.h b/src/devices/bus/iq151/rom.h index c9ef60c7a0a..b1c5a42cc22 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual const rom_entry *device_rom_region() const override; @@ -44,7 +44,7 @@ class iq151_basic6_device : { public: // construction/destruction - iq151_basic6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + iq151_basic6_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + iq151_basicg_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + iq151_amos1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + iq151_amos2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + iq151_amos3_device(const machine_config &mconfig, const char *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 9876c0cb918..9bd55c4d986 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 - constructor //------------------------------------------------- -iq151_staper_device::iq151_staper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iq151_staper_device::iq151_staper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_STAPER, "IQ151 STAPER", tag, owner, clock, "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 5569c6f109d..426f87116f0 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, std::string tag, device_t *owner, UINT32 clock); + iq151_staper_device(const machine_config &mconfig, const char *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 1f3e0d187d1..a5ce59a51db 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 - constructor //------------------------------------------------- -iq151_video32_device::iq151_video32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iq151_video32_device::iq151_video32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_VIDEO32, "IQ151 video32", tag, owner, clock, "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 4c789edcc57..d8b3a1e93eb 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, std::string tag, device_t *owner, UINT32 clock); + iq151_video32_device(const machine_config &mconfig, const char *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 03c2161d815..d58cca76aec 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 - constructor //------------------------------------------------- -iq151_video64_device::iq151_video64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iq151_video64_device::iq151_video64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IQ151_VIDEO64, "IQ151 video64", tag, owner, clock, "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 df3a9ace45b..0162e107e31 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, std::string tag, device_t *owner, UINT32 clock); + iq151_video64_device(const machine_config &mconfig, const char *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 2138662060d..f0522e7fdbd 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, std::string tag, device_t* owner, UINT32 clock) +el2_3c503_device::el2_3c503_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : device_t(mconfig, EL2_3C503, "3C503 Network Adapter", tag, owner, clock, "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 75303641cf8..5a31c2948fe 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, std::string tag, device_t *owner, UINT32 clock); + el2_3c503_device(const machine_config &mconfig, const char *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 d7bff0f5442..2cb640e91d5 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 - constructor //------------------------------------------------- -threecom3c505_device::threecom3c505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +threecom3c505_device::threecom3c505_device(const machine_config &mconfig, const char *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, std::s { } -threecom3c505_device::threecom3c505_device(const machine_config &mconfig, device_type type, std::string tag, device_t *owner, UINT32 clock) +threecom3c505_device::threecom3c505_device(const machine_config &mconfig, device_type type, const char *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().c_str(), - cpu->safe_pcbase(), tag().c_str()); + sprintf(statebuf, "%d.%03d %s pc=%08x - %s", s, ms, cpu->tag(), + cpu->safe_pcbase(), tag()); } else { diff --git a/src/devices/bus/isa/3c505.h b/src/devices/bus/isa/3c505.h index 3095dc4eae9..e31317792da 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, 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); + 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); // 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 59a573ac359..42e2afd9604 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, std::string tag, device_t *owner, UINT32 clock) +isa8_adlib_device::isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_ADLIB, "Ad Lib Sound Card", tag, owner, clock, "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 cc4b2d87a24..da22516fd72 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, std::string tag, device_t *owner, UINT32 clock); + isa8_adlib_device(const machine_config &mconfig, const char *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 ce3194ad28f..9146f2ce581 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 - constructor //------------------------------------------------- -isa8_aga_device::isa8_aga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_aga_device::isa8_aga_device(const machine_config &mconfig, const char *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, std::string tag, { } -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) : +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) : 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 - constructor //------------------------------------------------- -isa8_aga_pc200_device::isa8_aga_pc200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_aga_pc200_device::isa8_aga_pc200_device(const machine_config &mconfig, const char *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 e9a312f4569..c0c80ac29bb 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + isa8_aga_pc200_device(const machine_config &mconfig, const char *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 1faebfc73ee..cc557c47eaa 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, std::string tag, device_t *owner, UINT32 clock) : +aha1542_device::aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, AHA1542, "AHA1542 SCSI Controller", tag, owner, clock, "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 428a48c7185..ecbe2f158d2 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, std::string tag, device_t *owner, UINT32 clock); + aha1542_device(const machine_config &mconfig, const char *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 0adbdee5758..888318f65d7 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, std::string tag, device_t *owner, UINT32 clock) : +isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_CGA, "IBM Color/Graphics Monitor Adapter", tag, owner, clock, "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, std::string tag, m_superimpose = false; } -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) : +isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_cga_config(*this, "cga_config"), m_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 - constructor //------------------------------------------------- -isa8_cga_poisk2_device::isa8_cga_poisk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_cga_poisk2_device::isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_CGA_POISK2, "ISA8_CGA_POISK2", tag, owner, clock, "cga_poisk2", __FILE__) { m_chr_gen_offset[0] = 0x0000; @@ -472,13 +472,13 @@ const device_type ISA8_CGA_SUPERIMPOSE = &device_creator; // isa8_wyse700_device - constructor //------------------------------------------------- -isa8_wyse700_device::isa8_wyse700_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_wyse700_device::isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_WYSE700, "Wyse 700", tag, owner, clock, "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 - constructor //------------------------------------------------- -isa8_ec1841_0002_device::isa8_ec1841_0002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_ec1841_0002_device::isa8_ec1841_0002_device(const machine_config &mconfig, const char *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 - constructor //------------------------------------------------- -isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_CGA_MC1502, "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 - constructor //------------------------------------------------- -isa8_cga_iskr1031_device::isa8_cga_iskr1031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_cga_iskr1031_device::isa8_cga_iskr1031_device(const machine_config &mconfig, const char *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; -dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : +dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, const char* 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 b0908cd4428..5d9d11f44ca 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, std::string tag, device_t *owner, UINT32 clock); + dectalk_isa_device(const machine_config &mconfig, const char *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 59e82fcbb8a..85d943b92ac 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, std::string tag, device_t *owner, UINT32 clock) : +isa8_ega_device::isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_EGA, "IBM Enhanced Graphics Adapter", tag, owner, clock, "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, std::string tag, { } -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) : +isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_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 6edb0dba81a..99dac11e1aa 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, 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); + 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); // 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 4bf1b974227..a7698784a26 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), fdc(*this, "fdc") @@ -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, 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__) +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__) { } @@ -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, 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__) +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__) { } @@ -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, 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__) +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__) { } @@ -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, 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__) +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__) { } @@ -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, 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__) +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__) { } diff --git a/src/devices/bus/isa/fdc.h b/src/devices/bus/isa/fdc.h index 3a2c85b7d01..1848df8cd0a 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); required_device fdc; @@ -46,31 +46,31 @@ protected: class isa8_fdc_xt_device : public isa8_fdc_device { public: - isa8_fdc_xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_fdc_xt_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa8_fdc_at_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa8_fdc_smc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa8_fdc_ps2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa8_fdc_superio_device(const machine_config &mconfig, const char *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 0e19e95a865..94601de84da 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, std::string tag, device_t *owner, UINT32 clock) +isa8_finalchs_device::isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_FINALCHS, "Final Chess Card", tag, owner, clock, "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 43eba15911d..b964310b6ba 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, std::string tag, device_t *owner, UINT32 clock); + isa8_finalchs_device(const machine_config &mconfig, const char *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 da40cafc8b5..22cb5edd328 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, std::string tag, device_t *owner, UINT32 clock) : +isa8_gblaster_device::isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_GAME_BLASTER, "Game Blaster Sound Card", tag, owner, clock, "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 93522760e0d..7dad823033a 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, std::string tag, device_t *owner, UINT32 clock); + isa8_gblaster_device(const machine_config &mconfig, const char *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 28d790d81f8..2928aaa252c 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, std::string tag, device_t *owner, UINT32 clock) : +gf1_device::gf1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +isa16_gus_device::isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_GUS, "Gravis Ultrasound", tag, owner, clock, "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 3626e645963..eb4413d3bd8 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, std::string tag, device_t *owner, UINT32 clock); + gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_txirq_handler(device_t &device, _Object object) { return downcast(device).m_txirq_handler.set_callback(object); } template static devcb_base &set_rxirq_handler(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + isa16_gus_device(const machine_config &mconfig, const char *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 6bf46ee72c0..7708d341abd 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; const device_type EC1841_HDC = &device_creator; const device_type ST11M_HDC = &device_creator; -xt_hdc_device::xt_hdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *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, std::string tag, dev m_type = STANDARD; } -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) : +ec1841_device::ec1841_device(const machine_config &mconfig, const char *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, std::string tag, dev m_type = EC1841; } -st11m_device::st11m_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +st11m_device::st11m_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_HDC, "Fixed Disk Controller Card", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_hdc(*this,"hdc"), dip(0) { } -isa8_hdc_ec1841_device::isa8_hdc_ec1841_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_hdc_ec1841_device::isa8_hdc_ec1841_device(const machine_config &mconfig, const char *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 afd8c46e0b8..994af2ea3ba 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, 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); + 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); template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } template static devcb_base &set_drq_handler(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + ec1841_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + st11m_device(const machine_config &mconfig, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + isa8_hdc_ec1841_device(const machine_config &mconfig, const char *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 9be7925d652..b6445c9385f 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, std::string tag, device_t *owner, UINT32 clock) : +isa8_ibm_mfc_device::isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_IBM_MFC, "IBM PC Music Feature Card", tag, owner, clock, "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 cbfb00d506a..4a86972d838 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, std::string tag, device_t *owner, UINT32 clock); + isa8_ibm_mfc_device(const machine_config &mconfig, const char *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 c62ec060a2e..be638b76a7f 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, std::string tag, device_t *owner, UINT32 clock) +isa16_ide_device::isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_IDE, "IDE Fixed Drive Adapter", tag, owner, clock, "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 cc4d8ae4c07..7a59e15da20 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, std::string tag, device_t *owner, UINT32 clock); + isa16_ide_device(const machine_config &mconfig, const char *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 308d5c487a9..0d8f0c777e1 100644 --- a/src/devices/bus/isa/isa.cpp +++ b/src/devices/bus/isa/isa.cpp @@ -24,16 +24,17 @@ const device_type ISA8_SLOT = &device_creator; //------------------------------------------------- // isa8_slot_device - constructor //------------------------------------------------- -isa8_slot_device::isa8_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *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_owner(nullptr), + m_isa_tag(nullptr) { } -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) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this), m_owner(nullptr) + device_slot_interface(mconfig, *this), m_owner(nullptr), m_isa_tag(nullptr) { } @@ -73,7 +74,7 @@ const device_type ISA16_SLOT = &device_creator; //------------------------------------------------- // isa16_slot_device - constructor //------------------------------------------------- -isa16_slot_device::isa16_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa16_slot_device::isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_slot_device(mconfig, ISA16_SLOT, "ISA16_SLOT", tag, owner, clock, "isa16_slot", __FILE__) { } @@ -102,7 +103,7 @@ void isa16_slot_device::device_start() const device_type ISA8 = &device_creator; -void isa8_device::static_set_cputag(device_t &device, std::string tag) +void isa8_device::static_set_cputag(device_t &device, const char *tag) { isa8_device &isa = downcast(device); isa.m_cputag = tag; @@ -134,7 +135,7 @@ void isa8_device::device_config_complete() // isa8_device - constructor //------------------------------------------------- -isa8_device::isa8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_device::isa8_device(const machine_config &mconfig, const char *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), @@ -149,7 +150,7 @@ isa8_device::isa8_device(const machine_config &mconfig, std::string tag, device_ m_out_irq7_cb(*this), m_out_drq1_cb(*this), m_out_drq2_cb(*this), - m_out_drq3_cb(*this), + m_out_drq3_cb(*this), m_cputag(nullptr), m_write_iochck(*this) { for(int i=0;i<8;i++) @@ -162,7 +163,7 @@ isa8_device::isa8_device(const machine_config &mconfig, std::string tag, device_ m_allocspaces = false; } -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) : +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) : 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), @@ -177,7 +178,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_out_drq3_cb(*this), m_cputag(nullptr), m_write_iochck(*this) { for(int i=0;i<8;i++) @@ -319,7 +320,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, std::string tag, UINT8 *data) +void isa8_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) { m_prgspace->install_readwrite_bank(start, end, mask, mirror, tag ); machine().root_device().membank(tag)->set_base(data); @@ -330,7 +331,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, std::string tag, const char *region) +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) { if (machine().root_device().memregion("isa")) { UINT8 *src = dev->memregion(region)->base(); @@ -461,7 +462,7 @@ const device_type ISA16 = &device_creator; // isa16_device - constructor //------------------------------------------------- -isa16_device::isa16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa16_device::isa16_device(const machine_config &mconfig, const char *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 5c8ee7a3151..a93fddd6acb 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, 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); + 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); // 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, 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); + 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); // inline configuration - static void static_set_cputag(device_t &device, std::string tag); + static void static_set_cputag(device_t &device, const char *tag); static void static_set_custom_spaces(device_t &device); template void set_iochck_callback(_iochck iochck) { m_write_iochck.set_callback(iochck); } template static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast(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, 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_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_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]; - std::string m_cputag; + const char *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, std::string tag, device_t *owner, UINT32 clock); + isa16_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_irq10_callback(device_t &device, _Object object) { return downcast(device).m_out_irq10_cb.set_callback(object); } template static devcb_base &set_out_irq11_callback(device_t &device, _Object object) { return downcast(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 2d3bf079aea..1baa190b034 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_LPT, "Printer Adapter", tag, owner, clock, "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 12f8b7a4698..6626198b430 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, std::string tag, device_t *owner, UINT32 clock); + isa8_lpt_device(const machine_config &mconfig, const char *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 51054d22fee..f041455a9ad 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; */ // 8514/A device -mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +mach32_device::mach32_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +mach64_device::mach64_device(const machine_config &mconfig, const char *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, std::string 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, const char *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 52758769a75..4f57f55faf9 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, 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); + 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); 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, 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); + 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); required_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, 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); + 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); 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, 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); + 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); required_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 f60ff49ebd5..0a482f3a3f9 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, std::string tag, device_t *owner, UINT32 clock) : +mc1502_fdc_device::mc1502_fdc_device(const machine_config &mconfig, const char *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 baed65dca9e..c254aa3b791 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, std::string tag, device_t *owner, UINT32 clock); + mc1502_fdc_device(const machine_config &mconfig, const char *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 7bf8009a424..9a12c5ec712 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, std::string tag, device_t *owner, UINT32 clock) : +mc1502_rom_device::mc1502_rom_device(const machine_config &mconfig, const char *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 bcaa7da17a4..d4423247991 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, std::string tag, device_t *owner, UINT32 clock); + mc1502_rom_device(const machine_config &mconfig, const char *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 3cebdb0db0b..c8456886f02 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, std::string tag, device_t *owner, UINT32 clock) : +isa8_mda_device::isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_MDA, "IBM Monochrome Display and Printer Adapter", tag, owner, clock, "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, std::string tag, { } -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) : +isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_isa8_card_interface(mconfig, *this), m_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, std::string tag, device_t *owner, UINT32 clock) : +isa8_hercules_device::isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_mda_device(mconfig, ISA8_HERCULES, "Hercules Graphics Card", tag, owner, clock, "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, std::string tag, device_t *owner, UINT32 clock) : +isa8_ec1840_0002_device::isa8_ec1840_0002_device(const machine_config &mconfig, const char *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 dc0edb10927..c6cf72b29ad 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + isa8_hercules_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa8_ec1840_0002_device(const machine_config &mconfig, const char *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 612bbd848ee..420a753b750 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, std::string tag, device_t *owner, UINT32 clock) +isa8_mpu401_device::isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_MPU401, "Roland MPU-401 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 3274f5b4f1e..cdf70fe2acf 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, std::string tag, device_t *owner, UINT32 clock); + isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_mpu401; diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp index 585b1e25ed4..bb1b6fc8af4 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, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname) : +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) : 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, std: { } -fdc344_device::fdc344_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +fdc344_device::fdc344_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +fdcmag_device::fdcmag_device(const machine_config &mconfig, const char *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 0897d85a964..976558e90cd 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, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname); + mufdc_device(const machine_config &mconfig, device_type type, const char *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, std::string tag, device_t *owner, UINT32 clock); + fdc344_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + fdcmag_device(const machine_config &mconfig, const char *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 f6b51a1d145..65ee0019430 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, std::string tag, device_t *owner, UINT32 clock) +ne1000_device::ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NE1000, "NE1000 Network Adapter", tag, owner, clock, "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 2154777a93d..96f98673477 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, std::string tag, device_t *owner, UINT32 clock); + ne1000_device(const machine_config &mconfig, const char *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 34767447e0c..3937e14a920 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, std::string tag, device_t* owner, UINT32 clock) +ne2000_device::ne2000_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : device_t(mconfig, NE2000, "NE2000 Network Adapter", tag, owner, clock, "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 15665ab220c..ac7d56772a7 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, std::string tag, device_t *owner, UINT32 clock); + ne2000_device(const machine_config &mconfig, const char *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 28070986816..3ed1967df06 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, std::string tag, device_t *owner, UINT32 clock) : +isa8_number_9_rev_device::isa8_number_9_rev_device(const machine_config &mconfig, const char *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 8ddfb404acd..bf185d5eb62 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, std::string tag, device_t *owner, UINT32 clock); + isa8_number_9_rev_device(const machine_config &mconfig, const char *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 c0db457dbd0..5f42c31200b 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, std::string tag, device_t *owner, UINT32 clock); + omti_disk_image_device(const machine_config &mconfig, const char *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().c_str(), - cpu->safe_pcbase(), device->tag().c_str()); + sprintf(statebuf, "%d.%03d %s pc=%08x - %s", s, ms, cpu->tag(), + cpu->safe_pcbase(), device->tag()); } 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +omti8621_pc_device::omti8621_pc_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +omti8621_apollo_device::omti8621_apollo_device(const machine_config &mconfig, const char *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,std::string tag, device_t *owner, UINT32 clock) +omti8621_device::omti8621_device(const machine_config &mconfig, device_type type,const char *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("%s",text.c_str()); + logerror(text.c_str()); } } @@ -813,7 +813,7 @@ void omti8621_device::log_data() text += " ..."; } text += "\n"; - logerror("%s",text.c_str()); + logerror(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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, const char *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 f5a9e2934ce..04dff836316 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, std::string tag, device_t *owner, UINT32 clock); + omti8621_device(const machine_config &mconfig, device_type type, const char *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, std::string tag, device_t *owner, UINT32 clock); + omti8621_pc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + omti8621_apollo_device(const machine_config &mconfig, const char *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 11e07cfdd3e..4ba01ed47da 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, std::string tag, device_t *owner, UINT32 clock) : +p1_fdc_device::p1_fdc_device(const machine_config &mconfig, const char *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 87f604f0f7e..f40748085d8 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, std::string tag, device_t *owner, UINT32 clock); + p1_fdc_device(const machine_config &mconfig, const char *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 4f8c691d7a4..eb8d68524eb 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, std::string tag, device_t *owner, UINT32 clock) : +p1_hdc_device::p1_hdc_device(const machine_config &mconfig, const char *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 1236c71e6a1..7d4e0af3486 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, std::string tag, device_t *owner, UINT32 clock); + p1_hdc_device(const machine_config &mconfig, const char *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 7c92e76bb82..bd078972a04 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, std::string tag, device_t *owner, UINT32 clock) : +p1_rom_device::p1_rom_device(const machine_config &mconfig, const char *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 86422f4fff2..4d0cffcbaea 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, std::string tag, device_t *owner, UINT32 clock); + p1_rom_device(const machine_config &mconfig, const char *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 519c1f57d75..05c989fcbe1 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, std::string tag, device_t *owner, UINT32 clock) +isa8_pc1640_iga_device::isa8_pc1640_iga_device(const machine_config &mconfig, const char *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 04485b48799..c0e055b7424 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, std::string tag, device_t *owner, UINT32 clock); + isa8_pc1640_iga_device(const machine_config &mconfig, const char *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 fdaf1cab944..235e0acdd02 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +isa8_pds_device::isa8_pds_device(const machine_config &mconfig, const char *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 20bddb8c1de..eb98c3abb83 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, std::string tag, device_t *owner, UINT32 clock); + isa8_pds_device(const machine_config &mconfig, const char *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 2c7484f584d..c22631d405b 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, std::string tag, device_t *owner, UINT32 clock) : +isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, const char *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, std::string tag, { } -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) : +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) : 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 d86084ec61c..cf83eb8ae1d 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, 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); + 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); // 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 2d3950e678c..965e47e50f0 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; const device_type S3VIRGEDX = &device_creator; const device_type S3VIRGEDX1 = &device_creator; -s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +s3virgedx_rev1_vga_device::s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *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 4a7bad4b8c2..1b7f6796e95 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, 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); + 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); 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *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 fe23a851278..87c09592b6d 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, std::string tag, device_t *owner, UINT32 clock) : +sb16_lle_device::sb16_lle_device(const machine_config &mconfig, const char *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 db5dce31d34..ff4c8a4a8f0 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, std::string tag, device_t *owner, UINT32 clock); + sb16_lle_device(const machine_config &mconfig, const char *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 f416f10e4a4..6895716c7af 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_serial_interface(mconfig, *this), m_dacl(*this, "sbdacl"), @@ -1111,14 +1111,14 @@ sb_device::sb_device(const machine_config &mconfig, device_type type, std::strin { } -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) : +sb8_device::sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) : sb_device(mconfig, type, tag, owner, clock, name, shortname, source), device_isa8_card_interface(mconfig, *this), m_ym3812(*this, "ym3812") { } -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) : +sb16_device::sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) : sb_device(mconfig, type, tag, owner, clock, name, shortname, source), device_isa16_card_interface(mconfig, *this) { @@ -1128,19 +1128,19 @@ sb16_device::sb16_device(const machine_config &mconfig, device_type type, std::s // isa8_sblaster_device - constructor //------------------------------------------------- -isa8_sblaster1_0_device::isa8_sblaster1_0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_sblaster1_0_device::isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sb8_device(mconfig, ISA8_SOUND_BLASTER_1_0, tag, owner, clock, "Sound Blaster 1.0", "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, std::string tag, device_t *owner, UINT32 clock) : +isa8_sblaster1_5_device::isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sb8_device(mconfig, ISA8_SOUND_BLASTER_1_5, tag, owner, clock, "Sound Blaster 1.5", "isa_sblaster1_5", __FILE__) { } -isa16_sblaster16_device::isa16_sblaster16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa16_sblaster16_device::isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sb16_device(mconfig, ISA16_SOUND_BLASTER_16, tag, owner, clock, "Sound Blaster 16", "isa_sblaster_16", __FILE__) { } diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h index 01c3921244b..25bdc0f4b56 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, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); + sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); required_device m_dacl; required_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, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + isa8_sblaster1_0_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa8_sblaster1_5_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); + sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source); DECLARE_READ8_MEMBER(mpu401_r); DECLARE_WRITE8_MEMBER(mpu401_w); DECLARE_READ8_MEMBER(mixer_r); @@ -237,7 +237,7 @@ class isa16_sblaster16_device : public sb16_device { public: // construction/destruction - isa16_sblaster16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa16_sblaster16_device(const machine_config &mconfig, const char *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 620524c5f14..4effacb3394 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 - constructor //------------------------------------------------- -sc499_device::sc499_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sc499_device::sc499_device(const machine_config &mconfig, const char *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().c_str()); + sprintf(statebuf, "%d.%03d%s:", s, ms, tag()); 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig, const char *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 75f24f2090c..8c63f810073 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, std::string tag, device_t *owner, UINT32 clock); + sc499_ctape_image_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sc499_device(const machine_config &mconfig, const char *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 cca754454f0..460ee5f54fd 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, std::string tag, device_t *owner, UINT32 clock) : +side116_device::side116_device(const machine_config &mconfig, const char *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 92c5e8981fe..1c9592de531 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, std::string tag, device_t *owner, UINT32 clock); + side116_device(const machine_config &mconfig, const char *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 7ff98721b15..4a77e870190 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, std::string tag, device_t *owner, UINT32 clock) : +ssi2001_device::ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_SSI2001, "Innovation SSI-2001 Audio Adapter", tag, owner, clock, "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 808d6dab6f3..8a58cbb8bf8 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, std::string tag, device_t *owner, UINT32 clock); + ssi2001_device(const machine_config &mconfig, const char *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 a1a968119eb..b730ad3a670 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, std::string tag, device_t *owner, UINT32 clock) : +stereo_fx_device::stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_STEREO_FX, "ATI Stereo F/X Audio Adapter", tag, owner, clock, "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 5c2c5b39afc..9ec059a2640 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, std::string tag, device_t *owner, UINT32 clock); + stereo_fx_device(const machine_config &mconfig, const char *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 c49114187da..3e6f6ca1196 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, std::string tag, device_t *owner, UINT32 clock) : +isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *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 1a1357ae783..a26e9503e1b 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, std::string tag, device_t *owner, UINT32 clock); + isa16_svga_cirrus_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *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 dd234f4a1c2..f4874db3fc9 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, std::string tag, device_t *owner, UINT32 clock) : +isa16_svga_s3_device::isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_SVGA_S3, "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, std::string tag, device_t *owner, UINT32 clock) : +isa16_s3virge_device::isa16_s3virge_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +isa16_s3virgedx_device::isa16_s3virgedx_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +isa16_stealth3d2kpro_device::isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *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 b066e5d33b6..fba9bfd6769 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, std::string tag, device_t *owner, UINT32 clock); + isa16_svga_s3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa16_s3virge_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa16_s3virgedx_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *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 2dece3d3d5e..ded9d629fe3 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, std::string tag, device_t *owner, UINT32 clock) : +isa16_svga_tgui9680_device::isa16_svga_tgui9680_device(const machine_config &mconfig, const char *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 79bd48ae17c..7ce5479735b 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, std::string tag, device_t *owner, UINT32 clock); + isa16_svga_tgui9680_device(const machine_config &mconfig, const char *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 1c39cefbefd..6fff06c78ad 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, std::string tag, device_t *owner, UINT32 clock) : +isa8_svga_et4k_device::isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_SVGA_ET4K, "SVGA Tseng ET4000 Graphics Card", tag, owner, clock, "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 3ae2089f3b4..4762fed3ec0 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, std::string tag, device_t *owner, UINT32 clock); + isa8_svga_et4k_device(const machine_config &mconfig, const char *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 4ea0bba34a3..4f47bdd7212 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; #define LOG (1) #define LOG_ACCEL (1) -trident_vga_device::trident_vga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +trident_vga_device::trident_vga_device(const machine_config &mconfig, const char *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 727ff46795a..db470ec2838 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, std::string tag, device_t *owner, UINT32 clock); + trident_vga_device(const machine_config &mconfig, const char *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 4f6fd2bec92..390834c8d5b 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, std::string tag, device_t *owner, UINT32 clock) : +isa8_vga_device::isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_VGA, "IBM VGA Graphics Card", tag, owner, clock, "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 1281992fb65..4707b3c0d61 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, std::string tag, device_t *owner, UINT32 clock); + isa8_vga_device(const machine_config &mconfig, const char *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 64184b877df..490a26dc90c 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, std::string tag, device_t *owner, UINT32 clock) : +isa16_vga_gfxultra_device::isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA16_VGA_GFXULTRA, "ATi Graphics Ultra 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, std::string tag, device_t *owner, UINT32 clock) : +isa16_vga_gfxultrapro_device::isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +isa16_vga_mach64_device::isa16_vga_mach64_device(const machine_config &mconfig, const char *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 a9df5c92fcb..616667ef17b 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, std::string tag, device_t *owner, UINT32 clock); + isa16_vga_gfxultra_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + isa16_vga_mach64_device(const machine_config &mconfig, const char *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 6515d3981e3..29df9cec729 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, std::string tag, device_t *owner, UINT32 clock) +isa8_wd1002a_wx1_device::isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *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 645be0521f0..86715ed367e 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, std::string tag, device_t *owner, UINT32 clock); + isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *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 1276b42f444..abd262cd918 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, std::string tag, device_t *owner, UINT32 clock) +wdxt_gen_device::wdxt_gen_device(const machine_config &mconfig, const char *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 04f0058265e..5185b2d8def 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, std::string tag, device_t *owner, UINT32 clock); + wdxt_gen_device(const machine_config &mconfig, const char *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 a08b5e56809..fcd0750e5a3 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, std::string tag, device_t *owner, UINT32 clock) +xtide_device::xtide_device(const machine_config &mconfig, const char *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 faff6ea91eb..a8113ebe9db 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, std::string tag, device_t *owner, UINT32 clock); + xtide_device(const machine_config &mconfig, const char *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 99a637dc57e..2718f57c78f 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, std::string tag, device_t *owner, UINT32 clock) : +compis_fdc_device::compis_fdc_device(const machine_config &mconfig, const char *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 044f154fcd0..d97bc4eb468 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, std::string tag, device_t *owner, UINT32 clock); + compis_fdc_device(const machine_config &mconfig, const char *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 47e697a9185..bb1eea2b194 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, std::string tag, device_t *owner, UINT32 clock) : +isbc_218a_device::isbc_218a_device(const machine_config &mconfig, const char *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 0c502f86043..5fc354a725f 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, std::string tag, device_t *owner, UINT32 clock); + isbc_218a_device(const machine_config &mconfig, const char *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 083bc3db427..e71aa5e5454 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, std::string tag, device_t *owner, UINT32 clock) : +isbx_slot_device::isbx_slot_device(const machine_config &mconfig, const char *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 a2663eba73c..cb90fbd27b1 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, std::string tag, device_t *owner, UINT32 clock); + isbx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template void set_mintr0_callback(_mintr0 mintr0) { m_write_mintr0.set_callback(mintr0); } template 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 fcebf8be39e..fdb36a8c34d 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 - constructor //------------------------------------------------- -kc_d002_device::kc_d002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kc_d002_device::kc_d002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KC_D002, "D002 Bus Driver", tag, owner, clock, "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 2a8c2c11d8b..00c85448643 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, std::string tag, device_t *owner, UINT32 clock); + kc_d002_device(const machine_config &mconfig, const char *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 661f7a56359..4895c5419c4 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_device - constructor //------------------------------------------------- -kc_d004_device::kc_d004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kc_d004_device::kc_d004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KC_D004, "D004 Floppy Disk Interface", tag, owner, clock, "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, std::string tag, d { } -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) +kc_d004_device::kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_kcexp_interface( mconfig, *this ), m_cpu(*this, Z80_TAG), @@ -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, std::string tag, device_t *owner, UINT32 clock) +kc_d004_gide_device::kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : kc_d004_device(mconfig, KC_D004, "D004 Floppy Disk + GIDE Interface", tag, owner, clock, "kc_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().c_str(), rtc_addr); + logerror("GIDE %s read RTC 0x%02x\n", tag(), 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().c_str(), rtc_addr, data); + logerror("GIDE %s wrire RTC 0x%02x 0x%02x\n", tag(), rtc_addr, data); } else { diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h index 4ce9ad0d15f..ceb0a848876 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + kc_d004_gide_device(const machine_config &mconfig, const char *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 c58179df7c9..a5a46802998 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, std::string tag, device_t *owner, UINT32 clock) : +kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, const char *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(nullptr) + m_out_halt_cb(*this), m_cart(nullptr), m_next_slot_tag(nullptr), m_next_slot(nullptr) { } -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) : +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) : 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(nullptr) + m_out_halt_cb(*this), m_cart(nullptr), m_next_slot_tag(nullptr), m_next_slot(nullptr) { } -void kcexp_slot_device::static_set_next_slot(device_t &device, std::string next_slot_tag) +void kcexp_slot_device::static_set_next_slot(device_t &device, const char *next_slot_tag) { kcexp_slot_device &kc_slot = dynamic_cast(device); @@ -193,7 +193,7 @@ kcexp_slot_device::~kcexp_slot_device() void kcexp_slot_device::device_start() { m_cart = dynamic_cast(get_card_device()); - m_next_slot = !m_next_slot_tag.empty() ? owner()->subdevice(m_next_slot_tag) : nullptr; + m_next_slot = m_next_slot_tag ? owner()->subdevice(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().c_str(), state != CLEAR_LINE ? "ASSERT": "CLEAR"); + if (LOG) logerror("KCEXP '%s': %s MEI line\n", tag(), 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().c_str(), state != CLEAR_LINE ? "ASSERT": "CLEAR"); + if (LOG) logerror("KCEXP '%s': %s MEO line\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) : +kccart_slot_device::kccart_slot_device(const machine_config &mconfig, const char *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 9b3d5bf489c..e31007ea85e 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, 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); + 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); virtual ~kcexp_slot_device(); template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(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, std::string next_module_tag); + static void static_set_next_slot(device_t &device, const char *next_module_tag); // reading and writing virtual UINT8 module_id_r(); @@ -72,7 +72,7 @@ public: device_kcexp_interface* m_cart; - std::string m_next_slot_tag; + const char* 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, std::string tag, device_t *owner, UINT32 clock); + kccart_slot_device(const machine_config &mconfig, const char *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 50f50be3efe..c10b99d0d70 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_m011_device - constructor //------------------------------------------------- -kc_m011_device::kc_m011_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kc_m011_device::kc_m011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KC_M011, "M011 64KB RAM", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_kcexp_interface( mconfig, *this ), m_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(owner()); - m_ram = machine().memory().region_alloc(tag().c_str(), get_ram_size(), 1, ENDIANNESS_LITTLE)->base(); + m_ram = machine().memory().region_alloc(tag(), 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, std::string tag, device_t *owner, UINT32 clock) +kc_m022_device::kc_m022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : kc_m011_device(mconfig, KC_M022, "M022 16KB RAM", tag, owner, clock, "kc_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, std::string tag, device_t *owner, UINT32 clock) +kc_m032_device::kc_m032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : kc_m011_device(mconfig, KC_M032, "M032 256KB segmented RAM", tag, owner, clock, "kc_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, std::string tag, device_t *owner, UINT32 clock) +kc_m034_device::kc_m034_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : kc_m011_device(mconfig, KC_M034, "M034 512KB segmented RAM", tag, owner, clock, "kc_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, std::string tag, device_t *owner, UINT32 clock) +kc_m035_device::kc_m035_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : kc_m011_device(mconfig, KC_M035, "M035 1MB segmented RAM", tag, owner, clock, "kc_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, std::string tag, device_t *owner, UINT32 clock) +kc_m036_device::kc_m036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : kc_m011_device(mconfig, KC_M036, "M036 128KB segmented RAM", tag, owner, clock, "kc_m036", __FILE__) { } diff --git a/src/devices/bus/kc/ram.h b/src/devices/bus/kc/ram.h index 83fbd778f35..0cc441a5fa0 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, 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); + 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); protected: // device-level overrides @@ -59,7 +59,7 @@ class kc_m022_device : { public: // construction/destruction - kc_m022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kc_m022_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + kc_m032_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + kc_m034_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + kc_m035_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + kc_m036_device(const machine_config &mconfig, const char *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 ec78ec3f198..404089110a0 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_8k_device - constructor //------------------------------------------------- -kc_8k_device::kc_8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kc_8k_device::kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KC_STANDARD, "Standard", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_kcexp_interface( mconfig, *this ), m_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, std::string tag, device_t *owner, UINT32 clock) +kc_m006_device::kc_m006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : kc_8k_device(mconfig, KC_M006, "M006 BASIC", tag, owner, clock, "kc_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, std::string tag, device_t *owner, UINT32 clock) +kc_m033_device::kc_m033_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : kc_8k_device(mconfig, KC_M033, "M033 TypeStar", tag, owner, clock, "kc_m033", __FILE__), m_bank(0) { } diff --git a/src/devices/bus/kc/rom.h b/src/devices/bus/kc/rom.h index 48ae2763f96..4310b98ea3b 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, 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); + 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); // optional information overrides @@ -56,7 +56,7 @@ class kc_m006_device : { public: // construction/destruction - kc_m006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kc_m006_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + kc_m033_device(const machine_config &mconfig, const char *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 61902a741c0..61cea36a3e9 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 - constructor //------------------------------------------------- -cirrus_device::cirrus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cirrus_device::cirrus_device(const machine_config &mconfig, const char *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 e62c49ea70e..9b06a0c7878 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, std::string tag, device_t *owner, UINT32 clock); + cirrus_device(const machine_config &mconfig, const char *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 3bb5db34ffe..9f5a9de2edd 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i82371ab_device::i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : southbridge_device(mconfig, I82371AB, "Intel 82371AB", tag, owner, clock, "i82371ab", __FILE__), pci_device_interface( mconfig, *this ) { diff --git a/src/devices/bus/lpci/i82371ab.h b/src/devices/bus/lpci/i82371ab.h index 54e24614b71..ec5ec8b3be2 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, std::string tag, device_t *owner, UINT32 clock); + i82371ab_device(const machine_config &mconfig, const char *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 0003690f8d2..de9cbc365e7 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i82371sb_device::i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : southbridge_device(mconfig, I82371SB, "Intel 82371SB", tag, owner, clock, "i82371sb", __FILE__), pci_device_interface( mconfig, *this ) { diff --git a/src/devices/bus/lpci/i82371sb.h b/src/devices/bus/lpci/i82371sb.h index 4c7d8048d3b..9e5b3c14b2a 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, std::string tag, device_t *owner, UINT32 clock); + i82371sb_device(const machine_config &mconfig, const char *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 82a519dbb57..e2c64f49473 100644 --- a/src/devices/bus/lpci/i82439tx.cpp +++ b/src/devices/bus/lpci/i82439tx.cpp @@ -16,9 +16,11 @@ const device_type I82439TX = &device_creator; -i82439tx_device::i82439tx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : northbridge_device(mconfig, I82439TX, "Intel 82439TX", tag, owner, clock, "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 1243f37f52c..a0179af8265 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, std::string tag, device_t *owner, UINT32 clock); + i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void static_set_cpu(device_t &device, std::string tag) { dynamic_cast(device).m_cpu_tag = tag; } - static void static_set_region(device_t &device, std::string tag) { dynamic_cast(device).m_region_tag = tag; } + static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast(device).m_cpu_tag = tag; } + static void static_set_region(device_t &device, const char *tag) { dynamic_cast(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: - std::string m_cpu_tag; - std::string m_region_tag; + const char *m_cpu_tag; + const char *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 1d3ac1b8f9a..74780b7159f 100644 --- a/src/devices/bus/lpci/mpc105.cpp +++ b/src/devices/bus/lpci/mpc105.cpp @@ -29,9 +29,10 @@ const device_type MPC105 = &device_creator; // mpc105_device - constructor //------------------------------------------------- -mpc105_device::mpc105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mpc105_device::mpc105_device(const machine_config &mconfig, const char *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 5d353737a9a..f890432dca4 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, std::string tag, device_t *owner, UINT32 clock); + mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void static_set_cpu(device_t &device, std::string tag) { dynamic_cast(device).m_cpu_tag = tag; } + static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast(device).m_cpu_tag = tag; } static void static_set_bank_base_default(device_t &device, int bank_base_default) { dynamic_cast(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: - std::string m_cpu_tag; + const char *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 c159ba8b313..ec5a0a8582a 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(*this, ":maincpu"), m_ram(*this, ":" RAM_TAG) diff --git a/src/devices/bus/lpci/northbridge.h b/src/devices/bus/lpci/northbridge.h index 2f76be6d457..73c21086b8f 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + northbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/lpci/pci.cpp b/src/devices/bus/lpci/pci.cpp index 848234d2241..aa095a8cd4e 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 - constructor //------------------------------------------------- -pci_bus_device::pci_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pci_bus_device::pci_bus_device(const machine_config &mconfig, const char *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().c_str(), offset, result); + logerror("read('%s'): offset=%d result=0x%08X\n", tag(), 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().c_str(), offset, data); + logerror("write('%s'): offset=%d data=0x%08X\n", tag(), 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pci_connector::pci_connector(const machine_config &mconfig, const char *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 a0659974c8a..fbf37faa83a 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, std::string tag, device_t *owner, UINT32 clock); + pci_connector(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pci_bus_device(const machine_config &mconfig, const char *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, std::string tag) { + void set_device(int num, const char *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; - std::string m_devtag[32]; + const char * 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 47d6d5ef32e..e7858521437 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(*this, ":maincpu"), m_pic8259_master(*this, "pic8259_master"), diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h index 8d798723dc3..5e280192dd4 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + southbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/devices/bus/lpci/vt82c505.cpp b/src/devices/bus/lpci/vt82c505.cpp index 3d805116218..15ba12b403b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vt82c505_device::vt82c505_device(const machine_config &mconfig, const char *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().c_str(),function,offset,result); + logerror("%s: PCI read func %i, offset %02x, result %08x\n",tag(),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().c_str(),m_window_addr[0]); + logerror("%s: memory window #1 A31:24 set: %04x\n",tag(),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().c_str(),m_window_addr[0]); + logerror("%s: memory window #1 A23:16 set: %04x\n",tag(),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().c_str(),m_window_attr[0]); + logerror("%s: memory window #1 attributes set: %02x\n",tag(),m_window_attr[0]); } break; } - logerror("%s: PCI write func %i, offset %02x, data %08x\n", tag().c_str(),function,offset,data); + logerror("%s: PCI write func %i, offset %02x, data %08x\n",tag(),function,offset,data); } //------------------------------------------------- diff --git a/src/devices/bus/lpci/vt82c505.h b/src/devices/bus/lpci/vt82c505.h index 7a55592420d..68bb3358b00 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, std::string tag, device_t *owner, UINT32 clock); + vt82c505_device(const machine_config &mconfig, const char *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 95dcb55c249..61fae5f3a17 100644 --- a/src/devices/bus/macpds/macpds.cpp +++ b/src/devices/bus/macpds/macpds.cpp @@ -26,19 +26,21 @@ const device_type MACPDS_SLOT = &device_creator; //------------------------------------------------- // macpds_slot_device - constructor //------------------------------------------------- -macpds_slot_device::macpds_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +macpds_slot_device::macpds_slot_device(const machine_config &mconfig, const char *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) + device_slot_interface(mconfig, *this), + m_macpds_tag(nullptr), + m_macpds_slottag(nullptr) { } -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) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_macpds_tag(nullptr), m_macpds_slottag(nullptr) { } -void macpds_slot_device::static_set_macpds_slot(device_t &device, std::string tag, std::string slottag) +void macpds_slot_device::static_set_macpds_slot(device_t &device, const char *tag, const char *slottag) { macpds_slot_device &macpds_card = dynamic_cast(device); macpds_card.m_macpds_tag = tag; @@ -62,7 +64,7 @@ void macpds_slot_device::device_start() const device_type MACPDS = &device_creator; -void macpds_device::static_set_cputag(device_t &device, std::string tag) +void macpds_device::static_set_cputag(device_t &device, const char *tag) { macpds_device &macpds = downcast(device); macpds.m_cputag = tag; @@ -76,13 +78,13 @@ void macpds_device::static_set_cputag(device_t &device, std::string tag) // macpds_device - constructor //------------------------------------------------- -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, 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, 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) +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) { } //------------------------------------------------- @@ -119,7 +121,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, std::string tag, UINT8 *data) +void macpds_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) { // printf("install_bank: %s @ %x->%x mask %x mirror %x\n", tag, start, end, mask, mirror); m_maincpu = machine().device(m_cputag); @@ -149,7 +151,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_next(nullptr) + m_macpds_tag(nullptr), m_macpds_slottag(nullptr), m_next(nullptr) { } @@ -162,7 +164,7 @@ device_macpds_card_interface::~device_macpds_card_interface() { } -void device_macpds_card_interface::static_set_macpds_tag(device_t &device, std::string tag, std::string slottag) +void device_macpds_card_interface::static_set_macpds_tag(device_t &device, const char *tag, const char *slottag) { device_macpds_card_interface &macpds_card = dynamic_cast(device); macpds_card.m_macpds_tag = tag; @@ -175,14 +177,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, std::string tag, UINT8 *data) +void device_macpds_card_interface::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) { char bank[256]; // append an underscore and the slot name to the bank so it's guaranteed unique - strcpy(bank, tag.c_str()); + strcpy(bank, tag); strcat(bank, "_"); - strcat(bank, m_macpds_slottag.c_str()); + strcat(bank, m_macpds_slottag); 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 084958930e9..db572d553f2 100644 --- a/src/devices/bus/macpds/macpds.h +++ b/src/devices/bus/macpds/macpds.h @@ -51,18 +51,17 @@ class macpds_slot_device : public device_t, { public: // construction/destruction - 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); + 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); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_macpds_slot(device_t &device, std::string tag, std::string slottag); + static void static_set_macpds_slot(device_t &device, const char *tag, const char *slottag); protected: // configuration - std::string m_macpds_tag; - std::string m_macpds_slottag; + const char *m_macpds_tag, *m_macpds_slottag; }; // device type definition @@ -76,15 +75,15 @@ class macpds_device : public device_t { public: // construction/destruction - 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); + 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); // inline configuration - static void static_set_cputag(device_t &device, std::string tag); + static void static_set_cputag(device_t &device, const char *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, std::string tag, UINT8 *data); + void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data); void set_irq_line(int line, int state); protected: @@ -96,7 +95,7 @@ protected: cpu_device *m_maincpu; simple_list m_device_list; - std::string m_cputag; + const char *m_cputag; }; @@ -119,15 +118,14 @@ 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, std::string tag, UINT8 *data); + 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, const char *romregion, UINT32 addr); // inline configuration - static void static_set_macpds_tag(device_t &device, std::string tag, std::string slottag); + static void static_set_macpds_tag(device_t &device, const char *tag, const char *slottag); public: macpds_device *m_macpds; - std::string m_macpds_tag; - std::string m_macpds_slottag; + const char *m_macpds_tag, *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 56747e6ec07..f89a210888f 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, std::string tag, device_t *owner, UINT32 clock) : +macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 88f0d5bb12f..218c30f959b 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, 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); + 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); // 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 3eb3833855f..1a432d6f6d6 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; const device_type MD_EEPROM_BLARA = &device_creator; -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) +md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0) { } -md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_STD_EEPROM, "MD Standard cart + EEPROM", tag, owner, clock, "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, std::string tag, device_t *owner, UINT32 clock) +md_eeprom_nbajam_device::md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAM, "MD NBA Jam", tag, owner, clock, "md_eeprom_nbajam", __FILE__) { } -md_eeprom_nbajamte_device::md_eeprom_nbajamte_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_eeprom_nbajamte_device::md_eeprom_nbajamte_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAMTE, "MD NBA Jam TE (and a few more)", tag, owner, clock, "md_eeprom_nbajamte", __FILE__) { } -md_eeprom_cslam_device::md_eeprom_cslam_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_eeprom_cslam_device::md_eeprom_cslam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_eeprom_device(mconfig, MD_EEPROM_CSLAM, "MD College Slam", tag, owner, clock, "md_eeprom_cslam", __FILE__) { } -md_eeprom_nflqb_device::md_eeprom_nflqb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_eeprom_nflqb_device::md_eeprom_nflqb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_eeprom_device(mconfig, MD_EEPROM_NFLQB, "MD NFL Quarterback 96", tag, owner, clock, "md_eeprom_nflqb", __FILE__) { } -md_eeprom_nhlpa_device::md_eeprom_nhlpa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_eeprom_nhlpa_device::md_eeprom_nhlpa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_eeprom_device(mconfig, MD_EEPROM_NHLPA, "MD NHLPA 93", tag, owner, clock, "md_eeprom_nhlpa", __FILE__) { } -md_eeprom_blara_device::md_eeprom_blara_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_eeprom_blara_device::md_eeprom_blara_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_eeprom_device(mconfig, MD_EEPROM_BLARA, "MD Brian Lara", tag, owner, clock, "md_eeprom_blara", __FILE__) { } diff --git a/src/devices/bus/megadrive/eeprom.h b/src/devices/bus/megadrive/eeprom.h index e53e33302d7..78ed7689547 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, 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); + md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() 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, std::string tag, device_t *owner, UINT32 clock); + md_eeprom_nbajam_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_eeprom_nbajamte_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_eeprom_cslam_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_eeprom_nflqb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_eeprom_nhlpa_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_eeprom_blara_device(const machine_config &mconfig, const char *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 2d20ed719cf..65097208567 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_ggenie_device::md_rom_ggenie_device(const machine_config &mconfig, const char *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 13a9951eeae..75b943abb4e 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, std::string tag, device_t *owner, UINT32 clock); + md_rom_ggenie_device(const machine_config &mconfig, const char *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 07631117e53..85fb7c373b4 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; // Sampras, Super Skidmarks? -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) +md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), m_jcart3(*this, "JCART3"), @@ -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, std::string tag, device_t *owner, UINT32 clock) +md_jcart_device::md_jcart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_JCART, "MD J-Cart games", tag, owner, clock, "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, std::string 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : md_jcart_device(mconfig, type, name, tag, owner, clock, shortname, source), m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0) { } -md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_jcart_device(mconfig, MD_SEPROM_CODEMAST, "MD J-Cart games + SEPROM", tag, owner, clock, "md_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, std::string tag, device_t *owner, UINT32 clock) +md_seprom_mm96_device::md_seprom_mm96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_seprom_codemast_device(mconfig, MD_SEPROM_MM96, "MD Micro Machine 96", tag, owner, clock, "md_seprom_mm96", __FILE__) { } diff --git a/src/devices/bus/megadrive/jcart.h b/src/devices/bus/megadrive/jcart.h index ca246306082..7af02447ede 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, 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); + md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_jcart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() 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, 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); + md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() 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, std::string tag, device_t *owner, UINT32 clock); + md_seprom_mm96_device(const machine_config &mconfig, const char *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 d9f1a736b3b..a2674838914 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, std::string tag) +void device_md_cart_interface::rom_alloc(size_t size, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_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, std::string tag, device_t *owner, UINT32 clock) : +md_cart_slot_device::md_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +pico_cart_slot_device::pico_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +copera_cart_slot_device::copera_cart_slot_device(const machine_config &mconfig, const char *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 08a05965d06..086d02bc79f 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, std::string tag); + virtual void rom_alloc(size_t size, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pico_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + copera_cart_slot_device(const machine_config &mconfig, const char *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 0e4367201eb..2ce6d353e35 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; const device_type MD_ROM_WUKONG = &device_creator; -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) +md_std_rom_device::md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ) { } -md_std_rom_device::md_std_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_std_rom_device::md_std_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_STD_ROM, "MD Standard cart", tag, owner, clock, "md_std_rom", __FILE__), device_md_cart_interface( mconfig, *this ) { } -md_rom_sram_device::md_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_sram_device::md_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SRAM, "MD Standard cart + SRAM", tag, owner, clock, "md_rom_sram", __FILE__) { } -md_rom_fram_device::md_rom_fram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_fram_device::md_rom_fram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_FRAM, "MD Standard cart + FRAM", tag, owner, clock, "md_rom_fram", __FILE__) { } -md_rom_ssf2_device::md_rom_ssf2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_ssf2_device::md_rom_ssf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SSF2, "MD Super SF2", tag, owner, clock, "md_rom_ssf2", __FILE__), m_lastoff(0), m_lastdata(0) { } -md_rom_cm2in1_device::md_rom_cm2in1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_cm2in1_device::md_rom_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_CM2IN1, "MD Codemasters 2in1", tag, owner, clock, "md_rom_cm2in1", __FILE__), m_base(0) { } -md_rom_mcpirate_device::md_rom_mcpirate_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_mcpirate_device::md_rom_mcpirate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_MCPIR, "MD Pirate Multicarts (Various)", tag, owner, clock, "md_rom_mcpirate", __FILE__), m_bank(0) { } -md_rom_bugslife_device::md_rom_bugslife_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_bugslife_device::md_rom_bugslife_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_BUGSLIFE, "MD A Bug's Life", tag, owner, clock, "md_rom_bugslife", __FILE__) { } -md_rom_smouse_device::md_rom_smouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_smouse_device::md_rom_smouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SMOUSE, "MD Huan Le Tao Qi Shu / Smart Mouse", tag, owner, clock, "md_rom_smouse", __FILE__) { } -md_rom_smb_device::md_rom_smb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_smb_device::md_rom_smb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SMB, "MD Super Mario Bros.", tag, owner, clock, "md_rom_smb", __FILE__) { } -md_rom_smb2_device::md_rom_smb2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_smb2_device::md_rom_smb2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SMB2, "MD Super Mario Bros. 2", tag, owner, clock, "md_rom_smb2", __FILE__) { } -md_rom_smw64_device::md_rom_smw64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_smw64_device::md_rom_smw64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SMW64, "MD Super Mario World 64", tag, owner, clock, "md_rom_smw64", __FILE__), m_latch0(0), m_latch1(0) { } -md_rom_sbubl_device::md_rom_sbubl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_sbubl_device::md_rom_sbubl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SBUBL, "MD Super Bubble Bobble", tag, owner, clock, "md_rom_sbubl", __FILE__) { } -md_rom_rx3_device::md_rom_rx3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_rx3_device::md_rom_rx3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_RX3, "MD Rockman X3", tag, owner, clock, "md_rom_rx3", __FILE__) { } -md_rom_mjlov_device::md_rom_mjlov_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_mjlov_device::md_rom_mjlov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_MJLOV, "MD Ma Jiang Qing Ren / Mahjong Lover", tag, owner, clock, "md_rom_mjlov", __FILE__) { } -md_rom_kof98_device::md_rom_kof98_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_kof98_device::md_rom_kof98_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_KOF98, "MD KOF 98", tag, owner, clock, "md_rom_kof98", __FILE__) { } -md_rom_kof99_device::md_rom_kof99_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_kof99_device::md_rom_kof99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_KOF99, "MD KOF 99 (and others)", tag, owner, clock, "md_rom_kof99", __FILE__) { } -md_rom_soulb_device::md_rom_soulb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_soulb_device::md_rom_soulb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SOULB, "MD Soul Blade", tag, owner, clock, "md_rom_soulb", __FILE__) { } -md_rom_chinf3_device::md_rom_chinf3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_chinf3_device::md_rom_chinf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_CHINF3, "MD Chinese Fighter 3", tag, owner, clock, "md_rom_chinf3", __FILE__), m_bank(0) { } -md_rom_16mj2_device::md_rom_16mj2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_16mj2_device::md_rom_16mj2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +md_rom_elfwor_device::md_rom_elfwor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_ELFWOR, "MD Linghuan Daoshi Super Magician / Elf Wor", tag, owner, clock, "md_rom_elfwor", __FILE__) { } -md_rom_yasech_device::md_rom_yasech_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_yasech_device::md_rom_yasech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_YASECH, "MD Ya Se Chuan Shuo", tag, owner, clock, "md_rom_yasech", __FILE__) { } -md_rom_lion2_device::md_rom_lion2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_lion2_device::md_rom_lion2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_LION2, "MD Lion King 2", tag, owner, clock, "md_rom_lion2", __FILE__), m_prot1_data(0), m_prot2_data(0) { } -md_rom_lion3_device::md_rom_lion3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_lion3_device::md_rom_lion3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_LION3, "MD Lion King 3", tag, owner, clock, "md_rom_lion3", __FILE__), m_bank(0) { } -md_rom_pokea_device::md_rom_pokea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_pokea_device::md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_POKEA, "MD Pokemon (Alt Protection)", tag, owner, clock, "md_rom_pokea", __FILE__) { } -md_rom_pokestad_device::md_rom_pokestad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_pokestad_device::md_rom_pokestad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_POKESTAD, "MD Pokemon Stadium", tag, owner, clock, "md_rom_pokestad", __FILE__), m_bank(0) { } -md_rom_realtec_device::md_rom_realtec_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_realtec_device::md_rom_realtec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_REALTEC, "MD Realtec", tag, owner, clock, "md_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, std::string tag, device_t *owner, UINT32 clock) +md_rom_redcl_device::md_rom_redcl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_REDCL, "MD Redcliff", tag, owner, clock, "md_rom_redcl", __FILE__) { } -md_rom_squir_device::md_rom_squir_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_squir_device::md_rom_squir_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_SQUIR, "MD Squirrel King", tag, owner, clock, "md_rom_squir", __FILE__), m_latch(0) { } -md_rom_tekkensp_device::md_rom_tekkensp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_tekkensp_device::md_rom_tekkensp_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +md_rom_topf_device::md_rom_topf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_TOPF, "MD Top Fighter", tag, owner, clock, "md_rom_topf", __FILE__), m_latch(0) { } -md_rom_radica_device::md_rom_radica_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_radica_device::md_rom_radica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_RADICA, "MD Radica TV games", tag, owner, clock, "md_rom_radica", __FILE__), m_bank(0) { } -md_rom_beggarp_device::md_rom_beggarp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_beggarp_device::md_rom_beggarp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_BEGGARP, "MD Beggar Prince", tag, owner, clock, "md_rom_beggarp", __FILE__), m_mode(0), m_lock(0) { } -md_rom_wukong_device::md_rom_wukong_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_wukong_device::md_rom_wukong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : md_std_rom_device(mconfig, MD_ROM_WUKONG, "MD Legend of Wukong", tag, owner, clock, "md_rom_wukong", __FILE__), m_mode(0) { } diff --git a/src/devices/bus/megadrive/rom.h b/src/devices/bus/megadrive/rom.h index f763977ecea..796b29dc9fb 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, 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); + md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_std_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() 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, std::string tag, device_t *owner, UINT32 clock); + md_rom_sram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_fram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_ssf2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_cm2in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_mcpirate_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_bugslife_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_chinf3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_16mj2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_elfwor_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_yasech_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_kof98_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_kof99_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_lion2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_lion3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_mjlov_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_pokea_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_pokestad_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_realtec_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_redcl_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_rx3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_sbubl_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_smb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_smb2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_smw64_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_smouse_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_soulb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_squir_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_tekkensp_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_topf_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_radica_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_beggarp_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + md_rom_wukong_device(const machine_config &mconfig, const char *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 0d05b71564c..4cee6dd90f4 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(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::md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), m_exp(*this, "subslot") { } -md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_ROM_SK, "MD Sonic & Knuckles", tag, owner, clock, "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 5d853d2af70..606d928daae 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, 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); + md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_rom_sk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/megadrive/stm95.cpp b/src/devices/bus/megadrive/stm95.cpp index b5c6b28a553..2c7ddf89ad4 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(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::md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), m_rdcnt(0) { } -md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_EEPROM_STM95, "MD Cart + EEPROM STM95", tag, owner, clock, "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 46e1b708580..09e61670c14 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, 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); + md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp index 6cd5d6a8026..589a58138a6 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(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::md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_md_cart_interface( mconfig, *this ), m_svp(*this, "svp"), @@ -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, std::string tag, device_t *owner, UINT32 clock) +md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MD_ROM_SVP, "MD Virtua Racing", tag, owner, clock, "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 0190a5c6dee..73c230c92a0 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, 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); + md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); //protected: // device-level overrides diff --git a/src/devices/bus/midi/midi.cpp b/src/devices/bus/midi/midi.cpp index 8c8505c8300..cc8a9166f4f 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +midi_port_device::midi_port_device(const machine_config &mconfig, const char *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 410050f74b1..fcd16932637 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, std::string tag, device_t *owner, UINT32 clock); + midi_port_device(const machine_config &mconfig, const char *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 706d3c82918..13632219c03 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +midiin_port_device::midiin_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MIDIIN_PORT, "MIDI In port", tag, owner, clock, "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 7355e48b008..1f938855d70 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, std::string tag, device_t *owner, UINT32 clock); + midiin_port_device(const machine_config &mconfig, const char *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 549dfbc3c7a..6ba39d6ee57 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +midiout_port_device::midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MIDIOUT_PORT, "MIDI Out port", tag, owner, clock, "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 3b517fd9560..4cfabf9eeea 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, std::string tag, device_t *owner, UINT32 clock); + midiout_port_device(const machine_config &mconfig, const char *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 3eeffa96190..a64f321af14 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_arc::msx_cart_arc(const machine_config &mconfig, const char *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 351bb78dba3..29f24bc7e66 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_arc(const machine_config &mconfig, const char *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 4b2320e6b0b..04ef820e7d9 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 const device_type MSX_CART_MSXWRITE = &device_creator; -msx_cart_ascii8::msx_cart_ascii8(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_ascii8::msx_cart_ascii8(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_ascii16::msx_cart_ascii16(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_ascii8_sram::msx_cart_ascii8_sram(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_ascii16_sram::msx_cart_ascii16_sram(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_msxwrite::msx_cart_msxwrite(const machine_config &mconfig, const char *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 9e5dfbb416d..d66cff8ff25 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_ascii8(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_ascii16(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_ascii8_sram(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_ascii16_sram(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_msxwrite(const machine_config &mconfig, const char *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 d977869df78..89430da93f2 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_bm_012::msx_cart_bm_012(const machine_config &mconfig, const char *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 9dabd27e9eb..20c6c1970be 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_bm_012(const machine_config &mconfig, const char *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 f5229061169..f36f7b4b8cc 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_crossblaim::msx_cart_crossblaim(const machine_config &mconfig, const char *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 26d42e8fc07..85af99795fb 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_crossblaim(const machine_config &mconfig, const char *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 f2582e0ab86..11789e0a79f 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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_vy0010::msx_cart_vy0010(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_fsfd1::msx_cart_fsfd1(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_fscf351::msx_cart_fscf351(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_fsfd1a::msx_cart_fsfd1a(const machine_config &mconfig, const char *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 75235aba64e..f941e7e5668 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, const char *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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + 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); protected: required_device 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + 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); // 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_vy0010(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_fsfd1(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_fscf351(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + 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); protected: required_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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_fsfd1a(const machine_config &mconfig, const char *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 c991b918d2f..95f2748b04a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_dooly::msx_cart_dooly(const machine_config &mconfig, const char *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 9ad7884d7ef..dca29881c5f 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_dooly(const machine_config &mconfig, const char *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 837b9e2f247..44b934d17f5 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_fmpac::msx_cart_fmpac(const machine_config &mconfig, const char *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 a8eff255fb3..259cb0afe16 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_fmpac(const machine_config &mconfig, const char *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 93ea31544de..df3819fc6b3 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_fs_sr022::msx_cart_fs_sr022(const machine_config &mconfig, const char *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 2511fe544db..4555520f5b3 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_fs_sr022(const machine_config &mconfig, const char *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 f87b13b1e4e..d37354dd0a5 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_halnote::msx_cart_halnote(const machine_config &mconfig, const char *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 10643eaf4a0..5d59ce7cd35 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_halnote(const machine_config &mconfig, const char *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 a106eaf9531..a0f2f7c4556 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_hfox::msx_cart_hfox(const machine_config &mconfig, const char *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 09c62296a2c..c51bd77cd2f 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_hfox(const machine_config &mconfig, const char *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 ac3678c055c..7671e8624de 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_holy_quran::msx_cart_holy_quran(const machine_config &mconfig, const char *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 9a09d6ea3e8..00ae6bc92f4 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_holy_quran(const machine_config &mconfig, const char *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 fec0da58707..d9d129888fd 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::msx_cart_konami(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_konami::msx_cart_konami(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_konami_scc::msx_cart_konami_scc(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_gamemaster2::msx_cart_gamemaster2(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_synthesizer::msx_cart_synthesizer(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +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(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, std::string tag, device_t *owner, UINT32 clock) +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(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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_keyboard_master::msx_cart_keyboard_master(const machine_config &mconfig, const char *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 da446c12922..e26533bce29 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_konami(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_konami_scc(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_gamemaster2(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_synthesizer(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_konami_sound_snatcher(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_keyboard_master(const machine_config &mconfig, const char *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 0dd49ad8f43..f1dedeb9874 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 const device_type MSX_CART_KOREAN_126IN1 = &device_creator; -msx_cart_korean_80in1::msx_cart_korean_80in1(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_korean_80in1::msx_cart_korean_80in1(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_korean_90in1::msx_cart_korean_90in1(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_korean_126in1::msx_cart_korean_126in1(const machine_config &mconfig, const char *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 6bff18ba6c1..7c332f486c3 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_korean_80in1(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_korean_90in1(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_korean_126in1(const machine_config &mconfig, const char *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 8e5c60ba4fe..23091c1fb4b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_majutsushi::msx_cart_majutsushi(const machine_config &mconfig, const char *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 6d2226ea52d..2cff08446a2 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_majutsushi(const machine_config &mconfig, const char *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 cf4ca51786e..cdae9385815 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_moonsound::msx_cart_moonsound(const machine_config &mconfig, const char *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 4c64c360cea..d826d446ec1 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_moonsound(const machine_config &mconfig, const char *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 a77f1b8d672..01ad0cd1f45 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_audio_hxmu900::msx_cart_msx_audio_hxmu900(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_msx_audio_hxmu900::msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_msx_audio_nms1205::msx_cart_msx_audio_nms1205(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_msx_audio_fsca1::msx_cart_msx_audio_fsca1(const machine_config &mconfig, const char *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 ea6c8d0b1bb..9787d1b163b 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_msx_audio_nms1205(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_msx_audio_fsca1(const machine_config &mconfig, const char *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 ffb6b26d9c1..d9304613ca7 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_audio_kbdc_port_device::msx_audio_kbdc_port_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + msx_hxmu901(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + msx_nms1160(const machine_config &mconfig, const char *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 6b6b533cf0b..6bdc1fe86fe 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, std::string tag, device_t *owner, UINT32 clock); + msx_audio_kbdc_port_device(const machine_config &mconfig, const char *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 319893eff28..96f0b99f119 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_msxdos2::msx_cart_msxdos2(const machine_config &mconfig, const char *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 79b0da7d195..a4171b41292 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_msxdos2(const machine_config &mconfig, const char *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 958e2597271..922649d5c1f 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_nomapper::msx_cart_nomapper(const machine_config &mconfig, const char *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 8635c10c1fd..f81c7bcdd50 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_nomapper(const machine_config &mconfig, const char *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 cd7d29d0dfe..ffe7d56cfba 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_rtype::msx_cart_rtype(const machine_config &mconfig, const char *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 9a1fbf85f3d..811ccc5ad27 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_rtype(const machine_config &mconfig, const char *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 d362979dcd1..65e4992afe3 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_super_swangi::msx_cart_super_swangi(const machine_config &mconfig, const char *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 9a5e9f038ec..19241869877 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_super_swangi(const machine_config &mconfig, const char *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 9602e4b2eac..f71a109a83b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_cart_superloderunner::msx_cart_superloderunner(const machine_config &mconfig, const char *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 0923171522e..22b1e47e368 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_superloderunner(const machine_config &mconfig, const char *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 b1ac9210cf1..7abf066c3af 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; const device_type MSX_CART_SFG05 = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_sfg01::msx_cart_sfg01(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +msx_cart_sfg05::msx_cart_sfg05(const machine_config &mconfig, const char *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 af815efa6ae..30f7fea8e55 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_sfg01(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_cart_sfg05(const machine_config &mconfig, const char *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 f23083538b4..1289a84704b 100644 --- a/src/devices/bus/msx_slot/bunsetsu.cpp +++ b/src/devices/bus/msx_slot/bunsetsu.cpp @@ -11,9 +11,10 @@ const device_type MSX_SLOT_BUNSETSU = &device_creator; -msx_slot_bunsetsu_device::msx_slot_bunsetsu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_bunsetsu_device::msx_slot_bunsetsu_device(const machine_config &mconfig, const char *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(nullptr) + , m_bunsetsu_region_tag(nullptr) , m_bunsetsu_address(0) { } @@ -23,7 +24,7 @@ void msx_slot_bunsetsu_device::device_start() { msx_slot_rom_device::device_start(); - if (m_bunsetsu_region_tag.empty()) + if (m_bunsetsu_region_tag == nullptr) { fatalerror("msx_slot_bunsetsu_device: no bunsetsu region tag specified\n"); } @@ -32,7 +33,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.c_str()); + fatalerror("msx_slot_bunsetsu_device: Unable to find region with tag '%s'\n", m_bunsetsu_region_tag); } 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 ec8c85c4396..701e6bb8640 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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_bunsetsu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - static void set_bunsetsu_region_tag(device_t &device, std::string tag) { dynamic_cast(device).m_bunsetsu_region_tag = tag; } + static void set_bunsetsu_region_tag(device_t &device, const char *tag) { dynamic_cast(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; - std::string m_bunsetsu_region_tag; + const char *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 910ca3c2abb..c24df3bf1fb 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::msx_slot_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , device_image_interface(mconfig, *this) , device_slot_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, std::string tag, device_t *owner, UINT32 clock) +msx_slot_yamaha_expansion_device::msx_slot_yamaha_expansion_device(const machine_config &mconfig, const char *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 2a2ae297701..ce8303ff3d4 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, 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); + 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); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_yamaha_expansion_device(const machine_config &mconfig, const char *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 88bd2747edf..ea4313f6ac5 100644 --- a/src/devices/bus/msx_slot/disk.cpp +++ b/src/devices/bus/msx_slot/disk.cpp @@ -43,13 +43,18 @@ const device_type MSX_SLOT_DISK5 = &device_creator; const device_type MSX_SLOT_DISK6 = &device_creator; -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_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_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) { } @@ -58,15 +63,15 @@ void msx_slot_disk_device::device_start() { msx_slot_rom_device::device_start(); - if (m_fdc_tag.empty()) + if (m_fdc_tag == nullptr) { fatalerror("msx_slot_disk_device: no FDC tag specified\n"); } - m_floppy0 = !m_floppy0_tag.empty() ? owner()->subdevice(m_floppy0_tag) : nullptr; - m_floppy1 = !m_floppy1_tag.empty() ? owner()->subdevice(m_floppy1_tag) : nullptr; - m_floppy2 = !m_floppy2_tag.empty() ? owner()->subdevice(m_floppy2_tag) : nullptr; - m_floppy3 = !m_floppy3_tag.empty() ? owner()->subdevice(m_floppy3_tag) : nullptr; + m_floppy0 = m_floppy0_tag ? owner()->subdevice(m_floppy0_tag) : nullptr; + m_floppy1 = m_floppy1_tag ? owner()->subdevice(m_floppy1_tag) : nullptr; + m_floppy2 = m_floppy2_tag ? owner()->subdevice(m_floppy2_tag) : nullptr; + m_floppy3 = m_floppy3_tag ? owner()->subdevice(m_floppy3_tag) : nullptr; if (m_floppy0 == nullptr && m_floppy1 == nullptr) { @@ -75,7 +80,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, std::string 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, const char *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) { @@ -90,12 +95,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.c_str()); + fatalerror("msx_slot_wd_disk_device: Unable to find FDC with tag '%s'\n", m_fdc_tag); } } -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_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_disk_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_fdc(nullptr) { @@ -110,13 +115,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.c_str()); + fatalerror("msx_slot_tc8566_disk_device: Unable to find FDC with tag '%s'\n", m_fdc_tag); } } -msx_slot_disk1_device::msx_slot_disk1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_disk1_device::msx_slot_disk1_device(const machine_config &mconfig, const char *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) @@ -279,7 +284,7 @@ WRITE8_MEMBER(msx_slot_disk1_device::write) } -msx_slot_disk2_device::msx_slot_disk2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_disk2_device::msx_slot_disk2_device(const machine_config &mconfig, const char *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) { @@ -418,7 +423,7 @@ WRITE8_MEMBER(msx_slot_disk2_device::write) -msx_slot_disk3_device::msx_slot_disk3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_disk3_device::msx_slot_disk3_device(const machine_config &mconfig, const char *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__) { } @@ -464,7 +469,7 @@ READ8_MEMBER(msx_slot_disk3_device::read) -msx_slot_disk4_device::msx_slot_disk4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_disk4_device::msx_slot_disk4_device(const machine_config &mconfig, const char *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__) { } @@ -516,7 +521,7 @@ READ8_MEMBER(msx_slot_disk4_device::read) -msx_slot_disk5_device::msx_slot_disk5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_disk5_device::msx_slot_disk5_device(const machine_config &mconfig, const char *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) { @@ -639,7 +644,7 @@ WRITE8_MEMBER(msx_slot_disk5_device::io_write) -msx_slot_disk6_device::msx_slot_disk6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_disk6_device::msx_slot_disk6_device(const machine_config &mconfig, const char *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 701cf423a7e..fb0bdad5cdf 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, std::string 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, const char *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, std::string tag) { dynamic_cast(device).m_fdc_tag = tag; } - static void set_floppy0_tag(device_t &device, std::string tag) { dynamic_cast(device).m_floppy0_tag = tag; } - static void set_floppy1_tag(device_t &device, std::string tag) { dynamic_cast(device).m_floppy1_tag = tag; } - static void set_floppy2_tag(device_t &device, std::string tag) { dynamic_cast(device).m_floppy2_tag = tag; } - static void set_floppy3_tag(device_t &device, std::string tag) { dynamic_cast(device).m_floppy3_tag = tag; } + static void set_fdc_tag(device_t &device, const char *tag) { dynamic_cast(device).m_fdc_tag = tag; } + static void set_floppy0_tag(device_t &device, const char *tag) { dynamic_cast(device).m_floppy0_tag = tag; } + static void set_floppy1_tag(device_t &device, const char *tag) { dynamic_cast(device).m_floppy1_tag = tag; } + static void set_floppy2_tag(device_t &device, const char *tag) { dynamic_cast(device).m_floppy2_tag = tag; } + static void set_floppy3_tag(device_t &device, const char *tag) { dynamic_cast(device).m_floppy3_tag = tag; } protected: floppy_connector *m_floppy0; @@ -91,18 +91,18 @@ protected: floppy_connector *m_floppy3; floppy_image_device *m_floppy; - 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; + 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; }; 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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_disk1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_disk2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_disk3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_disk4_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_disk5_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_disk6_device(const machine_config &mconfig, const char *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 0cae82694a4..e6d6d8b9b9f 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_fs4600_device::msx_slot_fs4600_device(const machine_config &mconfig, const char *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().c_str(), m_region); + fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), 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 18fc51a0eae..57ae25aa47e 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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_fs4600_device(const machine_config &mconfig, const char *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 da4bd27ac8a..baa6bdf0175 100644 --- a/src/devices/bus/msx_slot/music.cpp +++ b/src/devices/bus/msx_slot/music.cpp @@ -7,9 +7,10 @@ const device_type MSX_SLOT_MUSIC = &device_creator; -msx_slot_music_device::msx_slot_music_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_music_device::msx_slot_music_device(const machine_config &mconfig, const char *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) { } @@ -18,7 +19,7 @@ void msx_slot_music_device::device_start() { msx_slot_rom_device::device_start(); - if (m_ym2413_tag.empty()) + if (m_ym2413_tag == nullptr) { fatalerror("msx_slot_music_device: no YM2413 tag specified\n"); } @@ -27,7 +28,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.c_str()); + fatalerror("msx_slot_ym2413_device: Unable to find YM2413 with tag '%s'\n", m_ym2413_tag); } // Install IO read/write handlers diff --git a/src/devices/bus/msx_slot/music.h b/src/devices/bus/msx_slot/music.h index 1a7e5fc17f6..eb2501b6746 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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_music_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - static void set_ym2413_tag(device_t &device, std::string tag) { dynamic_cast(device).m_ym2413_tag = tag; } + static void set_ym2413_tag(device_t &device, const char *tag) { dynamic_cast(device).m_ym2413_tag = tag; } virtual void device_start() override; @@ -32,7 +32,7 @@ public: private: ym2413_device *m_ym2413; - std::string m_ym2413_tag; + const char *m_ym2413_tag; }; diff --git a/src/devices/bus/msx_slot/panasonic08.cpp b/src/devices/bus/msx_slot/panasonic08.cpp index 3606c32f52b..ec9fdcf20ea 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_panasonic08_device::msx_slot_panasonic08_device(const machine_config &mconfig, const char *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().c_str(), m_region); + fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), 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 6e1c5cb085c..d42ebd308f5 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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_panasonic08_device(const machine_config &mconfig, const char *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 82308f1099e..cb07422358a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_ram_device::msx_slot_ram_device(const machine_config &mconfig, const char *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 20a9003338e..da9ed2e61b0 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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void force_start_address(device_t &device, UINT16 start) { downcast(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 2571dfc4624..4d70fff80bc 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_ram_mm_device::msx_slot_ram_mm_device(const machine_config &mconfig, const char *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 607e0dc18ec..b58532c2d57 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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_ram_mm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_total_size(device_t &device, UINT32 total_size) { dynamic_cast(device).m_total_size = total_size; } static void set_ramio_set_bits(device_t &device, UINT8 ramio_set_bits) { dynamic_cast(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 394f893ea12..2d4593bed2b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, const char *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, std::str } -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) +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) : 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().c_str(), m_region); + fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), 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().c_str()); + fatalerror("Memory region '%s' is too small for rom slot '%s'\n", m_region, tag()); } 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 2cb63b8c31e..e46fea28186 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, 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); + 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); // 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 4ec0e45366c..2f48869c291 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_slot_sony08_device::msx_slot_sony08_device(const machine_config &mconfig, const char *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().c_str(), m_region); + fatalerror("Rom slot '%s': Unable to find memory region '%s'\n", tag(), 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 8bcb4fc4dd3..ebef6145c4f 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, std::string tag, device_t *owner, UINT32 clock); + msx_slot_sony08_device(const machine_config &mconfig, const char *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 ef861b68d6e..8960a19573f 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, std::string tag, device_t *owner, UINT32 clock) : +nascom_avc_device::nascom_avc_device(const machine_config &mconfig, const char *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 1eac94e7ea3..08b43b82d8d 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, std::string tag, device_t *owner, UINT32 clock); + nascom_avc_device(const machine_config &mconfig, const char *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 f181ac4a310..8c87bf55b35 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, std::string tag, device_t *owner, UINT32 clock) : +nascom_fdc_device::nascom_fdc_device(const machine_config &mconfig, const char *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 c81c0fe7dea..ea27b266667 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, std::string tag, device_t *owner, UINT32 clock); + nascom_fdc_device(const machine_config &mconfig, const char *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 00bf06b9f2e..bd0f2d4dab4 100644 --- a/src/devices/bus/nasbus/nasbus.cpp +++ b/src/devices/bus/nasbus/nasbus.cpp @@ -21,20 +21,22 @@ const device_type NASBUS_SLOT = &device_creator; // nasbus_slot_device - constructor //------------------------------------------------- -nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NASBUS_SLOT, "NASBUS Slot", tag, owner, clock, "nasbus_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_nasbus_tag(nullptr) { } nasbus_slot_device::nasbus_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) : + const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_nasbus_tag(nullptr) { } -void nasbus_slot_device::set_nasbus_slot(device_t &device, device_t *owner, std::string nasbus_tag) +void nasbus_slot_device::set_nasbus_slot(device_t &device, device_t *owner, const char *nasbus_tag) { nasbus_slot_device &nasbus_card = dynamic_cast(device); nasbus_card.m_owner = owner; @@ -67,7 +69,7 @@ const device_type NASBUS = &device_creator; // nasbus_device - constructor //------------------------------------------------- -nasbus_device::nasbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nasbus_device::nasbus_device(const machine_config &mconfig, const char *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 0f4b8690f4b..34e35de4886 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, std::string tag, device_t *owner, UINT32 clock); + nasbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); nasbus_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); + const char *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, std::string nasbus_tag); + static void set_nasbus_slot(device_t &device, device_t *owner, const char *nasbus_tag); protected: // configuration - std::string m_nasbus_tag; + const char *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, std::string tag, device_t *owner, UINT32 clock); + nasbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~nasbus_device(); template 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 e01724bf752..1ad3b0c34e1 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +neogeo_banked_cart_device::neogeo_banked_cart_device(const machine_config &mconfig, const char *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 e57c239419d..5f9c4d9503d 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, std::string tag, device_t *owner, UINT32 clock); + neogeo_banked_cart_device(const machine_config &mconfig, const char *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 821bb040442..45a4563f88d 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(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::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) : 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, std::string tag, device_t *owner, UINT16 clock) +neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, const char *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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__), +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__), 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 1d3fc516f0a..77082b7035d 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_garoubl_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_cthd2003_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_ct2k3sp_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_ct2k3sa_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_kf10thep_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_kf2k5uni_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_kf2k4se_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_svcplus_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_svcplusa_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_samsho5b_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_kof97oro_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_lans2004_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_kof10th_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_kog_cart(const machine_config &mconfig, const char *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 47c07aa5256..5d677c8cc74 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(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::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) : 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, std::string tag, device_t *owner, UINT16 clock) +neogeo_bootleg_hybrid_hybrid_cart::neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, const char *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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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 317e5bb9483..09416da8545 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_mslug3b6_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_kof2002b_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_kf2k2mp_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_kf2k2mp2_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_matrimbl_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_ms5plus_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_svcboot_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_svcsplus_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_kf2k3bl_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_kf2k3pl_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_bootleg_hybrid_kf2k3upl_cart(const machine_config &mconfig, const char *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 ce773639b79..8c023f00091 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ngbootleg_prot_device::ngbootleg_prot_device(const machine_config &mconfig, const char *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 8a8059f379b..8aa1c9bdd7e 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, std::string tag, device_t *owner, UINT32 clock); + ngbootleg_prot_device(const machine_config &mconfig, const char *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 dec68562854..c528366b717 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(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::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) : 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, std::string tag, device_t *owner, UINT16 clock) +neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, const char *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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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 e8f64927f7c..6dcb544813a 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + neogeo_cmc_zupapa_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_cmc_mslug3h_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_cmc_ganryu_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_cmc_s1945p_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_cmc_preisle2_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_cmc_bangbead_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_cmc_nitd_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_cmc_sengoku3_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_cmc_kof99k_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_cmc_kof2001_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_cmc_kof2000n_cart(const machine_config &mconfig, const char *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 8b404cfeccb..c4dc573af8a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cmc_prot_device::cmc_prot_device(const machine_config &mconfig, const char *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 1094f29a693..cbf53a865dd 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, std::string tag, device_t *owner, UINT32 clock); + cmc_prot_device(const machine_config &mconfig, const char *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 3b8db9ac52e..047ca79a2eb 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(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::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) : 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, std::string tag, device_t *owner, UINT16 clock) +neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, const char *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 743d5e5d74a..4d4f91a72a1 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, 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); + 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); // 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 2681d7da5c9..b2560ad4f62 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +fatfury2_prot_device::fatfury2_prot_device(const machine_config &mconfig, const char *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 7f21b848df4..17a31586ed4 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, std::string tag, device_t *owner, UINT32 clock); + fatfury2_prot_device(const machine_config &mconfig, const char *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 0a90f4d2317..9726bd34b4b 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(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::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) : 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, std::string tag, device_t *owner, UINT16 clock) +neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, const char *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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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 79ae36d9472..f8c87314588 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + neogeo_kof2002_kof2002_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_kof2002_kf2k2pls_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_kof2002_matrim_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_kof2002_samsho5_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_kof2002_samsho5sp_cart(const machine_config &mconfig, const char *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 27fd8751783..f234602a0c2 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kof2002_prot_device::kof2002_prot_device(const machine_config &mconfig, const char *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 d553ed6de7a..8ed4873b1be 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, std::string tag, device_t *owner, UINT32 clock); + kof2002_prot_device(const machine_config &mconfig, const char *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 5f049cad334..6314522e4ff 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(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::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) : 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, std::string tag, device_t *owner, UINT16 clock) +neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, const char *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 ae9f469f961..6bf3a715cde 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, 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); + 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); // 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 022b032c134..6fdfa5001f3 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kof98_prot_device::kof98_prot_device(const machine_config &mconfig, const char *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 1254809dd89..f824a8a1206 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, std::string tag, device_t *owner, UINT32 clock); + kof98_prot_device(const machine_config &mconfig, const char *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 b628d30ae64..d3caaff3e15 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kog_prot_device::kog_prot_device(const machine_config &mconfig, const char *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 40d1857852d..5e19053c3d4 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, std::string tag, device_t *owner, UINT32 clock); + kog_prot_device(const machine_config &mconfig, const char *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 ee1d5a2f060..d6bd6388864 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(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::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) : 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, std::string tag, device_t *owner, UINT16 clock) +neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, const char *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 3892d0d3337..2e58655f3e2 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, 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); + 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); // 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 53f23356482..783ef2db839 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mslugx_prot_device::mslugx_prot_device(const machine_config &mconfig, const char *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 80b1fe5444b..fb1f2261957 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, std::string tag, device_t *owner, UINT32 clock); + mslugx_prot_device(const machine_config &mconfig, const char *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 f96307f497a..fac43eda050 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 - constructor //------------------------------------------------- -neogeo_cart_slot_device::neogeo_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT16 clock) : +neogeo_cart_slot_device::neogeo_cart_slot_device(const machine_config &mconfig, const char *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 f42d841550a..1b037103165 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, std::string tag, device_t *owner, UINT16 clock); + neogeo_cart_slot_device(const machine_config &mconfig, const char *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 2ec389c5bf6..04eede0ebe9 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(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::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) : 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, std::string tag, device_t *owner, UINT16 clock) +neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, const char *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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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 c176337312b..74f8e24d929 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + neogeo_pcm2_mslug4_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_pcm2_rotd_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, const char *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 abb50d33823..64159ff4185 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pcm2_prot_device::pcm2_prot_device(const machine_config &mconfig, const char *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 68df5591db2..72f59dac1b3 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, std::string tag, device_t *owner, UINT32 clock); + pcm2_prot_device(const machine_config &mconfig, const char *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 7e8d1a7da20..ee587724b7f 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(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::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) : 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, std::string tag, device_t *owner, UINT16 clock) +neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, const char *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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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 19a67dcd6fc..7d5e3aa22d5 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + neogeo_pvc_mslug5_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_pvc_svc_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_pvc_kof2003_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_pvc_kof2003h_cart(const machine_config &mconfig, const char *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 872eac75037..bef53153a5f 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pvc_prot_device::pvc_prot_device(const machine_config &mconfig, const char *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 ef9b82f5aaf..db853285a28 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, std::string tag, device_t *owner, UINT32 clock); + pvc_prot_device(const machine_config &mconfig, const char *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 92b01920a03..085e68edec2 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(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::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) : 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, std::string tag, device_t *owner, UINT16 clock) +neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, const char *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 4da90a1a2a3..7a1135a3e7c 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, 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); + 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); // 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 4ee3130e916..b913eba75d9 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sbp_prot_device::sbp_prot_device(const machine_config &mconfig, const char *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 9ab4d3aa4e7..702bb9c42e0 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, std::string tag, device_t *owner, UINT32 clock); + sbp_prot_device(const machine_config &mconfig, const char *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 727918659f3..61e07b962f3 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(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::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) : 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, std::string tag, device_t *owner, UINT16 clock) +neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, const char *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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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(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__) {} +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__) {} 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 b3e7445ced6..04df0b1217a 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + neogeo_sma_kof99_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_sma_garou_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_sma_garouh_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_sma_mslug3_cart(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + neogeo_sma_kof2000_cart(const machine_config &mconfig, const char *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 d87b61239c4..1c91212c416 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sma_prot_device::sma_prot_device(const machine_config &mconfig, const char *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 b0349429809..37f7e82fbc1 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, std::string tag, device_t *owner, UINT32 clock); + sma_prot_device(const machine_config &mconfig, const char *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 1b3b8ea91dc..d7c807b63f2 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_2a03pur_device::nes_2a03pur_device(const machine_config &mconfig, const char *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 d1de85a4ace..6bcafadb7d5 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, std::string tag, device_t *owner, UINT32 clock); + nes_2a03pur_device(const machine_config &mconfig, const char *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 88ba720057d..225be65d449 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_action53_device::nes_action53_device(const machine_config &mconfig, const char *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 5d51b8fbd01..e3b395ce1cd 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, std::string tag, device_t *owner, UINT32 clock); + nes_action53_device(const machine_config &mconfig, const char *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 1bffd08447f..bad863b9255 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nes_aladdin_slot_device::nes_aladdin_slot_device(const machine_config &mconfig, const char *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; const device_type NES_ALGQ_ROM = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_algq_rom_device::nes_algq_rom_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_aladdin_device::nes_aladdin_device(const machine_config &mconfig, const char *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 f739ca789f8..20786c3cab3 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, std::string tag, device_t *owner, UINT32 clock); + nes_aladdin_slot_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_algq_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_aladdin_device(const machine_config &mconfig, const char *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 dadabec187e..c1103f228ac 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; const device_type NES_MAXI15 = &device_creator; -nes_nina001_device::nes_nina001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_nina001_device::nes_nina001_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_nina006_device::nes_nina006_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_maxi15_device::nes_maxi15_device(const machine_config &mconfig, const char *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 e21e806466d..936d93ce392 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, std::string tag, device_t *owner, UINT32 clock); + nes_nina001_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_nina006_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_maxi15_device(const machine_config &mconfig, const char *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 49bad5e3912..8a223a5d645 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; const device_type NES_FJUMP2 = &device_creator; -nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_fcg_device::nes_fcg_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_lz93d50_24c02_device::nes_lz93d50_24c02_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_fjump2_device::nes_fjump2_device(const machine_config &mconfig, const char *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 32d79444407..13ee41f4823 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, std::string tag, device_t *owner, UINT32 clock); + nes_oekakids_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, 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); + 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); // 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_lz93d50_24c02_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_fjump2_device(const machine_config &mconfig, const char *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 0f9aeacea17..cda8d66d94d 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_benshieng_device::nes_benshieng_device(const machine_config &mconfig, const char *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 f68f94e6181..c87b016c6a3 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, std::string tag, device_t *owner, UINT32 clock); + nes_benshieng_device(const machine_config &mconfig, const char *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 aca7868fc02..5ae9729db14 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; const device_type NES_SHUIGUAN = &device_creator; -nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sc127_device::nes_sc127_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_mbaby_device::nes_mbaby_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_asn_device::nes_asn_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_smb3p_device::nes_smb3p_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_btl_dn_device::nes_btl_dn_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_whirl2706_device::nes_whirl2706_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_smb2j_device::nes_smb2j_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_smb2ja_device::nes_smb2ja_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_smb2jb_device::nes_smb2jb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_09034a_device::nes_09034a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_tobidase_device::nes_tobidase_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_lh32_device::nes_lh32_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_lh10_device::nes_lh10_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_lh53_device::nes_lh53_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_2708_device::nes_2708_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ac08_device::nes_ac08_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_unl_bb_device::nes_unl_bb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_mmalee_device::nes_mmalee_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_shuiguan_device::nes_shuiguan_device(const machine_config &mconfig, const char *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 9239647deb2..013a6a22b70 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, std::string tag, device_t *owner, UINT32 clock); + nes_ax5705_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sc127_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_mbaby_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_asn_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_smb3p_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_btl_dn_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_whirl2706_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_smb2j_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_smb2ja_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_smb2jb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_09034a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_tobidase_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_lh32_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_lh10_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_lh53_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_2708_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_ac08_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_unl_bb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_mmalee_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_shuiguan_device(const machine_config &mconfig, const char *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 cdc55548dc9..d1418c763f6 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; const device_type NES_GOLDEN5 = &device_creator; -nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bf9096_device::nes_bf9096_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_golden5_device::nes_golden5_device(const machine_config &mconfig, const char *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 bf845dbd7be..f9adeacdca0 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, std::string tag, device_t *owner, UINT32 clock); + nes_bf9093_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bf9096_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_golden5_device(const machine_config &mconfig, const char *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 b4b838ccd7c..76dc0a999f2 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; const device_type NES_CNE_SHLZ = &device_creator; -nes_cne_decathl_device::nes_cne_decathl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_cne_decathl_device::nes_cne_decathl_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_cne_fsb_device::nes_cne_fsb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_cne_shlz_device::nes_cne_shlz_device(const machine_config &mconfig, const char *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 bd42776cec3..f64445aeb01 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, std::string tag, device_t *owner, UINT32 clock); + nes_cne_decathl_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_cne_fsb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_cne_shlz_device(const machine_config &mconfig, const char *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 3499eed1bf3..2f4b29bfab3 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; const device_type NES_YOKO = &device_creator; -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_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_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, std::string tag, device_t *owner, UINT32 clock) +nes_cony_device::nes_cony_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_yoko_device::nes_yoko_device(const machine_config &mconfig, const char *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 ec5200b7c86..625470da1e1 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_yoko_device(const machine_config &mconfig, const char *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 59bd8381d88..cdb41e16830 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nes_datach_slot_device::nes_datach_slot_device(const machine_config &mconfig, const char *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; const device_type NES_DATACH_24C01 = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_datach_24c01_device::nes_datach_24c01_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_datach_device::nes_datach_device(const machine_config &mconfig, const char *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 662e4ff9c70..bda9edfe50e 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, std::string tag, device_t *owner, UINT32 clock); + nes_datach_slot_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_datach_24c01_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_datach_device(const machine_config &mconfig, const char *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 fe4cc4a32e3..e0109a84d94 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; const device_type NES_74X161X138 = &device_creator; -nes_74x161x161x32_device::nes_74x161x161x32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_74x161x161x32_device::nes_74x161x161x32_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_74x139x74_device::nes_74x139x74_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_74x377_device::nes_74x377_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_74x161x138_device::nes_74x161x138_device(const machine_config &mconfig, const char *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 5c73c628d73..94abf418a95 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, std::string tag, device_t *owner, UINT32 clock); + nes_74x161x161x32_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_74x139x74_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_74x377_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_74x161x138_device(const machine_config &mconfig, const char *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 43a06d9432a..38b24438408 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_disksys_device::nes_disksys_device(const machine_config &mconfig, const char *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 b04eea3e88f..7dbefa37ee4 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, std::string tag, device_t *owner, UINT32 clock); + nes_disksys_device(const machine_config &mconfig, const char *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 39bb5d05154..e8cc13e44bc 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_event_device::nes_event_device(const machine_config &mconfig, const char *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 90b4c2b6ff6..7da34bc58c2 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, std::string tag, device_t *owner, UINT32 clock); + nes_event_device(const machine_config &mconfig, const char *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 8d241f5414c..148b9b568ac 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_ggenie_device::nes_ggenie_device(const machine_config &mconfig, const char *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 40fb9bf9005..f0b55ee3753 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, std::string tag, device_t *owner, UINT32 clock); + nes_ggenie_device(const machine_config &mconfig, const char *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 51d13c86dcb..8a212e17bf3 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; const device_type NES_HENGG_SHJY3 = &device_creator; -nes_hengg_srich_device::nes_hengg_srich_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_hengg_srich_device::nes_hengg_srich_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_hengg_xhzs_device::nes_hengg_xhzs_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_hengg_shjy3_device::nes_hengg_shjy3_device(const machine_config &mconfig, const char *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 1eeae6b1ffa..9f1344bfab9 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, std::string tag, device_t *owner, UINT32 clock); + nes_hengg_srich_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_hengg_xhzs_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_hengg_shjy3_device(const machine_config &mconfig, const char *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 10ba7493927..ddfda0590d8 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_hes_device::nes_hes_device(const machine_config &mconfig, const char *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 c3e99bba903..d6e59f90bae 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, std::string tag, device_t *owner, UINT32 clock); + nes_hes_device(const machine_config &mconfig, const char *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 5d96df4f2c5..0525534cbb9 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_hosenkan_device::nes_hosenkan_device(const machine_config &mconfig, const char *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 ae15efc98f2..ca3840bcbb9 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, std::string tag, device_t *owner, UINT32 clock); + nes_hosenkan_device(const machine_config &mconfig, const char *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 e1bfe8a0bf9..5a8a1052849 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; const device_type NES_H3001 = &device_creator; -nes_lrog017_device::nes_lrog017_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_lrog017_device::nes_lrog017_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_holydivr_device::nes_holydivr_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_tam_s1_device::nes_tam_s1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_g101_device::nes_g101_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_h3001_device::nes_h3001_device(const machine_config &mconfig, const char *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 8659faf3470..0e1e55803f7 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, std::string tag, device_t *owner, UINT32 clock); + nes_lrog017_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_holydivr_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_tam_s1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_g101_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_h3001_device(const machine_config &mconfig, const char *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 c0aca2d3054..13be40eac4c 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; const device_type NES_JF33 = &device_creator; -nes_jf11_device::nes_jf11_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_jf11_device::nes_jf11_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_jf13_device::nes_jf13_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_jf16_device::nes_jf16_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_jf17_device::nes_jf17_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_jf17_adpcm_device::nes_jf17_adpcm_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_jf19_device::nes_jf19_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_jf19_adpcm_device::nes_jf19_adpcm_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_jf23_device::nes_jf23_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_jf24_device::nes_jf24_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_jf29_device::nes_jf29_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_jf33_device::nes_jf33_device(const machine_config &mconfig, const char *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 b5562c69b32..7d8536b71ff 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, std::string tag, device_t *owner, UINT32 clock); + nes_jf11_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_jf13_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_jf16_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_jf17_adpcm_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_jf19_adpcm_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_jf23_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_jf24_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_jf29_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_jf33_device(const machine_config &mconfig, const char *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 970fa0e1bb7..08763d250e9 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; const device_type NES_JY_TYPEC = &device_creator; -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_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_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, std::string tag, device_t *owner, UINT32 clock) +nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_jy_typec_device::nes_jy_typec_device(const machine_config &mconfig, const char *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 e2a57b10b25..1eca466d681 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, 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); + 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); // 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + nes_jy_typec_device(const machine_config &mconfig, const char *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 c4ae6b11496..911099d71b4 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; const device_type NES_KS7031 = &device_creator; -nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ks7022_device::nes_ks7022_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ks202_device::nes_ks202_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ks7017_device::nes_ks7017_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ks7012_device::nes_ks7012_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ks7013b_device::nes_ks7013b_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ks7031_device::nes_ks7031_device(const machine_config &mconfig, const char *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 24ead7da934..c38731216a9 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, std::string tag, device_t *owner, UINT32 clock); + nes_ks7058_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_ks7022_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_ks202_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_ks7017_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_ks7012_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_ks7013b_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_ks7031_device(const machine_config &mconfig, const char *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 6ff18f4b34e..d9d0e26a2cf 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nes_kstudio_slot_device::nes_kstudio_slot_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_kstudio_rom_device::nes_kstudio_rom_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_karaokestudio_device::nes_karaokestudio_device(const machine_config &mconfig, const char *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 ca89d9f4dad..3a2f0c6d919 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, std::string tag, device_t *owner, UINT32 clock); + nes_kstudio_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_kstudio_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_karaokestudio_device(const machine_config &mconfig, const char *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 e0935bb89fd..ded2e4b0980 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; const device_type NES_VRC7 = &device_creator; -nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_konami_vrc2_device::nes_konami_vrc2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_konami_vrc3_device::nes_konami_vrc3_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_konami_vrc6_device::nes_konami_vrc6_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_konami_vrc7_device::nes_konami_vrc7_device(const machine_config &mconfig, const char *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 c36fdb1b973..ace9c080fef 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, std::string tag, device_t *owner, UINT32 clock); + nes_konami_vrc1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_konami_vrc2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_konami_vrc3_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_konami_vrc6_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_konami_vrc7_device(const machine_config &mconfig, const char *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 1a665cfda17..cdcc69df682 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; const device_type NES_FFE8 = &device_creator; -nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ffe8_device::nes_ffe8_device(const machine_config &mconfig, const char *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 becc035d09a..4efc4bc96f5 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, std::string tag, device_t *owner, UINT32 clock); + nes_ffe3_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_ffe8_device(const machine_config &mconfig, const char *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 bdf5279c475..b1bd17d3917 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_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_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_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, std::string tag, device_t *owner, UINT32 clock) +nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sorom_device::nes_sorom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sxrom_a_device::nes_sxrom_a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sorom_a_device::nes_sorom_a_device(const machine_config &mconfig, const char *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 ca284bd5f2b..7b71b732a87 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_sorom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sxrom_a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sorom_a_device(const machine_config &mconfig, const char *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 442a111b3ec..9351761f31c 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; const device_type NES_FXROM = &device_creator; -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_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_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, std::string tag, device_t *owner, UINT32 clock) +nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_fxrom_device::nes_fxrom_device(const machine_config &mconfig, const char *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 2c0868e2105..d127aafec2f 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_fxrom_device(const machine_config &mconfig, const char *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 e45f0234204..a9bc5631b0d 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; const device_type NES_ZZ_PCB = &device_creator; -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_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_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, std::string tag, device_t *owner, UINT32 clock) +nes_txrom_device::nes_txrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_hkrom_device::nes_hkrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_txsrom_device::nes_txsrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_tqrom_device::nes_tqrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_qj_device::nes_qj_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_zz_device::nes_zz_device(const machine_config &mconfig, const char *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 9f3936d2f31..6436b247cea 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_hkrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_txsrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_tqrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_qj_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_zz_device(const machine_config &mconfig, const char *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 f9960d369ba..7c320c56060 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; const device_type NES_PJOY84 = &device_creator; -nes_nitra_device::nes_nitra_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ks7057_device::nes_ks7057_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_malisb_device::nes_malisb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_family4646_device::nes_family4646_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_pikay2k_device::nes_pikay2k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_8237_device::nes_8237_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sglionk_device::nes_sglionk_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sgboog_device::nes_sgboog_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_kasing_device::nes_kasing_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_kay_device::nes_kay_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_h2288_device::nes_h2288_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_6035052_device::nes_6035052_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_txc_tw_device::nes_txc_tw_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_kof97_device::nes_kof97_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_kof96_device::nes_kof96_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sf3_device::nes_sf3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_gouder_device::nes_gouder_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sa9602b_device::nes_sa9602b_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +//nes_a9746_device::nes_a9746_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_fk23ca_device::nes_fk23ca_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_s24in1sc03_device::nes_s24in1sc03_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_15in1_device::nes_bmc_15in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_sbig7_device::nes_bmc_sbig7_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_hik8_device::nes_bmc_hik8_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_hik4_device::nes_bmc_hik4_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_mario7in1_device::nes_bmc_mario7in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_gold7in1_device::nes_bmc_gold7in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_gc6in1_device::nes_bmc_gc6in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_411120c_device::nes_bmc_411120c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_830118c_device::nes_bmc_830118c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_pjoy84_device::nes_pjoy84_device(const machine_config &mconfig, const char *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 f1715c02dc7..f803ff87323 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, std::string tag, device_t *owner, UINT32 clock); + nes_nitra_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_ks7057_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sbros11_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_malisb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_family4646_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_pikay2k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_8237_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sglionk_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sgboog_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_kasing_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_kay_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_h2288_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_6035052_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_txc_tw_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_kof97_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_kof96_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sf3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_gouder_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sa9602b_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_shero_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_a9746_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_fk23ca_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_s24in1sc03_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_15in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_sbig7_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_hik8_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_hik4_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_mario7in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_gold7in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_gc6in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_411120c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_830118c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_pjoy84_device(const machine_config &mconfig, const char *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 a5a8201d7ee..7c114ca0e77 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_exrom_device::nes_exrom_device(const machine_config &mconfig, const char *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 17d7c80286a..44569d3d561 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, std::string tag, device_t *owner, UINT32 clock); + nes_exrom_device(const machine_config &mconfig, const char *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 48d0b252382..bd905a11de5 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; const device_type NES_BMC_42IN1RESET = &device_creator; -nes_action52_device::nes_action52_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_action52_device::nes_action52_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_caltron_device::nes_caltron_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_rumblestat_device::nes_rumblestat_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_svision16_device::nes_svision16_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_n625092_device::nes_n625092_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_a65as_device::nes_a65as_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_t262_device::nes_t262_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_novel1_device::nes_novel1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_novel2_device::nes_novel2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_studyngame_device::nes_studyngame_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sgun20in1_device::nes_sgun20in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_vt5201_device::nes_vt5201_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_810544c_device::nes_810544c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ntd03_device::nes_ntd03_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_gb63_device::nes_bmc_gb63_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_gka_device::nes_bmc_gka_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_gkb_device::nes_bmc_gkb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_ws_device::nes_bmc_ws_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_11160_device::nes_bmc_11160_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_g146_device::nes_bmc_g146_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_8157_device::nes_bmc_8157_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_hik300_device::nes_bmc_hik300_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_s700_device::nes_bmc_s700_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_ball11_device::nes_bmc_ball11_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_22games_device::nes_bmc_22games_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_64y2k_device::nes_bmc_64y2k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_12in1_device::nes_bmc_12in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_20in1_device::nes_bmc_20in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_21in1_device::nes_bmc_21in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_31in1_device::nes_bmc_31in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_35in1_device::nes_bmc_35in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_36in1_device::nes_bmc_36in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_64in1_device::nes_bmc_64in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_70in1_device::nes_bmc_70in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_72in1_device::nes_bmc_72in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_76in1_device::nes_bmc_76in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_110in1_device::nes_bmc_110in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_150in1_device::nes_bmc_150in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_190in1_device::nes_bmc_190in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_800in1_device::nes_bmc_800in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_1200in1_device::nes_bmc_1200in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_gold150_device::nes_bmc_gold150_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_gold260_device::nes_bmc_gold260_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_ch001_device::nes_bmc_ch001_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_super22_device::nes_bmc_super22_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_4in1reset_device::nes_bmc_4in1reset_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bmc_42in1reset_device::nes_bmc_42in1reset_device(const machine_config &mconfig, const char *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 06a068213ab..e9ecced4a7a 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, std::string tag, device_t *owner, UINT32 clock); + nes_action52_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_caltron_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_rumblestat_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_svision16_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_n625092_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_a65as_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_t262_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_novel1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_novel2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_studyngame_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sgun20in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_vt5201_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_810544c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_ntd03_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_gb63_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_gka_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_gkb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_ws_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_11160_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_g146_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_8157_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_hik300_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_s700_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_ball11_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_22games_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_64y2k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_12in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_20in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_21in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_31in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_35in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_36in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_64in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_70in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_72in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_76in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_110in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_150in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_190in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_800in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_1200in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_gold150_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_gold260_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_ch001_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_super22_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_4in1reset_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bmc_42in1reset_device(const machine_config &mconfig, const char *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 9cf418e966a..5d166114e49 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; const device_type NES_NAMCOT163 = &device_creator; -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_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_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0) { } -nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_namcot3446_device::nes_namcot3446_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_namcot3425_device::nes_namcot3425_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_namcot175_device::nes_namcot175_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_namcot163_device::nes_namcot163_device(const machine_config &mconfig, const char *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 e8798829cb5..6499218a752 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_namcot3446_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_namcot3425_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_namcot175_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_namcot163_device(const machine_config &mconfig, const char *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 a457f2b4c28..9c4ea8bf3b1 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_nanjing_device::nes_nanjing_device(const machine_config &mconfig, const char *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 10261929efb..3fe4d670527 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, std::string tag, device_t *owner, UINT32 clock); + nes_nanjing_device(const machine_config &mconfig, const char *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 32fabbcbbf3..b7af5aeefd4 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 { - std::string tag; + const char *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.empty()) + while (nes_line->tag) { - if (strcmp(nes_line->tag.c_str(), feature) == 0) + if (strcmp(nes_line->tag, feature) == 0) break; nes_line++; diff --git a/src/devices/bus/nes/nes_slot.cpp b/src/devices/bus/nes/nes_slot.cpp index b40aeaa80e5..05adca0f9ae 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, std::string tag) +void device_nes_cart_interface::prg_alloc(size_t size, const char *tag) { if (m_prg == nullptr) { @@ -213,7 +213,7 @@ void device_nes_cart_interface::prg_alloc(size_t size, std::string tag) } } -void device_nes_cart_interface::vrom_alloc(size_t size, std::string tag) +void device_nes_cart_interface::vrom_alloc(size_t size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +nes_cart_slot_device::nes_cart_slot_device(const machine_config &mconfig, const char *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 a12839e6be2..ad2a1b1c28a 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, std::string tag); - void vrom_alloc(size_t size, std::string tag); + void prg_alloc(size_t size, const char *tag); + void vrom_alloc(size_t size, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_cart_slot_device(const machine_config &mconfig, const char *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 6005e847471..77b983137a3 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; const device_type NES_NTDEC_FH = &device_creator; -nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_ntdec_fh_device::nes_ntdec_fh_device(const machine_config &mconfig, const char *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 6ca17c442de..bc6906179ce 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, std::string tag, device_t *owner, UINT32 clock); + nes_ntdec_asder_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_ntdec_fh_device(const machine_config &mconfig, const char *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 dad30116db6..c7fb9a90f3b 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; const device_type NES_NOCHR = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +nes_nrom_device::nes_nrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_nrom368_device::nes_nrom368_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_fcbasic_device::nes_fcbasic_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_axrom_device::nes_axrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_bxrom_device::nes_bxrom_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_cprom_device::nes_cprom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_gxrom_device::nes_gxrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_uxrom_device::nes_uxrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_uxrom_cc_device::nes_uxrom_cc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_un1rom_device::nes_un1rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_nochr_device::nes_nochr_device(const machine_config &mconfig, const char *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 9b1ddaea421..e813e4f1ad3 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + nes_nrom368_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_fcbasic_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_axrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_bxrom_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_cprom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_gxrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_uxrom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_uxrom_cc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_un1rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_nochr_device(const machine_config &mconfig, const char *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 253b9d6d39b..9d31e1b7a1f 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; const device_type NES_CITYFIGHT = &device_creator; -nes_agci_device::nes_agci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_agci_device::nes_agci_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_dreamtech_device::nes_dreamtech_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_fukutake_device::nes_fukutake_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_futuremedia_device::nes_futuremedia_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_magseries_device::nes_magseries_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_daou306_device::nes_daou306_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_subor0_device::nes_subor0_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_subor1_device::nes_subor1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_cc21_device::nes_cc21_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_xiaozy_device::nes_xiaozy_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_edu2k_device::nes_edu2k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_t230_device::nes_t230_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_mk2_device::nes_mk2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_whero_device::nes_whero_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_43272_device::nes_43272_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_tf1201_device::nes_tf1201_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_cityfight_device::nes_cityfight_device(const machine_config &mconfig, const char *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 75830a399d8..c9425d5e263 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, std::string tag, device_t *owner, UINT32 clock); + nes_agci_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_dreamtech_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_fukutake_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_futuremedia_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_magseries_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_daou306_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_subor0_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_subor1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_cc21_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_xiaozy_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_edu2k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_t230_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_mk2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_whero_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_43272_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_tf1201_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_cityfight_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_fujiya_device(const machine_config &mconfig, const char *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 0f339f6b7ef..c9fec996e8e 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_bandai_pt554_device::nes_bandai_pt554_device(const machine_config &mconfig, const char *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 ade218a0ce8..b42cc048d5e 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, std::string tag, device_t *owner, UINT32 clock); + nes_bandai_pt554_device(const machine_config &mconfig, const char *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 c62edaedd9d..9f549dc1f2d 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_racermate_device::nes_racermate_device(const machine_config &mconfig, const char *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 c0331615eca..3ba50b399ae 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, std::string tag, device_t *owner, UINT32 clock); + nes_racermate_device(const machine_config &mconfig, const char *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 c1398a7f853..a599dcbd432 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; const device_type NES_3DBLOCK = &device_creator; -nes_gs2015_device::nes_gs2015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_gs2015_device::nes_gs2015_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_gs2004_device::nes_gs2004_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_gs2013_device::nes_gs2013_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_tf9_device::nes_tf9_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_3dblock_device::nes_3dblock_device(const machine_config &mconfig, const char *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 3da3108a664..0b78c1e41bf 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, std::string tag, device_t *owner, UINT32 clock); + nes_gs2015_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_gs2004_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_gs2013_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_tf9_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_3dblock_device(const machine_config &mconfig, const char *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 d765edd9559..ed2b7246726 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; const device_type NES_REX_SL1632 = &device_creator; -nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_rex_sl1632_device::nes_rex_sl1632_device(const machine_config &mconfig, const char *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 120368112f3..0b9799ee168 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, std::string tag, device_t *owner, UINT32 clock); + nes_rex_dbz5_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_rex_sl1632_device(const machine_config &mconfig, const char *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 746dfdcc695..a5128b1bf6a 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; const device_type NES_SACHEN_8259D = &device_creator; -nes_sachen_sa009_device::nes_sachen_sa009_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_sa009_device::nes_sachen_sa009_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_sa0036_device::nes_sachen_sa0036_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_sa0037_device::nes_sachen_sa0037_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_sa72007_device::nes_sachen_sa72007_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_sa72008_device::nes_sachen_sa72008_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_tca01_device::nes_sachen_tca01_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_tcu01_device::nes_sachen_tcu01_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_tcu02_device::nes_sachen_tcu02_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +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_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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_8259b_device::nes_sachen_8259b_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_8259c_device::nes_sachen_8259c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sachen_8259d_device::nes_sachen_8259d_device(const machine_config &mconfig, const char *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 05b72385a9f..066a5e86a57 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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_sa009_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_sa0036_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_sa0037_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_sa72007_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_sa72008_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_tca01_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_tcu01_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_tcu02_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_8259b_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_8259c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sachen_8259d_device(const machine_config &mconfig, const char *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 acdbf59e920..39af6273eee 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_somari_device::nes_somari_device(const machine_config &mconfig, const char *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 69b52cf8455..340bdc1d439 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, std::string tag, device_t *owner, UINT32 clock); + nes_somari_device(const machine_config &mconfig, const char *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 c28554c5c67..8cc1929b308 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; const device_type NES_SUNSOFT_5 = &device_creator; -nes_sunsoft_1_device::nes_sunsoft_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_sunsoft_1_device::nes_sunsoft_1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sunsoft_2_device::nes_sunsoft_2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sunsoft_3_device::nes_sunsoft_3_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_sunsoft_5_device::nes_sunsoft_5_device(const machine_config &mconfig, const char *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 70ce2f7be12..8e55a80ce39 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, std::string tag, device_t *owner, UINT32 clock); + nes_sunsoft_1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sunsoft_2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sunsoft_3_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_sunsoft_5_device(const machine_config &mconfig, const char *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 2e96637af77..25d1a1db623 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_ntb_rom_device::nes_ntb_rom_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_sunsoft_dcs_device::nes_sunsoft_dcs_device(const machine_config &mconfig, const char *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 c646a79f1a8..83393719cf7 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, std::string tag, device_t *owner, UINT32 clock); + nes_ntb_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_ntb_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_sunsoft_dcs_device(const machine_config &mconfig, const char *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 81d2106acd9..6d3a4e68941 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; const device_type NES_X1_017 = &device_creator; -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_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_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_tc0190fmc_pal16r4_device::nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_x1_005_device::nes_x1_005_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_x1_017_device::nes_x1_017_device(const machine_config &mconfig, const char *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 7876570f660..38fa05d960c 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_x1_005_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_x1_017_device(const machine_config &mconfig, const char *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 809c8266b53..828519a0e71 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; const device_type NES_TENGEN_800037 = &device_creator; -nes_tengen008_device::nes_tengen008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_tengen008_device::nes_tengen008_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_tengen037_device::nes_tengen037_device(const machine_config &mconfig, const char *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 1cd88894603..d812443b613 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, std::string tag, device_t *owner, UINT32 clock); + nes_tengen008_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_tengen037_device(const machine_config &mconfig, const char *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 73512f43c3a..ae36ece75ee 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; const device_type NES_TXC_COMMANDOS = &device_creator; -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_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_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_txc_dumarc_device::nes_txc_dumarc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_txc_mjblock_device::nes_txc_mjblock_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_txc_strikew_device::nes_txc_strikew_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_txc_commandos_device::nes_txc_commandos_device(const machine_config &mconfig, const char *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 3dc45316c26..cd190c51f37 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_txc_dumarc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_txc_mjblock_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_txc_strikew_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_txc_commandos_device(const machine_config &mconfig, const char *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 f573843024c..f4dbd58d718 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; const device_type NES_WAIXING_FS304 = &device_creator; -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_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_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_a1_device::nes_waixing_a1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_b_device::nes_waixing_b_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_c_device::nes_waixing_c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_d_device::nes_waixing_d_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_e_device::nes_waixing_e_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_f_device::nes_waixing_f_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_g_device::nes_waixing_g_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_h1_device::nes_waixing_h1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_i_device::nes_waixing_i_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_j_device::nes_waixing_j_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_sh2_device::nes_waixing_sh2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_sec_device::nes_waixing_sec_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_sgz_device::nes_waixing_sgz_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_sgzlz_device::nes_waixing_sgzlz_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_ffv_device::nes_waixing_ffv_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_wxzs_device::nes_waixing_wxzs_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_dq8_device::nes_waixing_dq8_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_wxzs2_device::nes_waixing_wxzs2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nes_waixing_fs304_device::nes_waixing_fs304_device(const machine_config &mconfig, const char *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 90506ae85fb..132b3673cee 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_a1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_b_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_d_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_e_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_f_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_g_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_h1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_i_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_j_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_sh2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_sec_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_sgz_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_sgzlz_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_ffv_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_wxzs_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_dq8_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_wxzs2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_waixing_fs304_device(const machine_config &mconfig, const char *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 2d3180a0caf..e5adb5feb97 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nes_control_port_interface(mconfig, *this), m_latch(0) { } -nes_4score_p1p3_device::nes_4score_p1p3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nes_4score_p1p3_device::nes_4score_p1p3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +nes_4score_p2p4_device::nes_4score_p2p4_device(const machine_config &mconfig, const char *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 e54e0320280..c05cb403b39 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_4score_p1p3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_4score_p2p4_device(const machine_config &mconfig, const char *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 dc1523f7f1f..15755d283ca 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nes_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, std::string tag, device_t *owner, UINT32 clock) : +nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *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, std::string tag, { } -nes_vausfc_device::nes_vausfc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nes_vausfc_device::nes_vausfc_device(const machine_config &mconfig, const char *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 b6932f8fb4a..d693bb7c0b7 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nes_vausfc_device(const machine_config &mconfig, const char *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 b14864efc61..336a14e92c8 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, std::string tag, device_t *owner, UINT32 clock) : +nes_bcbattle_device::nes_bcbattle_device(const machine_config &mconfig, const char *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 eb9e954db91..cbc7125c041 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, std::string tag, device_t *owner, UINT32 clock); + nes_bcbattle_device(const machine_config &mconfig, const char *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 6e57faaabd2..a1ef7dc9c1a 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, std::string tag, device_t *owner, UINT32 clock) : +nes_control_port_device::nes_control_port_device(const machine_config &mconfig, const char *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 1d03ee4c40d..e899258547c 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, std::string tag, device_t *owner, UINT32 clock); + nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~nes_control_port_device(); static void set_brightpixel_callback(device_t &device, nesctrl_brightpixel_delegate callback) { downcast(device).m_brightpixel_cb = callback; } diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp index 1aec70ccfec..2381933041c 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, std::string tag, device_t *owner, UINT32 clock) : +nes_fckeybrd_device::nes_fckeybrd_device(const machine_config &mconfig, const char *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 32669b531df..f4cdc02ba39 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, std::string tag, device_t *owner, UINT32 clock); + nes_fckeybrd_device(const machine_config &mconfig, const char *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 027bab1d7af..506418d4446 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, std::string tag, device_t *owner, UINT32 clock) : +nes_ftrainer_device::nes_ftrainer_device(const machine_config &mconfig, const char *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 054ca8d3b39..f426f4e6a2c 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, std::string tag, device_t *owner, UINT32 clock); + nes_ftrainer_device(const machine_config &mconfig, const char *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 4cde0104cc6..cecf1f05dbc 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, std::string tag, device_t *owner, UINT32 clock) : +nes_horitwin_device::nes_horitwin_device(const machine_config &mconfig, const char *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, std::str { } -nes_hori4p_device::nes_hori4p_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nes_hori4p_device::nes_hori4p_device(const machine_config &mconfig, const char *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 7d7ce26659e..613a8bdac7c 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, std::string tag, device_t *owner, UINT32 clock); + nes_horitwin_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_hori4p_device(const machine_config &mconfig, const char *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 f03c0b7616d..7a78d08f2c7 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nes_control_port_interface(mconfig, *this), m_joypad(*this, "JOYPAD"), m_latch(0) { } -nes_joypad_device::nes_joypad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nes_joypad_device::nes_joypad_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +nes_fcpad2_device::nes_fcpad2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +nes_ccpadl_device::nes_ccpadl_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +nes_ccpadr_device::nes_ccpadr_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +nes_arcstick_device::nes_arcstick_device(const machine_config &mconfig, const char *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 acdd01552e4..8430db4dff9 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + nes_fcpad2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_ccpadl_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_ccpadr_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nes_arcstick_device(const machine_config &mconfig, const char *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 4adab90266d..46d5fb1f2fa 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, std::string tag, device_t *owner, UINT32 clock) : +nes_konamihs_device::nes_konamihs_device(const machine_config &mconfig, const char *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 0a7e1590de8..da3aca612be 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, std::string tag, device_t *owner, UINT32 clock); + nes_konamihs_device(const machine_config &mconfig, const char *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 33b59fb679b..6fdbc6f273a 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, std::string tag, device_t *owner, UINT32 clock) : +nes_miracle_device::nes_miracle_device(const machine_config &mconfig, const char *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 f43d80a1f58..6d0730423aa 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, std::string tag, device_t *owner, UINT32 clock); + nes_miracle_device(const machine_config &mconfig, const char *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 756b3dba46c..8a4710c2c88 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, std::string tag, device_t *owner, UINT32 clock) : +nes_mjpanel_device::nes_mjpanel_device(const machine_config &mconfig, const char *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 c56e6dc8745..ad470cb91e7 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, std::string tag, device_t *owner, UINT32 clock); + nes_mjpanel_device(const machine_config &mconfig, const char *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 31750f145b8..c4fdeb4b5d9 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, std::string tag, device_t *owner, UINT32 clock) : +nes_pachinko_device::nes_pachinko_device(const machine_config &mconfig, const char *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 18f2670c76f..04fad189160 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, std::string tag, device_t *owner, UINT32 clock); + nes_pachinko_device(const machine_config &mconfig, const char *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 496adc0181c..2a1acd8adc9 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, std::string tag, device_t *owner, UINT32 clock) : +nes_partytap_device::nes_partytap_device(const machine_config &mconfig, const char *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 d11949f66aa..f66b7af7eec 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, std::string tag, device_t *owner, UINT32 clock); + nes_partytap_device(const machine_config &mconfig, const char *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 458c4501030..569695d97ca 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, std::string tag, device_t *owner, UINT32 clock) : +nes_powerpad_device::nes_powerpad_device(const machine_config &mconfig, const char *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 fc6da2821b8..a69486e7e23 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, std::string tag, device_t *owner, UINT32 clock); + nes_powerpad_device(const machine_config &mconfig, const char *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 d29f4a3d19b..13f8bb72481 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, std::string tag, device_t *owner, UINT32 clock) : +nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, const char *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 041056a9bc6..b50b0e3bb94 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, std::string tag, device_t *owner, UINT32 clock); + nes_suborkey_device(const machine_config &mconfig, const char *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 94f353deb04..422b9664f5e 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, std::string tag, device_t *owner, UINT32 clock) : +nes_zapper_device::nes_zapper_device(const machine_config &mconfig, const char *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 200c206d71b..8aedda7fc7a 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, std::string tag, device_t *owner, UINT32 clock); + nes_zapper_device(const machine_config &mconfig, const char *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 680e20d501a..175139f19c2 100644 --- a/src/devices/bus/nubus/nubus.cpp +++ b/src/devices/bus/nubus/nubus.cpp @@ -26,19 +26,21 @@ const device_type NUBUS_SLOT = &device_creator; //------------------------------------------------- // nubus_slot_device - constructor //------------------------------------------------- -nubus_slot_device::nubus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nubus_slot_device::nubus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_SLOT, "NUBUS_SLOT", tag, owner, clock, "nubus_slot", __FILE__), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), + m_nubus_tag(nullptr), + m_nubus_slottag(nullptr) { } -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) : +nubus_slot_device::nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_interface(mconfig, *this) + device_slot_interface(mconfig, *this), m_nubus_tag(nullptr), m_nubus_slottag(nullptr) { } -void nubus_slot_device::static_set_nubus_slot(device_t &device, std::string tag, std::string slottag) +void nubus_slot_device::static_set_nubus_slot(device_t &device, const char *tag, const char *slottag) { nubus_slot_device &nubus_card = dynamic_cast(device); nubus_card.m_nubus_tag = tag; @@ -62,7 +64,7 @@ void nubus_slot_device::device_start() const device_type NUBUS = &device_creator; -void nubus_device::static_set_cputag(device_t &device, std::string tag) +void nubus_device::static_set_cputag(device_t &device, const char *tag) { nubus_device &nubus = downcast(device); nubus.m_cputag = tag; @@ -76,25 +78,25 @@ void nubus_device::static_set_cputag(device_t &device, std::string tag) // nubus_device - constructor //------------------------------------------------- -nubus_device::nubus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nubus_device::nubus_device(const machine_config &mconfig, const char *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_out_irqe_cb(*this), m_cputag(nullptr) { } -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) : +nubus_device::nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), 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_out_irqe_cb(*this), m_cputag(nullptr) { } //------------------------------------------------- @@ -211,7 +213,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, std::string tag, UINT8 *data) +void nubus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) { // printf("install_bank: %s @ %x->%x mask %x mirror %x\n", tag, start, end, mask, mirror); m_maincpu = machine().device(m_cputag); @@ -257,7 +259,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_slot(0), m_next(nullptr) + m_nubus_tag(nullptr), m_nubus_slottag(nullptr), m_slot(0), m_next(nullptr) { } @@ -270,7 +272,7 @@ device_nubus_card_interface::~device_nubus_card_interface() { } -void device_nubus_card_interface::static_set_nubus_tag(device_t &device, std::string tag, std::string slottag) +void device_nubus_card_interface::static_set_nubus_tag(device_t &device, const char *tag, const char *slottag) { device_nubus_card_interface &nubus_card = dynamic_cast(device); nubus_card.m_nubus_tag = tag; @@ -279,18 +281,18 @@ void device_nubus_card_interface::static_set_nubus_tag(device_t &device, std::st void device_nubus_card_interface::set_nubus_device() { - if (!strncmp(m_nubus_slottag.c_str(), "pds030", 6)) + if (!strncmp(m_nubus_slottag, "pds030", 6)) { m_slot = 0x9; // '030 PDS slots phantom slot as NuBus slots $9, $A, and $B } - else if (!strncmp(m_nubus_slottag.c_str(), "lcpds", 6)) + else if (!strncmp(m_nubus_slottag, "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 = m_nubus_slottag.length(); + int tlen = strlen(m_nubus_slottag); if (m_nubus_slottag[tlen-1] == '9') { @@ -311,10 +313,14 @@ 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, std::string tag, UINT8 *data) +void device_nubus_card_interface::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data) { - // append an underscore and the slot name to the bank so it's guaranteed unique - std::string bank = tag + "_" + m_nubus_slottag; + 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); m_nubus->install_bank(start, end, mask, mirror, bank, data); } @@ -455,7 +461,9 @@ void device_nubus_card_interface::install_declaration_rom(device_t *dev, const c // now install the ROM UINT32 addr = get_slotspace() + 0x01000000; - std::string bankname = "rom_" + m_nubus_slottag; + char bankname[128]; + strcpy(bankname, "rom_"); + strcat(bankname, 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 7d670e01729..4bb736f1eb7 100644 --- a/src/devices/bus/nubus/nubus.h +++ b/src/devices/bus/nubus/nubus.h @@ -64,18 +64,17 @@ class nubus_slot_device : public device_t, { public: // construction/destruction - 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); + 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); // device-level overrides virtual void device_start() override; // inline configuration - static void static_set_nubus_slot(device_t &device, std::string tag, std::string slottag); + static void static_set_nubus_slot(device_t &device, const char *tag, const char *slottag); protected: // configuration - std::string m_nubus_tag; - std::string m_nubus_slottag; + const char *m_nubus_tag, *m_nubus_slottag; }; // device type definition @@ -88,12 +87,12 @@ class nubus_device : public device_t { public: // construction/destruction - 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(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() { m_device_list.detach_all(); } // inline configuration - static void static_set_cputag(device_t &device, std::string tag); + static void static_set_cputag(device_t &device, const char *tag); template static devcb_base &set_out_irq9_callback(device_t &device, _Object object) { return downcast(device).m_out_irq9_cb.set_callback(object); } template static devcb_base &set_out_irqa_callback(device_t &device, _Object object) { return downcast(device).m_out_irqa_cb.set_callback(object); } template static devcb_base &set_out_irqb_callback(device_t &device, _Object object) { return downcast(device).m_out_irqb_cb.set_callback(object); } @@ -107,7 +106,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, std::string tag, UINT8 *data); + void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data); void set_irq_line(int slot, int state); DECLARE_WRITE_LINE_MEMBER( irq9_w ); @@ -133,7 +132,7 @@ protected: devcb_write_line m_out_irqe_cb; simple_list m_device_list; - std::string m_cputag; + const char *m_cputag; }; @@ -157,7 +156,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, std::string tag, UINT8 *data); + void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data); UINT32 get_slotspace() { return 0xf0000000 | (m_slot<<24); } UINT32 get_super_slotspace() { return m_slot<<28; } @@ -166,11 +165,10 @@ 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, std::string tag, std::string slottag); + static void static_set_nubus_tag(device_t &device, const char *tag, const char *slottag); public: nubus_device *m_nubus; - std::string m_nubus_tag; - std::string m_nubus_slottag; + const char *m_nubus_tag, *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 2ce8aea0b10..2021def0a5d 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) : +nubus_48gc_device::nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : jmfb_device(mconfig, NUBUS_48GC, "Apple 4*8 video card", tag, owner, clock, "nb_48gc", __FILE__) { m_is824 = false; } -nubus_824gc_device::nubus_824gc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nubus_824gc_device::nubus_824gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : jmfb_device(mconfig, NUBUS_824GC, "Apple 8*24 video card", tag, owner, clock, "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 ff09fb5d82b..b32b057cfda 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -53,13 +53,13 @@ public: class nubus_48gc_device : public jmfb_device { public: - nubus_48gc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class nubus_824gc_device : public jmfb_device { public: - nubus_824gc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_824gc_device(const machine_config &mconfig, const char *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 93be1bfec52..1d911055e11 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, NUBUS_ASNTMC3NB, name, tag, owner, clock, shortname, source), device_nubus_card_interface(mconfig, *this), m_dp83902(*this, MAC8390_839X) { } -nubus_asntmc3nb_device::nubus_asntmc3nb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nubus_asntmc3nb_device::nubus_asntmc3nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nubus_mac8390_device(mconfig, NUBUS_ASNTMC3NB, "Asante MC3NB Ethernet card", tag, owner, clock, "nb_amc3b", __FILE__) { } -nubus_appleenet_device::nubus_appleenet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nubus_appleenet_device::nubus_appleenet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nubus_mac8390_device(mconfig, NUBUS_APPLEENET, "Apple NuBus Ethernet card", tag, owner, clock, "nb_aenet", __FILE__) { } diff --git a/src/devices/bus/nubus/nubus_asntmc3b.h b/src/devices/bus/nubus/nubus_asntmc3b.h index c6ef6a87e93..7933cc11623 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -51,13 +51,13 @@ private: class nubus_asntmc3nb_device : public nubus_mac8390_device { public: - nubus_asntmc3nb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_asntmc3nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class nubus_appleenet_device : public nubus_mac8390_device { public: - nubus_appleenet_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nubus_appleenet_device(const machine_config &mconfig, const char *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 51011eb532b..29889da8a46 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_CB264, "RasterOps ColorBoard 264 video card", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nubus_card_interface(mconfig, *this), m_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 a07e3a104a6..fe0a934d7c8 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, 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); + 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); // 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 351872eae14..412925fc351 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, std::string tag, device_t *owner, UINT32 clock); + messimg_disk_image_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +messimg_disk_image_device::messimg_disk_image_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +nubus_image_device::nubus_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_IMAGE, "Disk Image Pseudo-Card", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nubus_card_interface(mconfig, *this), m_image(nullptr) { diff --git a/src/devices/bus/nubus/nubus_image.h b/src/devices/bus/nubus/nubus_image.h index 5cd1d26126f..d850b3f7735 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, 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); + 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); // 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 05a1acee433..3cf9e5abead 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_M2HIRES, "Macintosh II Hi-Resolution video card", tag, owner, clock, "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, std::s m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 b35aca6ed1e..e11e6e1a3ff 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, 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); + 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); // 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 2dfb12ccf83..ec4b7fb6d4c 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_M2VIDEO, "Macintosh II Video Card", tag, owner, clock, "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, std::s m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 26c0c398218..9dd7bc4a80b 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, 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); + 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); // 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 83d5a726f8d..84188fd215e 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_RADIUSTPD, "Radius Two Page Display video card", tag, owner, clock, "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, st m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 ad227185eae..c8968ca30eb 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, 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); + 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); // 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 abcdadfc49d..8b2651bcff8 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_SPEC8S3, "SuperMac Spectrum/8 Series III video card", tag, owner, clock, "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, std::s m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 971eef50266..57c721afde5 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, 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); + 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); // 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 c8c82c59c6d..d67ac04ef31 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_SPECPDQ, "SuperMac Spectrum PDQ video card", tag, owner, clock, "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, std::s m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 ae1bccdfe6b..ef260f7512a 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, 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); + 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); // 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 4315a093eff..532e9b66145 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_VIKBW, "Moniterm Viking video card", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nubus_card_interface(mconfig, *this), m_vbl_disable(0) { diff --git a/src/devices/bus/nubus/nubus_vikbw.h b/src/devices/bus/nubus/nubus_vikbw.h index c98ff035f46..e7a7b090eb1 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, 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); + 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); // 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 d26cb978430..3fe0e4c3ec0 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NUBUS_WSPORTRAIT, "Macintosh II Portrait Video Card", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 cef28ae68b7..9afdf36d8c7 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, 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); + 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); // 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 0305f830b7f..eb5550cb64e 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_XCEED30HR, "Micron/XCEED Technology Color 30HR", tag, owner, clock, "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, st m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 5d52239f231..7cb832d4af3 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, 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); + 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); // 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 c100739741b..b5c10671aea 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_CB264SE30, "RasterOps Colorboard 264/SE30", tag, owner, clock, "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, st m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 17893bfd39a..4932468e573 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, 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); + 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); // 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 985886b8b09..4c0e6999541 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_XCEEDMC30, "Micron/XCEED Technology MacroColor 30", tag, owner, clock, "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, st m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 5c1b05cd064..b9bcc01a42a 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, 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); + 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); // 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 8b8df5a1af0..bb995682381 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_PROCOLOR816, "Lapis ProColor Server 8*16", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 90fec177365..5dfabef5be4 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, 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); + 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); // 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 9c180cc9c88..88eab2ffdcb 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, std::string tag, device_t *owner, UINT32 clock) : +nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDS030_LVIEW, "Sigma Designs L-View", tag, owner, clock, "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, std::strin m_screen_tag = m_assembled_tag.c_str(); } -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) : +nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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 6f4193c40eb..3fe9d94f952 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, 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); + 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); // 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 6b12bd05160..8885733923c 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +o2_chess_device::o2_chess_device(const machine_config &mconfig, const char *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 f02c58df866..4cfefa10347 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, std::string tag, device_t *owner, UINT32 clock); + o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); private: required_device m_cpu; diff --git a/src/devices/bus/odyssey2/rom.cpp b/src/devices/bus/odyssey2/rom.cpp index cf4e31583cb..dd2a3739bea 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; const device_type O2_ROM_16K = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +o2_rom_device::o2_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +o2_rom12_device::o2_rom12_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +o2_rom16_device::o2_rom16_device(const machine_config &mconfig, const char *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 8ff695e07cb..7f82a0c0e1a 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + o2_rom12_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + o2_rom16_device(const machine_config &mconfig, const char *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 903af4f96d2..0a6e35028b9 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, std::string tag) +void device_o2_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +o2_cart_slot_device::o2_cart_slot_device(const machine_config &mconfig, const char *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 620b45bc5aa..6634ed57c61 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + o2_cart_slot_device(const machine_config &mconfig, const char *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 0de03544e2f..338b8053f64 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +o2_voice_device::o2_voice_device(const machine_config &mconfig, const char *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 63fcc1de973..6616753238d 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, std::string tag, device_t *owner, UINT32 clock); + o2_voice_device(const machine_config &mconfig, const char *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 114a8ad3682..49034d22d16 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, std::string tag, device_t *owner, UINT32 clock) : +jasmin_device::jasmin_device(const machine_config &mconfig, const char *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 bbd1fb35b00..5d27895ccfa 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, std::string tag, device_t *owner, UINT32 clock); + jasmin_device(const machine_config &mconfig, const char *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 40a1112a968..abb2ea138fd 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, std::string tag, device_t *owner, UINT32 clock) : +microdisc_device::microdisc_device(const machine_config &mconfig, const char *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 151d4e1665f..9ffc2f23f14 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, std::string tag, device_t *owner, UINT32 clock); + microdisc_device(const machine_config &mconfig, const char *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 24acefd9f9c..2c1894b385c 100644 --- a/src/devices/bus/oricext/oricext.cpp +++ b/src/devices/bus/oricext/oricext.cpp @@ -6,10 +6,11 @@ const device_type ORICEXT_CONNECTOR = &device_creator; -oricext_connector::oricext_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +oricext_connector::oricext_connector(const machine_config &mconfig, const char *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) + irq_handler(*this), + cputag(nullptr) { } @@ -17,7 +18,7 @@ oricext_connector::~oricext_connector() { } -void oricext_connector::set_cputag(std::string tag) +void oricext_connector::set_cputag(const char *tag) { cputag = tag; } @@ -39,9 +40,10 @@ void oricext_connector::device_config_complete() dev->set_cputag(cputag); } -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) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - device_slot_card_interface(mconfig, *this), + device_slot_card_interface(mconfig, *this), + cputag(nullptr), cpu(nullptr), connector(nullptr), bank_c000_r(nullptr), @@ -55,7 +57,7 @@ oricext_device::oricext_device(const machine_config &mconfig, device_type type, { } -void oricext_device::set_cputag(std::string tag) +void oricext_device::set_cputag(const char *tag) { cputag = tag; } diff --git a/src/devices/bus/oricext/oricext.h b/src/devices/bus/oricext/oricext.h index eb8dd010d0f..738850a40b5 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, std::string tag, device_t *owner, UINT32 clock); + oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~oricext_connector(); - void set_cputag(std::string tag); + void set_cputag(const char *tag); template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).irq_handler.set_callback(object); } void irq_w(int state); protected: devcb_write_line irq_handler; - std::string cputag; + const char *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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); - void set_cputag(std::string tag); + void set_cputag(const char *tag); DECLARE_WRITE_LINE_MEMBER(irq_w); protected: - std::string cputag; + const char *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 491a8dbb3b2..14c2b99e8a1 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pc_joy_device::pc_joy_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pc_basic_joy_device::pc_basic_joy_device(const machine_config &mconfig, const char *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 6da702beb4b..c5e1d890c8e 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, std::string tag, device_t *owner, UINT32 clock); + pc_joy_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pc_basic_joy_device(const machine_config &mconfig, const char *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 7c4ef4ede65..4d826e9f62a 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(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : +pc_mssw_pad_device::pc_mssw_pad_device(const machine_config& mconfig, const char* 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 8260d462179..29500ed35ea 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, std::string tag, device_t *owner, UINT32 clock); + pc_mssw_pad_device(const machine_config &mconfig, const char *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 f1af25ba8b3..54c4d6b3a97 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, std::string tag, device_t *owner, UINT32 clock) +ec_1841_keyboard_device::ec_1841_keyboard_device(const machine_config &mconfig, const char *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().c_str(), state)); + DBG_LOG(1,0,( "%s: clock write %d\n", tag(), 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().c_str(), state)); + DBG_LOG(1,0,( "%s: data write %d\n", tag(), 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().c_str(), data)); + DBG_LOG(2,0,( "%s: bus_w %02x\n", tag(), 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().c_str(), data)); + DBG_LOG(1,0,( "%s: p1_r %02x\n", tag(), 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().c_str(), data)); + DBG_LOG(1,0,( "%s: p1_w %02x\n", tag(), 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().c_str(), data)); + DBG_LOG(1,0,( "%s: p2_w %02x\n", tag(), 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().c_str(), m_bus, m_q)); + DBG_LOG(1,0,( "%s: bus %02X t1_r %d\n", tag(), 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 b364d9af470..b91564cbe62 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, std::string tag, device_t *owner, UINT32 clock); + ec_1841_keyboard_device(const machine_config &mconfig, const char *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 2afa47cb723..b90fd1cef14 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, std::string tag, device_t *owner, UINT32 clock) +iskr_1030_keyboard_device::iskr_1030_keyboard_device(const machine_config &mconfig, const char *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().c_str(), state)); + DBG_LOG(1,0,( "%s: clock write %d\n", tag(), 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().c_str(), state)); + DBG_LOG(1,0,( "%s: data write %d\n", tag(), 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().c_str(), data)); + DBG_LOG(2,0,( "%s: t1_r (l) %d\n", tag(), data)); return data; } if (bias) { - DBG_LOG(2,0,( "%s: t1_r (b) %d\n", tag().c_str(), bias)); + DBG_LOG(2,0,( "%s: t1_r (b) %d\n", tag(), 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().c_str(), m_bus&3, m_bus>>2, data)); + DBG_LOG(2,0,( "%s: t1_r (k r%d c%d) %d\n", tag(), 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().c_str(), offset, data)); + DBG_LOG(2,0,( "%s: ram_w[%02x] <- %02x\n", tag(), 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().c_str(), offset, m_ram[offset])); + DBG_LOG(2,0,( "%s: ram_r[%02x] = %02x\n", tag(), 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().c_str(), data)); + DBG_LOG(1,0,( "%s: p1_r %02x\n", tag(), 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().c_str(), data)); + DBG_LOG(1,0,( "%s: p2_w %02x\n", tag(), 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().c_str(), 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(), 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 7ff9d549626..8ea16a802eb 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, std::string tag, device_t *owner, UINT32 clock); + iskr_1030_keyboard_device(const machine_config &mconfig, const char *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 2ae91f50cf3..8dd5a4e3d5c 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, std::string tag, device_t *owner, UINT32 clock) : +pc_kbd_keytronic_pc3270_device::pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBD_KEYTRONIC_PC3270, "Keytronic PC3270", tag, owner, clock, "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 722e511919f..5fdcbf72f87 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, std::string tag, device_t *owner, UINT32 clock); + pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_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, std::string tag, device_t *owner, UINT32 clock) + pc_kbd_keytronic_pc3270_at_device(const machine_config &mconfig, const char *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 375ccc41591..2d300841d26 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, std::string tag, device_t *owner, UINT32 clock) +pc_kbd_microsoft_natural_device::pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC_KBD_MICROSOFT_NATURAL, "Microsoft Natural Keyboard", tag, owner, clock, "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().c_str(), m_p1, m_p2 ); + logerror("%s: P0 read. P1 = %02x, P2 = %02x\n", tag(), 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 0bb566dbb1f..600138f9479 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, std::string tag, device_t *owner, UINT32 clock); + pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_cpu; diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp index 45d74cfef73..e79c4126c47 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, std::string tag, device_t *owner, UINT32 clock) +ibm_pc_83_keyboard_device::ibm_pc_83_keyboard_device(const machine_config &mconfig, const char *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 43566b65344..b445c5b1f45 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, std::string tag, device_t *owner, UINT32 clock); + ibm_pc_83_keyboard_device(const machine_config &mconfig, const char *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 a5243fe2350..9f920c6d5dd 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 - constructor //------------------------------------------------- -pc_kbdc_slot_device::pc_kbdc_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pc_kbdc_slot_device::pc_kbdc_slot_device(const machine_config &mconfig, const char *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 - constructor //------------------------------------------------- -pc_kbdc_device::pc_kbdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pc_kbdc_device::pc_kbdc_device(const machine_config &mconfig, const char *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_next(nullptr) + m_pc_kbdc_tag(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 a23606ba45a..3f1788ac021 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, std::string tag, device_t *owner, UINT32 clock); + pc_kbdc_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pc_kbdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_clock_callback(device_t &device, _Object object) { return downcast(device).m_out_clock_cb.set_callback(object); } template static devcb_base &set_out_data_callback(device_t &device, _Object object) { return downcast(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; - std::string m_pc_kbdc_tag; + const char *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 6e5aa21d586..eeaf9494fd3 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ibm_3270pc_122_keyboard_device::ibm_3270pc_122_keyboard_device(const machine_config &mconfig, const char *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 6b2103197bf..e099dd31760 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + ibm_3270pc_122_keyboard_device(const machine_config &mconfig, const char *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 5f189ad05d3..dfbc5616b73 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, std::string tag, device_t *owner, UINT32 clock) +ibm_pc_xt_83_keyboard_device::ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, const char *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 8c28c60d4ff..af53d6244b4 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, std::string tag, device_t *owner, UINT32 clock); + ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, const char *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 902e05057b9..5323f8a675b 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; const device_type PCE_ROM_SF2 = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +pce_rom_device::pce_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pce_cdsys3_device::pce_cdsys3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pce_populous_device::pce_populous_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pce_sf2_device::pce_sf2_device(const machine_config &mconfig, const char *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 1f3fec2ae7c..14d6dc29577 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + pce_cdsys3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pce_populous_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pce_sf2_device(const machine_config &mconfig, const char *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 1b3e13dad67..4fffa5172fc 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, std::string tag) +void device_pce_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +pce_cart_slot_device::pce_cart_slot_device(const machine_config &mconfig, const char *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 86aa14aede3..e680ef7b950 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + pce_cart_slot_device(const machine_config &mconfig, const char *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 a291d35dd85..dfdc278a77d 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, std::string tag, device_t *owner, UINT32 clock) : +pet_64k_expansion_device::pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PET_64K, "PET 64KB RAM", tag, owner, clock, "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 74ddd60ecc2..ed698f539d1 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, std::string tag, device_t *owner, UINT32 clock); + pet_64k_expansion_device(const machine_config &mconfig, const char *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 b51ff3100fc..585e651f3d7 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_pet_datassette_port_interface(mconfig, *this), m_cassette(*this, "cassette"), @@ -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, std::string tag, device_t *owner, UINT32 clock) +c2n_device::c2n_device(const machine_config &mconfig, const char *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, std::string tag, device_t // c1530_device - constructor //------------------------------------------------- -c1530_device::c1530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c1530_device::c1530_device(const machine_config &mconfig, const char *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, std::string tag, devic // c1531_device - constructor //------------------------------------------------- -c1531_device::c1531_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c1531_device::c1531_device(const machine_config &mconfig, const char *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 afaf19a60eb..5aeac83ce0b 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, 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); + c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides 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, std::string tag, device_t *owner, UINT32 clock); + c1530_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/pet/cass.cpp b/src/devices/bus/pet/cass.cpp index 8977805f7a1..cb715a18434 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, std::string tag, device_t *owner, UINT32 clock) : +pet_datassette_port_device::pet_datassette_port_device(const machine_config &mconfig, const char *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 9cb97347e88..a3dbda7797d 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, std::string tag, device_t *owner, UINT32 clock); + pet_datassette_port_device(const machine_config &mconfig, const char *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 f1d317af458..d89ef26268c 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, std::string tag, device_t *owner, UINT32 clock) : +pet_userport_cb2_sound_device::pet_userport_cb2_sound_device(const machine_config &mconfig, const char *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 c653e9ad3ba..8f62c8973bf 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, std::string tag, device_t *owner, UINT32 clock); + pet_userport_cb2_sound_device(const machine_config &mconfig, const char *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 fa2343c5825..7cd73c6fff0 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 void set_callbacks(_read rd, _write wr) { diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp index 00c786db8e1..2a90008c307 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_pet_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, std::string tag, device_t *owner, UINT32 clock) : +cbm8000_hsg_a_t::cbm8000_hsg_a_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +cbm8000_hsg_b_t::cbm8000_hsg_b_t(const machine_config &mconfig, const char *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 7fc60fda6e9..abe9067c498 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual const rom_entry *device_rom_region() const 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, std::string tag, device_t *owner, UINT32 clock); + cbm8000_hsg_a_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cbm8000_hsg_b_t(const machine_config &mconfig, const char *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 ed3d9b9ba42..4bc335e7dab 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, std::string tag, device_t *owner, UINT32 clock) : +pet_userport_joystick_adapter_device::pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *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 bc5a3b375dd..720594e9561 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, std::string tag, device_t *owner, UINT32 clock); + pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *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 f52b351a18c..592e50b8327 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, std::string tag, device_t *owner, UINT32 clock) : +superpet_device::superpet_device(const machine_config &mconfig, const char *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 19b19e49c06..d26fbf059dd 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, std::string tag, device_t *owner, UINT32 clock); + superpet_device(const machine_config &mconfig, const char *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 949dffa0b41..f56132c5dd3 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pet_user_port_device::pet_user_port_device(const machine_config &mconfig, const char *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 1654445322c..6b402691b17 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, std::string tag, device_t *owner, UINT32 clock); + pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_2_handler(device_t &device, _Object object) { return downcast(device).m_2_handler.set_callback(object); } template static devcb_base &set_3_handler(device_t &device, _Object object) { return downcast(device).m_3_handler.set_callback(object); } diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp index 06638b2e968..4e24bb153e9 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, std::string tag, device_t *owner, UINT32 clock) +c1551_t::c1551_t(const machine_config &mconfig, const char *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 1a4c5f4777f..af10e75daed 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, std::string tag, device_t *owner, UINT32 clock); + c1551_t(const machine_config &mconfig, const char *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 1c3da20992f..10d93e462e6 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 static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_cd_rd_callback(device_t &device, _Object object) { return downcast(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 262a740e05d..5e4ffb172b1 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, std::string tag, device_t *owner, UINT32 clock) : +plus4_sid_cartridge_device::plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PLUS4_SID, "Plus/4 SID cartridge", tag, owner, clock, "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 a0ecb79a083..0351381f478 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, std::string tag, device_t *owner, UINT32 clock); + plus4_sid_cartridge_device(const machine_config &mconfig, const char *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 d6c740daf49..8627f99cc30 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 - constructor //------------------------------------------------- -plus4_standard_cartridge_device::plus4_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +plus4_standard_cartridge_device::plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PLUS4_STD, "Plus/4 standard cartridge", tag, owner, clock, "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 3dc6dda2ed3..29fe1d16b13 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, std::string tag, device_t *owner, UINT32 clock); + plus4_standard_cartridge_device(const machine_config &mconfig, const char *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 02954688390..69d980e5843 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; const device_type PSX_DUALSHOCK = &device_creator; -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) : +psx_analog_controller_device::psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_psx_controller_interface(mconfig, *this), m_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, std::string tag, device_t *owner, UINT32 clock) : +psx_dualshock_device::psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : psx_analog_controller_device(mconfig, PSX_DUALSHOCK, "Playstation Dualshock Pad", tag, owner, clock, "psx_dualshock_pad", __FILE__) { m_type = DUALSHOCK; } -psx_analog_joystick_device::psx_analog_joystick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +psx_analog_joystick_device::psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : psx_analog_controller_device(mconfig, PSX_ANALOG_JOYSTICK, "Playstation Analog Joystick", tag, owner, clock, "psx_analog_joystick", __FILE__) { m_type = JOYSTICK; diff --git a/src/devices/bus/psx/analogue.h b/src/devices/bus/psx/analogue.h index 972f720e02c..9fab90f3625 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + psx_dualshock_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + psx_analog_joystick_device(const machine_config &mconfig, const char *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 fcf431622b2..5f84e482b4d 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +psx_standard_controller_device::psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PSX_STANDARD_CONTROLLER, "Playstation Standard Controller", tag, owner, clock, "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 a529168be74..09f1b947eab 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, std::string tag, device_t *owner, UINT32 clock); + psx_standard_controller_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void ack(); template static devcb_base &set_dsr_handler(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; typedef delegate void_cb; diff --git a/src/devices/bus/psx/memcard.cpp b/src/devices/bus/psx/memcard.cpp index f9943eb7c8f..5b8ff16933b 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, std::string tag, device_t *owner, UINT32 clock) +psxcard_device::psxcard_device(const machine_config &mconfig, const char *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 503744a443d..762545d60db 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, std::string tag, device_t *owner, UINT32 clock); + psxcard_device(const machine_config &mconfig, const char *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 f31c002988c..51cfd5948ab 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(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : +psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const char* 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 282e5bee0f9..160b0de6b5d 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, std::string tag, device_t *owner, UINT32 clock); + psx_multitap_device(const machine_config &mconfig, const char *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 5a623241fd8..5b6d94f2a9d 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, std::string tag, device_t *owner, UINT32 clock) : +cst_q_plus4_t::cst_q_plus4_t(const machine_config &mconfig, const char *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 a1a8e087dd2..eba0f3ac712 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, std::string tag, device_t *owner, UINT32 clock); + cst_q_plus4_t(const machine_config &mconfig, const char *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 22a8de08f1c..f9fdcf26e04 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, std::string tag, device_t *owner, UINT32 clock) : +cst_ql_disc_interface_t::cst_ql_disc_interface_t(const machine_config &mconfig, const char *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 5e38215297b..d2ddae10b2e 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, std::string tag, device_t *owner, UINT32 clock); + cst_ql_disc_interface_t(const machine_config &mconfig, const char *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 9a1178b8cdf..91259f0db43 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, std::string tag, device_t *owner, UINT32 clock) : +cumana_floppy_disk_interface_t::cumana_floppy_disk_interface_t(const machine_config &mconfig, const char *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 ade1e651b1b..9ac1b9ba01e 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, std::string tag, device_t *owner, UINT32 clock); + cumana_floppy_disk_interface_t(const machine_config &mconfig, const char *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 54202b11618..92a5580334d 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, std::string tag, device_t *owner, UINT32 clock) : +ql_expansion_slot_t::ql_expansion_slot_t(const machine_config &mconfig, const char *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 24f6110ec0f..e4b259b475c 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, std::string tag, device_t *owner, UINT32 clock); + ql_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_ipl0l_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_ipl0l.set_callback(object); } template static devcb_base &set_ipl1l_wr_callback(device_t &device, _Object object) { return downcast(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 d4af1a6dcc9..c69c129e2e9 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, std::string tag, device_t *owner, UINT32 clock) : +kempston_disk_interface_t::kempston_disk_interface_t(const machine_config &mconfig, const char *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 6867ba02e7a..041bdc65544 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, std::string tag, device_t *owner, UINT32 clock); + kempston_disk_interface_t(const machine_config &mconfig, const char *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 132709e875a..3e25f43e0a6 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, std::string tag, device_t *owner, UINT32 clock) : +miracle_gold_card_t::miracle_gold_card_t(const machine_config &mconfig, const char *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 c7007df51fa..176f7556fdf 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, std::string tag, device_t *owner, UINT32 clock); + miracle_gold_card_t(const machine_config &mconfig, const char *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 8766dfdf1c3..b181fc48918 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, std::string tag, device_t *owner, UINT32 clock) : +miracle_hard_disk_t::miracle_hard_disk_t(const machine_config &mconfig, const char *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 233411724d7..c4aeaa6d74b 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, std::string tag, device_t *owner, UINT32 clock); + miracle_hard_disk_t(const machine_config &mconfig, const char *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 546cd1006b1..d23542ab8f4 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, std::string tag, device_t *owner, UINT32 clock) : +micro_peripherals_floppy_disk_interface_t::micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, const char *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 a01934cca89..57681f30d28 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, std::string tag, device_t *owner, UINT32 clock); + micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, const char *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 3ff6bcca9a2..fa20bf4f5eb 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, std::string tag, device_t *owner, UINT32 clock) : +opd_basic_master_t::opd_basic_master_t(const machine_config &mconfig, const char *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 902cb30d93b..16608210cf2 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, std::string tag, device_t *owner, UINT32 clock); + opd_basic_master_t(const machine_config &mconfig, const char *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 5a3d247ba98..b5d534f68d7 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, std::string tag, device_t *owner, UINT32 clock) : +pcml_q_disk_interface_t::pcml_q_disk_interface_t(const machine_config &mconfig, const char *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 6bda106d887..29a011b7455 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, std::string tag, device_t *owner, UINT32 clock); + pcml_q_disk_interface_t(const machine_config &mconfig, const char *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 5b18c8409e9..9241321bcac 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, std::string tag, device_t *owner, UINT32 clock) : +qubide_t::qubide_t(const machine_config &mconfig, const char *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 78f2d471d7d..f8a363b55a2 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, std::string tag, device_t *owner, UINT32 clock); + qubide_t(const machine_config &mconfig, const char *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 b37378aa31c..bd17b2cb1b8 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, std::string tag, device_t *owner, UINT32 clock) : +ql_rom_cartridge_slot_t::ql_rom_cartridge_slot_t(const machine_config &mconfig, const char *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 9bd0b629d57..282c47cac3d 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, std::string tag, device_t *owner, UINT32 clock); + ql_rom_cartridge_slot_t(const machine_config &mconfig, const char *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 49a5862f3f3..c4bdb1bfdf4 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, std::string tag, device_t *owner, UINT32 clock) : +sandy_super_disk_t::sandy_super_disk_t(const machine_config &mconfig, const char *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 f45c93e111a..408c3430695 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, std::string tag, device_t *owner, UINT32 clock); + sandy_super_disk_t(const machine_config &mconfig, const char *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 1479ee7b97b..0508b835982 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, std::string tag, device_t *owner, UINT32 clock) : +sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, const char *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, std::str { } -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) +sandy_superqboard_512k_t::sandy_superqboard_512k_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sandy_superqmouse_t::sandy_superqmouse_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sandy_superqmouse_512k_t::sandy_superqmouse_512k_t(const machine_config &mconfig, const char *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 2bacc094060..286e224f962 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + sandy_superqboard_512k_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sandy_superqmouse_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sandy_superqmouse_512k_t(const machine_config &mconfig, const char *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 ad7d0f43d75..11132954104 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; -rs232_loopback_device::rs232_loopback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rs232_loopback_device::rs232_loopback_device(const machine_config &mconfig, const char *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 c1e8f2e0112..5d262c93264 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, std::string tag, device_t *owner, UINT32 clock); + rs232_loopback_device(const machine_config &mconfig, const char *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 ef7ae3819a5..4c5d7417a8b 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, std::string tag, device_t *owner, UINT32 clock) +null_modem_device::null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NULL_MODEM, "Null Modem", tag, owner, clock, "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 072ccf75053..aed62fb3aad 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, std::string tag, device_t *owner, UINT32 clock); + null_modem_device(const machine_config &mconfig, const char *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 85cfff0369c..e8734ad6de6 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, std::string tag, device_t *owner, UINT32 clock) +serial_printer_device::serial_printer_device(const machine_config &mconfig, const char *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 0ff013f428d..4ce526fac4b 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, std::string tag, device_t *owner, UINT32 clock); + serial_printer_device(const machine_config &mconfig, const char *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 7005f26ab14..3a525236128 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, std::string tag, device_t *owner, UINT32 clock) : +pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, const char *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 9af7c585c7c..19f0a30ef9f 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, std::string tag, device_t *owner, UINT32 clock); + pseudo_terminal_device(const machine_config &mconfig, const char *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 d33b1731336..31d6310e2ad 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +rs232_port_device::rs232_port_device(const machine_config &mconfig, const char *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, std::string { } -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) +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) : 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 f970620feca..75e1e963eca 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, 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); + 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); 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 09f9d1dc631..ecf9414f1c9 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_rs232_port_interface(mconfig, *this), device_serial_interface(mconfig, *this), @@ -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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +microsoft_mouse_device::microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : serial_mouse_device(mconfig, MSFT_SERIAL_MOUSE, "Microsoft Serial Mouse", tag, owner, clock, "microsoft_mouse", __FILE__) { } const device_type MSYSTEM_SERIAL_MOUSE = &device_creator; -mouse_systems_mouse_device::mouse_systems_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mouse_systems_mouse_device::mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : serial_mouse_device(mconfig, MSYSTEM_SERIAL_MOUSE, "Mouse Systems Serial Mouse", tag, owner, clock, "mouse_systems_mouse", __FILE__) { } diff --git a/src/devices/bus/rs232/ser_mouse.h b/src/devices/bus/rs232/ser_mouse.h index 8ebab89a5cf..6a8986aa081 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + microsoft_mouse_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mouse_systems_mouse_device(const machine_config &mconfig, const char *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 248715813de..c242184b387 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, std::string tag, device_t *owner, UINT32 clock) +serial_terminal_device::serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : generic_terminal_device(mconfig, SERIAL_TERMINAL, "Serial Terminal", tag, owner, clock, "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 1d2112b45c8..0cde8f71f32 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, std::string tag, device_t *owner, UINT32 clock); + serial_terminal_device(const machine_config &mconfig, const char *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 c575dd59270..9b032606ea8 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, std::string tag, device_t *owner, UINT32 clock) +jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, const char *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 faf6fe226a4..29f6dd0a5a9 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, std::string tag, device_t *owner, UINT32 clock); + jvc_xvd701_device(const machine_config &mconfig, const char *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 7706f7a5df6..ca144a8f82a 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, std::string tag, device_t *owner, UINT32 clock) : +s100_dj2db_device::s100_dj2db_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_DJ2DB, "DJ2DB", tag, owner, clock, "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 a5e1fc1bb6a..a8504cee1cf 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, std::string tag, device_t *owner, UINT32 clock); + s100_dj2db_device(const machine_config &mconfig, const char *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 ccf2b8b1097..c0d93aed2f5 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, std::string tag, device_t *owner, UINT32 clock) : +s100_djdma_device::s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_DJDMA, "DJDMA", tag, owner, clock, "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 88e0f8c6f87..e1ac5d2d95d 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, std::string tag, device_t *owner, UINT32 clock); + s100_djdma_device(const machine_config &mconfig, const char *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 78325cd7290..22240dd789a 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, std::string tag, device_t *owner, UINT32 clock) : +s100_mm65k16s_device::s100_mm65k16s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_MM65K16S, "MM65K16S", tag, owner, clock, "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 4e4d99ede07..7a9c50ad1aa 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, std::string tag, device_t *owner, UINT32 clock); + s100_mm65k16s_device(const machine_config &mconfig, const char *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 84d9e434ecf..91fb4f46135 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, std::string tag, device_t *owner, UINT32 clock) : +s100_mds_a_device::s100_mds_a_device(const machine_config &mconfig, const char *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 df2c2eb4223..bdf170fb869 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, std::string tag, device_t *owner, UINT32 clock); + s100_mds_a_device(const machine_config &mconfig, const char *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 942eb668b32..d1a06407c6d 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, std::string tag, device_t *owner, UINT32 clock) : +s100_mds_ad_device::s100_mds_ad_device(const machine_config &mconfig, const char *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 375f7dfcdec..0f524af48bd 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, std::string tag, device_t *owner, UINT32 clock); + s100_mds_ad_device(const machine_config &mconfig, const char *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 daedd5298fa..da63653b737 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, std::string tag, device_t *owner, UINT32 clock) : +s100_slot_t::s100_slot_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +s100_bus_t::s100_bus_t(const machine_config &mconfig, const char *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 06ea060919e..97d067f62e8 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, std::string tag, device_t *owner, UINT32 clock); + s100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s100_bus_t() { m_device_list.detach_all(); } template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + s100_slot_t(const machine_config &mconfig, const char *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 7d39c18d8fb..efa739c0742 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, std::string tag, device_t *owner, UINT32 clock) : +s100_wunderbus_device::s100_wunderbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, S100_WUNDERBUS, "Wunderbus I/O", tag, owner, clock, "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 8d09cfb99fb..53aae135b06 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, std::string tag, device_t *owner, UINT32 clock); + s100_wunderbus_device(const machine_config &mconfig, const char *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 a8da0d2e12f..28d0aba2945 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; const device_type SATURN_BRAM_32MB = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +saturn_bram4mb_device::saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saturn_bram_device(mconfig, SATURN_BRAM_4MB, "Saturn Battery RAM 4Mbit Cart", tag, owner, clock, "sat_bram_4mb", __FILE__) { m_cart_type = 0x21; } -saturn_bram8mb_device::saturn_bram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_bram8mb_device::saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saturn_bram_device(mconfig, SATURN_BRAM_8MB, "Saturn Battery RAM 8Mbit Cart", tag, owner, clock, "sat_bram_8mb", __FILE__) { m_cart_type = 0x22; } -saturn_bram16mb_device::saturn_bram16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_bram16mb_device::saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saturn_bram_device(mconfig, SATURN_BRAM_16MB, "Saturn Battery RAM 16Mbit Cart", tag, owner, clock, "sat_bram_16mb", __FILE__) { m_cart_type = 0x23; } -saturn_bram32mb_device::saturn_bram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_bram32mb_device::saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saturn_bram_device(mconfig, SATURN_BRAM_32MB, "Saturn Battery RAM 32Mbit Cart", tag, owner, clock, "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 c43734eb455..e6237ff76ce 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class saturn_bram8mb_device : public saturn_bram_device { public: // construction/destruction - saturn_bram8mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class saturn_bram16mb_device : public saturn_bram_device { public: // construction/destruction - saturn_bram16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class saturn_bram32mb_device : public saturn_bram_device { public: // construction/destruction - saturn_bram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/saturn/dram.cpp b/src/devices/bus/saturn/dram.cpp index 0ac5008de27..d1078fcc722 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; const device_type SATURN_DRAM_32MB = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +saturn_dram8mb_device::saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saturn_dram_device(mconfig, SATURN_DRAM_8MB, "Saturn Data RAM 8Mbit Cart", tag, owner, clock, "sat_dram_8mb", __FILE__) { m_cart_type = 0x5a; } -saturn_dram32mb_device::saturn_dram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_dram32mb_device::saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saturn_dram_device(mconfig, SATURN_DRAM_32MB, "Saturn Data RAM 32Mbit Cart", tag, owner, clock, "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 571eaf47759..29ddbfcbcdc 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class saturn_dram32mb_device : public saturn_dram_device { public: // construction/destruction - saturn_dram32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/bus/saturn/rom.cpp b/src/devices/bus/saturn/rom.cpp index 3c34ec1aa9b..7b8068735a1 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(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::saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sat_cart_interface( mconfig, *this ) { } -saturn_rom_device::saturn_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_rom_device::saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SATURN_ROM, "Saturn ROM Carts", tag, owner, clock, "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 a81293930d9..ffd80e272ee 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, 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); + saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/saturn/sat_slot.cpp b/src/devices/bus/saturn/sat_slot.cpp index 3b860444277..dba415c8a47 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, std::string tag) +void device_sat_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +sat_cart_slot_device::sat_cart_slot_device(const machine_config &mconfig, const char *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 6bfe37ebda1..e8a711c3a0b 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + sat_cart_slot_device(const machine_config &mconfig, const char *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 34c96e9d2ef..1503272b55c 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +acb4070_device::acb4070_device(const machine_config &mconfig, const char *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 85d1fd4b296..ea9b1583c28 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, std::string tag, device_t *owner, UINT32 clock); + acb4070_device(const machine_config &mconfig, const char *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 3eaf2b4c82a..bb6a70390ed 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +sony_cdu76s_device::sony_cdu76s_device(const machine_config &mconfig, const char *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 5818c7da68a..d10a23c1246 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, std::string tag, device_t *owner, UINT32 clock); + sony_cdu76s_device(const machine_config &mconfig, const char *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 de1dbe14bb0..3d212582a39 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +d9060hd_device::d9060hd_device(const machine_config &mconfig, const char *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 c3460e9279e..2daed5e40af 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, std::string tag, device_t *owner, UINT32 clock); + d9060hd_device(const machine_config &mconfig, const char *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 82601f71e05..9dd436f4acb 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, std::string tag, device_t *owner, UINT32 clock) +omti5100_device::omti5100_device(const machine_config &mconfig, const char *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 a1854c837b9..63ac7b8a4dc 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, std::string tag, device_t *owner, UINT32 clock); + omti5100_device(const machine_config &mconfig, const char *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 688c2f48495..619f9f074da 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pc9801_sasi_device::pc9801_sasi_device(const machine_config &mconfig, const char *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 f82e29b5c7e..b3e5816573d 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, std::string tag, device_t *owner, UINT32 clock); + pc9801_sasi_device(const machine_config &mconfig, const char *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 f9400d662fc..59b964ce4f2 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, std::string tag, device_t *owner, UINT32 clock) +s1410_device::s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, S1410, "Xebec S1410", tag, owner, clock, "s1410", __FILE__) { } diff --git a/src/devices/bus/scsi/s1410.h b/src/devices/bus/scsi/s1410.h index 222f6c5b836..519c013b066 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, std::string tag, device_t *owner, UINT32 clock); + s1410_device(const machine_config &mconfig, const char *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 f320f1dd1e1..1abe47e0805 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, std::string tag, device_t *owner, UINT32 clock) +sa1403d_device::sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : scsihd_device(mconfig, SA1403D, "Shugart SA1403D", tag, owner, clock, "sa1403d", __FILE__) { } diff --git a/src/devices/bus/scsi/sa1403d.h b/src/devices/bus/scsi/sa1403d.h index 5c1ba288d61..308be3b5b48 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, std::string tag, device_t *owner, UINT32 clock); + sa1403d_device(const machine_config &mconfig, const char *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 505ab78e228..118e2d58114 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, std::string tag, device_t *owner, UINT32 clock) +SCSI_PORT_DEVICE::SCSI_PORT_DEVICE(const machine_config &mconfig, const char *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_SLOT_device::SCSI_PORT_SLOT_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +SCSI_PORT_SLOT_device::SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *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 6995e14d741..19fec347f53 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, std::string tag, device_t *owner, UINT32 clock); + SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_bsy_handler(device_t &device, _Object object) { return downcast(device).m_bsy_handler.set_callback(object); } template static devcb_base &set_sel_handler(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *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 89402bf2c5a..9ee7d92668f 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +scsicd_device::scsicd_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : scsihle_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/scsi/scsicd.h b/src/devices/bus/scsi/scsicd.h index 34c457df7d1..3acfffe2ad6 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, 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); + 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); 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 42e6c2d821f..8774310d0b3 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +scsihd_device::scsihd_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : scsihle_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/bus/scsi/scsihd.h b/src/devices/bus/scsi/scsihd.h index 645706090b5..41b535a15b1 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, 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); + 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); 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 44e4e087f29..e14d875881f 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, std::string 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, const char *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().c_str(), data ); +// printf( "%s data out %02x\n", tag(), 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 1308b606b01..4963210726c 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual 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 1fc13842e72..27487e8cc73 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; const device_type SCV_ROM128K_RAM4K = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +scv_rom8_device::scv_rom8_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scv_rom16_device::scv_rom16_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scv_rom32_device::scv_rom32_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scv_rom32ram8_device::scv_rom32ram8_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scv_rom64_device::scv_rom64_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scv_rom128_device::scv_rom128_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scv_rom128ram4_device::scv_rom128ram4_device(const machine_config &mconfig, const char *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 7c2043c613a..381a82fb7cf 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + scv_rom16_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + scv_rom32_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + scv_rom32ram8_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + scv_rom64_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + scv_rom128_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + scv_rom128ram4_device(const machine_config &mconfig, const char *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 d0e286664ea..15495afe918 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, std::string tag) +void device_scv_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +scv_cart_slot_device::scv_cart_slot_device(const machine_config &mconfig, const char *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 1cc7b1fda38..3fa5a02578a 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + scv_cart_slot_device(const machine_config &mconfig, const char *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 c716ab39329..5ec9295fdba 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega8_cardcatch_device::sega8_cardcatch_device(const machine_config &mconfig, const char *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 a8224c717a7..959376173c5 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, std::string tag, device_t *owner, UINT32 clock); + sega8_cardcatch_device(const machine_config &mconfig, const char *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 5b36e6c6c49..d6b8c91c6cf 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega8_mgear_device::sega8_mgear_device(const machine_config &mconfig, const char *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 f7b9e6fd2ea..960545c7350 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, std::string tag, device_t *owner, UINT32 clock); + sega8_mgear_device(const machine_config &mconfig, const char *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 b74923ab41c..b9c35af15f9 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_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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +sega8_rom_device::sega8_rom_device(const machine_config &mconfig, const char *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, std::string ta -sega8_othello_device::sega8_othello_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega8_othello_device::sega8_othello_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega8_castle_device::sega8_castle_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega8_basic_l3_device::sega8_basic_l3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega8_music_editor_device::sega8_music_editor_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega8_terebi_device::sega8_terebi_device(const machine_config &mconfig, const char *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, std::str } -sega8_dahjee_typea_device::sega8_dahjee_typea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega8_dahjee_typea_device::sega8_dahjee_typea_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega8_dahjee_typeb_device::sega8_dahjee_typeb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega8_eeprom_device::sega8_eeprom_device(const machine_config &mconfig, const char *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, std::str } -sega8_codemasters_device::sega8_codemasters_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega8_codemasters_device::sega8_codemasters_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega8_4pak_device::sega8_4pak_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0) { } -sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega8_nemesis_device::sega8_nemesis_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega8_janggun_device::sega8_janggun_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega8_hicom_device::sega8_hicom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega8_korean_device::sega8_korean_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega8_korean_nb_device::sega8_korean_nb_device(const machine_config &mconfig, const char *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 9e30940526d..462ea7d8e28 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + sega8_othello_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_castle_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_basic_l3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_music_editor_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_terebi_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_dahjee_typea_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_dahjee_typeb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_eeprom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_codemasters_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_4pak_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + sega8_nemesis_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_janggun_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_hicom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_korean_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega8_korean_nb_device(const machine_config &mconfig, const char *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 b87c42305fc..df3c59adc05 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, std::string tag) +void device_sega8_cart_interface::rom_alloc(UINT32 size, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) : +sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, const char *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, st { } -sega8_card_slot_device::sega8_card_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +sega8_card_slot_device::sega8_card_slot_device(const machine_config &mconfig, const char *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 b71c53a738c..439bc3be7a2 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + sega8_card_slot_device(const machine_config &mconfig, const char *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 ba4cc85df3e..31d211e30a8 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, std::string tag, device_t *owner, UINT32 clock) +sms_graphic_device::sms_graphic_device(const machine_config &mconfig, const char *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 b636b432747..82d624c07b5 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, std::string tag, device_t *owner, UINT32 clock); + sms_graphic_device(const machine_config &mconfig, const char *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 2aaa6f9d178..b2537453c6a 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, std::string tag, device_t *owner, UINT32 clock) : +sms_joypad_device::sms_joypad_device(const machine_config &mconfig, const char *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 a9b093f28c8..a67dd5f78b0 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, std::string tag, device_t *owner, UINT32 clock); + sms_joypad_device(const machine_config &mconfig, const char *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 5e2f28236bd..54e03d5627e 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, std::string tag, device_t *owner, UINT32 clock) : +sms_light_phaser_device::sms_light_phaser_device(const machine_config &mconfig, const char *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 0779cae8299..7d2f9ca1ed6 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, std::string tag, device_t *owner, UINT32 clock); + sms_light_phaser_device(const machine_config &mconfig, const char *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 098b3a57dc1..fd098b82c18 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 - constructor //------------------------------------------------- -sms_multitap_device::sms_multitap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +sms_multitap_device::sms_multitap_device(const machine_config &mconfig, const char *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 66ecb4ddd6d..bf3e79e5616 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, std::string tag, device_t *owner, UINT32 clock); + sms_multitap_device(const machine_config &mconfig, const char *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 379638db451..e2418f38345 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, std::string tag, device_t *owner, UINT32 clock) : +sms_paddle_device::sms_paddle_device(const machine_config &mconfig, const char *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 53eed47774a..8e092d63afe 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, std::string tag, device_t *owner, UINT32 clock); + sms_paddle_device(const machine_config &mconfig, const char *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 27bc3b6e8c1..2b43b31a6b8 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, std::string tag, device_t *owner, UINT32 clock) : +sms_rapid_fire_device::sms_rapid_fire_device(const machine_config &mconfig, const char *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 f9cca7d0784..adc9a3443ba 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, std::string tag, device_t *owner, UINT32 clock); + sms_rapid_fire_device(const machine_config &mconfig, const char *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 417d76e8362..170a716a70f 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, std::string tag, device_t *owner, UINT32 clock) : +sms_control_port_device::sms_control_port_device(const machine_config &mconfig, const char *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 3672a7b179c..4cce2437149 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, std::string tag, device_t *owner, UINT32 clock); + sms_control_port_device(const machine_config &mconfig, const char *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 9155af7edd2..e7ea829372c 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, std::string tag, device_t *owner, UINT32 clock) : +sms_sports_pad_device::sms_sports_pad_device(const machine_config &mconfig, const char *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 baafc8bc0de..fe98c9e5e70 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, std::string tag, device_t *owner, UINT32 clock); + sms_sports_pad_device(const machine_config &mconfig, const char *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 c32be5f8843..d431f0a6816 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, std::string tag, device_t *owner, UINT32 clock) : +sms_sports_pad_jp_device::sms_sports_pad_jp_device(const machine_config &mconfig, const char *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 cc15f199533..c20f15bd845 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, std::string tag, device_t *owner, UINT32 clock); + sms_sports_pad_jp_device(const machine_config &mconfig, const char *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 4c0042c2441..7ca7ff48a47 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; const device_type SNS_BSMEMPAK = &device_creator; -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_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_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, std::string tag, device_t *owner, UINT32 clock) +sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_ROM_BSX, "SNES BS-X Cart", tag, owner, clock, "sns_rom_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, std::strin { } -sns_rom_bsxlo_device::sns_rom_bsxlo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_bsxlo_device::sns_rom_bsxlo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_BSX, "SNES Cart (LoROM) + BS-X slot", tag, owner, clock, "sns_rom_bsxlo", __FILE__), m_slot(*this, "bs_slot") { } -sns_rom_bsxhi_device::sns_rom_bsxhi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_bsxhi_device::sns_rom_bsxhi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom21_device(mconfig, SNS_HIROM_BSX, "SNES Cart (HiROM) + BS-X slot", tag, owner, clock, "sns_rom_bsxhi", __FILE__), m_slot(*this, "bs_slot") { } -sns_rom_bsmempak_device::sns_rom_bsmempak_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_bsmempak_device::sns_rom_bsmempak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_BSMEMPAK, "SNES BS-X Memory packs", tag, owner, clock, "sns_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 5959d4a0fdf..43ee42f7b4a 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, 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); + sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() 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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_bsxlo_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_bsxhi_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_bsmempak_device(const machine_config &mconfig, const char *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 f83665f9cdb..ef39d9fbce6 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_pfest94_device::sns_pfest94_device(const machine_config &mconfig, const char *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 63144f56c59..a09adf15949 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, std::string tag, device_t *owner, UINT32 clock); + sns_pfest94_device(const machine_config &mconfig, const char *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 fc7dfb2c6b1..3763f11ed91 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; const device_type SNS_LOROM_20COL = &device_creator; -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) +sns_rom_device::sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sns_cart_interface( mconfig, *this ) { } -sns_rom_device::sns_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_device::sns_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNS_LOROM, "SNES Cart (LoROM)", tag, owner, clock, "sns_rom", __FILE__), device_sns_cart_interface( mconfig, *this ) { } -sns_rom_obc1_device::sns_rom_obc1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_obc1_device::sns_rom_obc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_OBC1, "SNES Cart (LoROM) + OBC-1", tag, owner, clock, "sns_rom_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, std::str // Pirate LoROM 'mappers' -sns_rom_pokemon_device::sns_rom_pokemon_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_pokemon_device::sns_rom_pokemon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_POKEMON, "SNES Pirate Carts with Protection", tag, owner, clock, "sns_rom_pokemon", __FILE__), m_latch(0) { } -sns_rom_tekken2_device::sns_rom_tekken2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_tekken2_device::sns_rom_tekken2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_TEKKEN2, "SNES Tekken 2", tag, owner, clock, "sns_rom_tekken2", __FILE__), m_prot(0) { } -sns_rom_soulblad_device::sns_rom_soulblad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_soulblad_device::sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_SOULBLAD, "SNES Soul Blade", tag, owner, clock, "sns_rom_soulblad", __FILE__) { } -sns_rom_banana_device::sns_rom_banana_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_banana_device::sns_rom_banana_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_BANANA, "SNES Banana de Pijamas", tag, owner, clock, "sns_rom_banana", __FILE__) { } -sns_rom_bugs_device::sns_rom_bugs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_bugs_device::sns_rom_bugs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_BUGSLIFE, "SNES A Bug's Life", tag, owner, clock, "sns_rom_bugslife", __FILE__) { } // Multigame LoROM 'mappers' -sns_rom_mcpirate1_device::sns_rom_mcpirate1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_mcpirate1_device::sns_rom_mcpirate1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_MCPIR1, "SNES Pirate Multigame Carts Type 1", tag, owner, clock, "sns_rom_mcpirate1", __FILE__), m_base_bank(0) { } -sns_rom_mcpirate2_device::sns_rom_mcpirate2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_mcpirate2_device::sns_rom_mcpirate2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_MCPIR2, "SNES Pirate Multigame Carts Type 2", tag, owner, clock, "sns_rom_mcpirate2", __FILE__), m_base_bank(0) { } -sns_rom_20col_device::sns_rom_20col_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_20col_device::sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_20COL, "SNES Super 20 Collection", tag, owner, clock, "sns_rom_20col", __FILE__), m_base_bank(0) { } diff --git a/src/devices/bus/snes/rom.h b/src/devices/bus/snes/rom.h index d7703da61e6..a197383d1cb 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, 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); + sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() 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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_obc1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_pokemon_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_tekken2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_soulblad_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_mcpirate1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_mcpirate2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_20col_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_banana_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_bugs_device(const machine_config &mconfig, const char *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 ad60a669f17..477b75bdc1e 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; const device_type SNS_HIROM_SRTC = &device_creator; -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) +sns_rom21_device::sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sns_cart_interface( mconfig, *this ) { } -sns_rom21_device::sns_rom21_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom21_device::sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNS_HIROM, "SNES Cart (HiROM)", tag, owner, clock, "sns_rom21", __FILE__), device_sns_cart_interface( mconfig, *this ) { } -sns_rom21_srtc_device::sns_rom21_srtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom21_srtc_device::sns_rom21_srtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom21_device(mconfig, SNS_HIROM_SRTC, "SNES Cart (HiROM) + S-RTC", tag, owner, clock, "sns_rom21_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 51c52ecc56f..2196e90ca56 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, 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); + sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() 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, std::string tag, device_t *owner, UINT32 clock); + sns_rom21_srtc_device(const machine_config &mconfig, const char *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 88fac4a3045..b22af792a97 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_sa1_device::sns_sa1_device(const machine_config &mconfig, const char *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 d40c2f2d4ce..5d0767340c5 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, std::string tag, device_t *owner, UINT32 clock); + sns_sa1_device(const machine_config &mconfig, const char *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 e269d663c8b..9570b5110ad 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(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::sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sns_cart_interface( mconfig, *this ), m_sdd1_enable(0), m_xfer_enable(0), m_sdd1emu(nullptr) { } -sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNS_LOROM_SDD1, "SNES Cart + S-DD1", tag, owner, clock, "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 21dde5d66dd..e9dcc9e71e1 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, 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); + sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/snes/sfx.cpp b/src/devices/bus/snes/sfx.cpp index d1312645178..9fce31d00db 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_superfx_device::sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_SUPERFX, "SNES Cart (LoROM) + SuperFX", tag, owner, clock, "sns_rom_superfx", __FILE__), m_superfx(*this, "superfx") { diff --git a/src/devices/bus/snes/sfx.h b/src/devices/bus/snes/sfx.h index 7471ffcae5e..785a68bb827 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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_superfx_device(const machine_config &mconfig, const char *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 2daf69969a0..0c6abd79490 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(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : +sns_rom_sgb_device::sns_rom_sgb_device(const machine_config& mconfig, const char* 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 93057b8631c..31ee68b8305 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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_sgb_device(const machine_config &mconfig, const char *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 56b646c8236..65c2fffdb4d 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, std::string tag) +void device_sns_cart_interface::rom_alloc(UINT32 size, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_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, std::string tag, device_t *owner, UINT32 clock) : +sns_cart_slot_device::sns_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +sns_sufami_cart_slot_device::sns_sufami_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +sns_bsx_cart_slot_device::sns_bsx_cart_slot_device(const machine_config &mconfig, const char *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 0d5bc4fd16f..02b00a1cb87 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_sufami_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_bsx_cart_slot_device(const machine_config &mconfig, const char *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 504546e3a46..b9b0ee77cd3 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; const device_type SNS_HIROM_SPC7110_RTC = &device_creator; -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_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : sns_rom21_device(mconfig, type, name, tag, owner, clock, shortname, source), 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, std::string tag, device_t *owner, UINT32 clock) +sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom21_device(mconfig, SNS_HIROM_SPC7110, "SNES Cart + SPC-7110", tag, owner, clock, "sns_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, st { } -sns_rom_spc7110rtc_device::sns_rom_spc7110rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_spc7110rtc_device::sns_rom_spc7110rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_spc7110_device(mconfig, SNS_HIROM_SPC7110_RTC, "SNES Cart + SPC-7110 + RTC", tag, owner, clock, "sns_rom_spc7110rtc", __FILE__) { } diff --git a/src/devices/bus/snes/spc7110.h b/src/devices/bus/snes/spc7110.h index f952669798e..33d7170d02c 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, 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); + sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() 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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_spc7110rtc_device(const machine_config &mconfig, const char *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 cbb6661235a..b6ac1b376d2 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; const device_type SNS_STROM = &device_creator; -sns_rom_sufami_device::sns_rom_sufami_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_sufami_device::sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_SUFAMI, "SNES Sufami Turbo Cart", tag, owner, clock, "sns_rom_sufami", __FILE__), m_slot1(*this, "st_slot1"), m_slot2(*this, "st_slot2") { } -sns_rom_strom_device::sns_rom_strom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_strom_device::sns_rom_strom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_STROM, "SNES Sufami Turbo Minicart", tag, owner, clock, "sns_strom", __FILE__) { } diff --git a/src/devices/bus/snes/sufami.h b/src/devices/bus/snes/sufami.h index 4fd03042a9b..7881a6f6d58 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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_sufami_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_strom_device(const machine_config &mconfig, const char *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 4896a23f934..056f462e2fa 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; const device_type SNS_LOROM_SETA11 = &device_creator; -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_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_upd7725(*this, "dsp") { } -sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_device(mconfig, SNS_LOROM_NECDSP, "SNES Cart (LoROM) + NEC DSP", tag, owner, clock, "sns_rom_necdsp", __FILE__), m_upd7725(*this, "dsp") { } -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_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : sns_rom21_device(mconfig, type, name, tag, owner, clock, shortname, source), m_upd7725(*this, "dsp") { } -sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom21_device(mconfig, SNS_HIROM_NECDSP, "SNES Cart (HiROM) + NEC DSP", tag, owner, clock, "sns_rom21_necdsp", __FILE__), m_upd7725(*this, "dsp") { } -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_setadsp_device::sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_upd96050(*this, "dsp") { } -sns_rom_seta10dsp_device::sns_rom_seta10dsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_seta10dsp_device::sns_rom_seta10dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA10, "SNES Cart (LoROM) + Seta ST010 DSP", tag, owner, clock, "sns_rom_seta10", __FILE__) { } -sns_rom_seta11dsp_device::sns_rom_seta11dsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_seta11dsp_device::sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA11, "SNES Cart (LoROM) + Seta ST011 DSP", tag, owner, clock, "sns_rom_seta11", __FILE__) { } @@ -408,42 +408,42 @@ const device_type SNS_LOROM_SETA10_LEG = &device_creator; -sns_rom20_necdsp1_legacy_device::sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom20_necdsp1_legacy_device::sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP1_LEG, "SNES Cart (LoROM) + NEC DSP1 Legacy", tag, owner, clock, "dsp1leg", __FILE__) { } -sns_rom20_necdsp1b_legacy_device::sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom20_necdsp1b_legacy_device::sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP1B_LEG, "SNES Cart (LoROM) + NEC DSP1B Legacy", tag, owner, clock, "dsp1bleg", __FILE__) { } -sns_rom20_necdsp2_legacy_device::sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom20_necdsp2_legacy_device::sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP2_LEG, "SNES Cart (LoROM) + NEC DSP2 Legacy", tag, owner, clock, "dsp2leg", __FILE__) { } -sns_rom20_necdsp3_legacy_device::sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom20_necdsp3_legacy_device::sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP3_LEG, "SNES Cart (LoROM) + NEC DSP3 Legacy", tag, owner, clock, "dsp3leg", __FILE__) { } -sns_rom20_necdsp4_legacy_device::sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom20_necdsp4_legacy_device::sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP4_LEG, "SNES Cart (LoROM) + NEC DSP4 Legacy", tag, owner, clock, "dsp4leg", __FILE__) { } -sns_rom21_necdsp1_legacy_device::sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom21_necdsp1_legacy_device::sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom21_necdsp_device(mconfig, SNS_HIROM_NECDSP1_LEG, "SNES Cart (HiROM) + NEC DSP1 Legacy", tag, owner, clock, "dsp1leg_hi", __FILE__) { } -sns_rom_seta10dsp_legacy_device::sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_seta10dsp_legacy_device::sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA10_LEG, "SNES Cart (LoROM) + Seta ST010 DSP Legacy", tag, owner, clock, "seta10leg", __FILE__) { } -sns_rom_seta11dsp_legacy_device::sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sns_rom_seta11dsp_legacy_device::sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA11_LEG, "SNES Cart (LoROM) + Seta ST011 DSP Legacy", tag, owner, clock, "seta11leg", __FILE__) { } diff --git a/src/devices/bus/snes/upd.h b/src/devices/bus/snes/upd.h index 6633290b828..815b5b2a42c 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, 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); + sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() 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, 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); + sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_seta10dsp_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_seta11dsp_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *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 46ad128bb76..dddda96de46 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, std::string tag, device_t *owner, UINT32 clock) : +snes_bcbattle_device::snes_bcbattle_device(const machine_config &mconfig, const char *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 f7c444dba64..d336c31b6a7 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, std::string tag, device_t *owner, UINT32 clock); + snes_bcbattle_device(const machine_config &mconfig, const char *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 cd4c33a01aa..af8ed67db02 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, std::string tag, device_t *owner, UINT32 clock) : +snes_control_port_device::snes_control_port_device(const machine_config &mconfig, const char *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 8b7e2e048b6..94a6a7b8ce8 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, std::string tag, device_t *owner, UINT32 clock); + snes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~snes_control_port_device(); static void set_onscreen_callback(device_t &device, snesctrl_onscreen_delegate callback) { downcast(device).m_onscreen_cb = callback; } diff --git a/src/devices/bus/snes_ctrl/joypad.cpp b/src/devices/bus/snes_ctrl/joypad.cpp index 66cd908aa35..0edea6be148 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, std::string tag, device_t *owner, UINT32 clock) : +snes_joypad_device::snes_joypad_device(const machine_config &mconfig, const char *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 61788ddb98e..8daa922f20a 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, std::string tag, device_t *owner, UINT32 clock); + snes_joypad_device(const machine_config &mconfig, const char *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 d8580fa3c01..7ec640047de 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, std::string tag, device_t *owner, UINT32 clock) : +snes_miracle_device::snes_miracle_device(const machine_config &mconfig, const char *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 e74cb8c93a2..a89b41accaf 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, std::string tag, device_t *owner, UINT32 clock); + snes_miracle_device(const machine_config &mconfig, const char *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 875b6eb1ae0..fc851dc33f6 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, std::string tag, device_t *owner, UINT32 clock) : +snes_mouse_device::snes_mouse_device(const machine_config &mconfig, const char *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 89a6433792c..53602b96be3 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, std::string tag, device_t *owner, UINT32 clock); + snes_mouse_device(const machine_config &mconfig, const char *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 dc4db913915..2eba8914bcb 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, std::string tag, device_t *owner, UINT32 clock) : +snes_multitap_device::snes_multitap_device(const machine_config &mconfig, const char *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 d0ff5948a48..e978a9d13ca 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, std::string tag, device_t *owner, UINT32 clock); + snes_multitap_device(const machine_config &mconfig, const char *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 ce57dfeb415..ecdc1b21fe5 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, std::string tag, device_t *owner, UINT32 clock) : +snes_pachinko_device::snes_pachinko_device(const machine_config &mconfig, const char *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 d7952f21dcf..149d5775157 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, std::string tag, device_t *owner, UINT32 clock); + snes_pachinko_device(const machine_config &mconfig, const char *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 fd3ad11349a..3f26fe562c4 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, std::string tag, device_t *owner, UINT32 clock) : +snes_sscope_device::snes_sscope_device(const machine_config &mconfig, const char *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 cbfd76ca6f4..064ee0c941d 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, std::string tag, device_t *owner, UINT32 clock); + snes_sscope_device(const machine_config &mconfig, const char *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 fcb86751a2f..29db7df0029 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, std::string tag, device_t *owner, UINT32 clock) : +snes_twintap_device::snes_twintap_device(const machine_config &mconfig, const char *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 81172365417..5adf0bf1cc1 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, std::string tag, device_t *owner, UINT32 clock); + snes_twintap_device(const machine_config &mconfig, const char *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 7d640d9d752..83d919215a1 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, std::string tag, device_t *owner, UINT32 clock) : +spc1000_exp_device::spc1000_exp_device(const machine_config &mconfig, const char *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 5319653f584..e48e9efe3c8 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, std::string tag, device_t *owner, UINT32 clock); + spc1000_exp_device(const machine_config &mconfig, const char *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 0f5b718b2f6..504a13ec0be 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 - constructor //------------------------------------------------- -spc1000_fdd_exp_device::spc1000_fdd_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +spc1000_fdd_exp_device::spc1000_fdd_exp_device(const machine_config &mconfig, const char *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 1e6fb8c7551..ea8366770b0 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, std::string tag, device_t *owner, UINT32 clock); + spc1000_fdd_exp_device(const machine_config &mconfig, const char *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 6017a0555c9..7824e9fccb4 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 - constructor //------------------------------------------------- -spc1000_vdp_exp_device::spc1000_vdp_exp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +spc1000_vdp_exp_device::spc1000_vdp_exp_device(const machine_config &mconfig, const char *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 b5db17d121d..20a0e23acd7 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, std::string tag, device_t *owner, UINT32 clock); + spc1000_vdp_exp_device(const machine_config &mconfig, const char *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 7246128786b..4085dcfe230 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, std::string tag, device_t *owner, UINT32 clock) +snug_bwg_device::snug_bwg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_BWG, "SNUG BwG Floppy Controller", tag, owner, clock, "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 7111273e348..6a301b5cb59 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, std::string tag, device_t *owner, UINT32 clock); + snug_bwg_device(const machine_config &mconfig, const char *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 d23b91e3819..6945df0dcc6 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, std::string tag, device_t *owner, UINT32 clock) +snug_enhanced_video_device::snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_EVPC, "SNUG Enhanced Video Processor Card", tag, owner, clock, "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 0e2a866323c..2b67fd272fc 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, std::string tag, device_t *owner, UINT32 clock); + snug_enhanced_video_device(const machine_config &mconfig, const char *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 698bf2b4f5b..c3e4779c1ef 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, std::string tag, device_t *owner, UINT32 clock) +myarc_hfdc_device::myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_HFDC, "Myarc Hard and Floppy Disk Controller", tag, owner, clock, "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().c_str(), m_address & 0xffff); + logerror("%s: Tape support not available on this HFDC version (access to address %04x)\n", tag(), 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().c_str(), m_address & 0xffff, *value); + if (TRACE_COMP) logerror("%s: %04x[HDC] -> %02x\n", tag(), 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().c_str(), m_address & 0xffff, *value); + if (TRACE_COMP) logerror("%s: %04x[CLK] -> %02x\n", tag(), 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().c_str(), m_address & 0xffff, m_ram_page[bank], valword); + logerror("%s: %04x[%02x] -> %04x\n", tag(), 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().c_str(), m_address & 0xffff, m_rom_page, valword); + logerror("%s: %04x[%02x] -> %04x\n", tag(), 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().c_str(), m_address & 0xffff, data); + logerror("%s: Tape support not available on this HFDC version (write access to address %04x: %02x)\n", tag(), m_address & 0xffff, data); return; } if (m_HDCsel) { - if (TRACE_COMP) logerror("%s: %04x[HDC] <- %02x\n", tag().c_str(), m_address & 0xffff, data); + if (TRACE_COMP) logerror("%s: %04x[HDC] <- %02x\n", tag(), 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().c_str(), m_address & 0xffff, data); + if (TRACE_COMP) logerror("%s: %04x[CLK] <- %02x\n", tag(), 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().c_str(), m_address & 0xffff, m_ram_page[bank], data); + if (TRACE_RAM) logerror("%s: %04x[%02x] <- %02x\n", tag(), 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().c_str(), m_address & 0xffff, m_rom_page, data); + if (TRACE_ROM) logerror("%s: Ignoring write ROM %04x[%02x]: %02x\n", tag(), 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().c_str(), offset & 0xffff, *value); + if (TRACE_CRU) logerror("%s: CRU %04x -> %02x\n", tag(), 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().c_str(), offset & 0xffff, data); + if (TRACE_CRU) logerror("%s: CRU %04x <- %d\n", tag(), 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().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]); + 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]); } 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().c_str(), turnOn? "selected" : "unselected"); + if (TRACE_CRU) if (m_selected != turnOn) logerror("%s: card %s\n", tag(), turnOn? "selected" : "unselected"); m_selected = turnOn; break; } case 1: - if (TRACE_CRU) if (data==0) logerror("%s: trigger HDC reset\n", tag().c_str()); + if (TRACE_CRU) if (data==0) logerror("%s: trigger HDC reset\n", tag()); 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().c_str(), m_rom_page); + if (TRACE_CRU) logerror("%s: ROM page = %d\n", tag(), 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().c_str(), m_rom_page, m_see_switches); + if (TRACE_CRU) logerror("%s: ROM page = %d, see_switches = %d\n", tag(), m_rom_page, m_see_switches); break; default: - logerror("%s: Attempt to set undefined CRU bit %d\n", tag().c_str(), bit); + logerror("%s: Attempt to set undefined CRU bit %d\n", tag(), 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().c_str()); + if (TRACE_LINES) if (state==1) logerror("%s: Floppy index pulse\n", tag()); // 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().c_str()); + if (TRACE_LINES) if (state==1) logerror("%s: HD index pulse\n", tag()); 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().c_str(), state); + if (TRACE_LINES) logerror("%s: HD READY = %d\n", tag(), 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().c_str(), state); + if (TRACE_LINES) logerror("%s: HD seek complete = %d\n", tag(), 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().c_str()); + logerror("%s: Invalid operation: S0=S1=0, but tried to write (expected: read drive status)\n", tag()); 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().c_str(), m_dma_address); + if (TRACE_DMA) logerror("%s: Setting DMA address; current value = %06x\n", tag(), 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().c_str(), index+1); + if (TRACE_LINES) logerror("%s: Select floppy drive DSK%d\n", tag(), 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().c_str(), index+1); + if (TRACE_LINES) logerror("%s: Connect index callback DSK%d\n", tag(), 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().c_str(), index+1); + logerror("%s: Connection to DSK%d failed because no drive is connected\n", tag(), 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().c_str(), index+1); + if (TRACE_LINES) logerror("%s: Select hard disk WDS%d\n", tag(), index+1); // Connect new drive m_current_harddisk = m_harddisk_unit[index]; - if (TRACE_LINES) logerror("%s: Connect index callback WDS%d\n", tag().c_str(), index+1); + if (TRACE_LINES) logerror("%s: Connect index callback WDS%d\n", tag(), 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().c_str(), index+1); + logerror("%s: Connection to WDS%d failed because no drive is connected\n", tag(), 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().c_str()); + if (TRACE_LINES) logerror("%s: Unselect floppy drives\n", tag()); // 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().c_str()); + if (TRACE_LINES) logerror("%s: Unselect hard drives\n", tag()); 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().c_str()); + if (m_MOTOR_ON==CLEAR_LINE) logerror("%s: Motor START\n", tag()); m_MOTOR_ON = ASSERT_LINE; } else { if (TRACE_MOTOR) - if (m_MOTOR_ON==ASSERT_LINE) logerror("%s: Motor STOP\n", tag().c_str()); + if (m_MOTOR_ON==ASSERT_LINE) logerror("%s: Motor STOP\n", tag()); 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().c_str(), state); + if (TRACE_INT) logerror("%s: INT pin from controller = %d, propagating to INTA*\n", tag(), 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().c_str(), state); + if (TRACE_DMA) logerror("%s: DMARQ pin from controller = %d\n", tag(), 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().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); + 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); 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().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); + 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); 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().c_str()); + if (TRACE_EMU) logerror("%s: start\n", tag()); 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().c_str()); + if (TRACE_EMU) logerror("%s: reset\n", tag()); // 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().c_str(), i+1, m_floppy_unit[i]->name()); + logerror("%s: FD connector %d with %s\n", tag(), i+1, m_floppy_unit[i]->name()); else - logerror("%s: FD connector %d has no floppy attached\n", tag().c_str(), i+1); + logerror("%s: FD connector %d has no floppy attached\n", tag(), i+1); } for (int i=0; i < 3; i++) { if (m_harddisk_unit[i] != nullptr) - logerror("%s: HD connector %d with %s\n", tag().c_str(), i+1, m_harddisk_unit[i]->name()); + logerror("%s: HD connector %d with %s\n", tag(), i+1, m_harddisk_unit[i]->name()); else - logerror("%s: HD connector %d has no drive attached\n", tag().c_str(), i+1); + logerror("%s: HD connector %d has no drive attached\n", tag(), i+1); } // Disconnect all units diff --git a/src/devices/bus/ti99_peb/hfdc.h b/src/devices/bus/ti99_peb/hfdc.h index 0bbdcea1f65..ec51e3122d6 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, std::string tag, device_t *owner, UINT32 clock); + myarc_hfdc_device(const machine_config &mconfig, const char *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 0eb006506f7..cdae19a2bbb 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, std::string tag, device_t *owner, UINT32 clock) +horizon_ramdisk_device::horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_HORIZON, "Horizon 4000 Ramdisk", tag, owner, clock,"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 3a97ecef8f2..f2568bb864f 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, std::string tag, device_t *owner, UINT32 clock); + horizon_ramdisk_device(const machine_config &mconfig, const char *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 e3c95b4578b..42ec9360ad3 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, std::string tag, device_t *owner, UINT32 clock) +snug_high_speed_gpl_device::snug_high_speed_gpl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_HSGPL, "SNUG High-speed GPL card", tag, owner, clock, "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().c_str(), offset); + if (TRACE_CRU) logerror("%s: Supercart cru setting %04x\n", tag(), 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().c_str(), data); + if (TRACE_CRU) logerror("%s: Set dsr_enabled=%x\n", tag(), data); break; case 1: m_gram_enabled = (data != 0); - if (TRACE_CRU) logerror("%s: Set gram_enabled=%x\n", tag().c_str(), data); + if (TRACE_CRU) logerror("%s: Set gram_enabled=%x\n", tag(), data); break; case 2: m_bank_inhibit = (data != 0); - if (TRACE_CRU) logerror("%s: Set bank_inhibit=%x\n", tag().c_str(), data); + if (TRACE_CRU) logerror("%s: Set bank_inhibit=%x\n", tag(), 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().c_str(), m_dsr_page); + if (TRACE_CRU) logerror("%s: Set dsr_page=%d\n", tag(), m_dsr_page); break; case 9: m_card_enabled = data; - if (TRACE_CRU) logerror("%s: Set card_enabled=%x\n", tag().c_str(), data); + if (TRACE_CRU) logerror("%s: Set card_enabled=%x\n", tag(), data); break; case 10: m_write_enabled = data; - if (TRACE_CRU) logerror("%s: Set write_enabled=%x\n", tag().c_str(), data); + if (TRACE_CRU) logerror("%s: Set write_enabled=%x\n", tag(), 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().c_str(), data); + if (TRACE_CRU) logerror("%s: Set supercart_enabled=%x\n", tag(), data); break; case 12: m_led_on = data; - if (TRACE_CRU) logerror("%s: Set led_on=%x\n", tag().c_str(), data); + if (TRACE_CRU) logerror("%s: Set led_on=%x\n", tag(), data); break; case 13: break; case 14: m_mbx_enabled = data; - if (TRACE_CRU) logerror("%s: Set mbx_enabled=%x\n", tag().c_str(), data); + if (TRACE_CRU) logerror("%s: Set mbx_enabled=%x\n", tag(), data); break; case 15: m_ram_enabled = data; - if (TRACE_CRU) logerror("%s: Set ram_enabled=%x\n", tag().c_str(), data); + if (TRACE_CRU) logerror("%s: Set ram_enabled=%x\n", tag(), 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().c_str(), offset, m_dsr_page, *value); + if (TRACE_READ) logerror("%s: read dsr %04x[%02x] -> %02x\n", tag(), 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().c_str(), 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); 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().c_str(), offset, *value); + if (TRACE_READ) logerror("%s: cartridge space read %04x -> %02x\n", tag(), 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().c_str()); + logerror("%s: unknown 0x6000 port\n", tag()); } } } @@ -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().c_str(), 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(), 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().c_str(), offset & 0xffff, m_module_bank); + if (TRACE_PORT) if (bNew) logerror("%s: GROM read access at %04x - switch to bank %d\n", tag(), 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().c_str(), offset & 0xffff, m_module_bank); + if (TRACE_PORT) if (bNew) logerror("%s: GROM read access at %04x - switch to bank %d\n", tag(), 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().c_str(), (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(), (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().c_str(), (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(), (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().c_str(), offset & 0xffff, m_module_bank); + if (TRACE_PORT) if (bNew) logerror("%s: GRAM read access at %04x - switch to bank %d\n", tag(), 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().c_str(), offset & 0xffff); + if (TRACE_PORT) if (bNew) logerror("%s: RAM read access at %04x\n", tag(), offset & 0xffff); } else { - logerror("%s: Attempt to read from undefined port 0x%0x; ignored.\n", tag().c_str(), port); + logerror("%s: Attempt to read from undefined port 0x%0x; ignored.\n", tag(), 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().c_str(), 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); return; } - if (TRACE_WRITE) logerror("%s: cartridge space write %04x <- %02x\n", tag().c_str(), offset, data); + if (TRACE_WRITE) logerror("%s: cartridge space write %04x <- %02x\n", tag(), 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().c_str(), offset, data); + if ((offset & 0x9ff0)!=0) logerror("%s: unplausible ROM6 write: %04x <- %02x\n", tag(), offset, data); m_current_bank = (offset>>1) & 3; - if (TRACE_BANKING) logerror("%s: select bank %d\n", tag().c_str(), m_current_bank); + if (TRACE_BANKING) logerror("%s: select bank %d\n", tag(), 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().c_str(), m_current_bank); + if (TRACE_BANKING) logerror("%s: select bank MBX %d\n", tag(), 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().c_str(), offset, data); + logerror("%s: invalid write %04x <- %02x\n", tag(), 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().c_str()); + logerror("%s: unknown 0x6000 port\n", tag()); } } } @@ -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().c_str(), offset & 0xffff, port); + if (TRACE_PORT) if (bNew) logerror("%s: GRAM write access at %04x (GRMENA=1) - switch to bank %d\n", tag(), 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().c_str(), offset & 0xffff, port); + if (TRACE_PORT) if (bNew) logerror("%s: GROM write access at %04x - switch to bank %d\n", tag(), 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().c_str(), offset & 0xffff, port); + if (TRACE_PORT) if (bNew) logerror("%s: GROM write access at %04x - switch to bank %d\n", tag(), 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().c_str(), (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(), (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().c_str(), (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(), (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().c_str(), offset & 0xffff, m_module_bank); + if (TRACE_PORT) if (bNew) logerror("%s: GRAM write access at %04x - switch to bank %d\n", tag(), 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().c_str(), offset & 0xffff); + if (TRACE_PORT) if (bNew) logerror("%s: RAM write access at %04x\n", tag(), offset & 0xffff); } else { - logerror("%s: Attempt to write to undefined port; ignored.\n", tag().c_str()); + logerror("%s: Attempt to write to undefined port; ignored.\n", tag()); } } } @@ -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().c_str()); + logerror("%s: reset\n", tag()); 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 1ccb9ae1d35..dfb755c67b4 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, std::string tag, device_t *owner, UINT32 clock); + snug_high_speed_gpl_device(const machine_config &mconfig, const char *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 0aa1eca3688..66dd2f7b291 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, std::string tag, device_t *owner, UINT32 clock) +geneve_memex_device::geneve_memex_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_MEMEX, "Geneve memory expansion card", tag, owner, clock, "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 0dd0c07a0a5..e82e2c21ab7 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, std::string tag, device_t *owner, UINT32 clock); + geneve_memex_device(const machine_config &mconfig, const char *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 fec35bc21fe..08e8f893a95 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, std::string tag, device_t *owner, UINT32 clock) +myarc_memory_expansion_device::myarc_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_MYARCMEM, "Myarc Memory expansion card MEXP-1", tag, owner, clock, "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 0f3f615c395..6af530d65dd 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, std::string tag, device_t *owner, UINT32 clock); + myarc_memory_expansion_device(const machine_config &mconfig, const char *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 5cbe7c08b63..57ee6462874 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, std::string tag, device_t *owner, UINT32 clock) +ti_pcode_card_device::ti_pcode_card_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_P_CODE, "TI-99 P-Code Card", tag, owner, clock, "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 79db2b394de..c2a81a1395c 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, std::string tag, device_t *owner, UINT32 clock); + ti_pcode_card_device(const machine_config &mconfig, const char *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 6da994728bf..f91622742d1 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, std::string tag, device_t *owner, UINT32 clock) +peribox_device::peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, PERIBOX, "Peripheral expansion box", tag, owner, clock, "peribox", __FILE__), m_console_inta(*this), m_console_intb(*this), @@ -231,7 +231,7 @@ peribox_device::peribox_device(const machine_config &mconfig, std::string tag, d /* Constructor called from subclasses. */ -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) +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) : 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().c_str(), slot, state); + if (TRACE_INT) logerror("%s: propagating INTA from slot %d to console: %d\n", tag(), 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().c_str(), slot, state); + if (TRACE_INT) logerror("%s: propagating INTB from slot %d to console: %d\n", tag(), 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().c_str(), state, slot); + if (TRACE_READY) logerror("%s: Incoming READY=%d from slot %d\n", tag(), 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().c_str()); + if (TRACE_EMU) logerror("%s: started\n", tag()); // 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().c_str(), m_address_prefix); + logerror("%s: AMA/B/C address prefix set to %05x\n", tag(), m_address_prefix); for (int i=2; i < 9; i++) { - logerror("%s: Slot %d = %s\n", tag().c_str(), i, (m_slot[i] != nullptr)? m_slot[i]->m_card->tag().c_str() : "EMPTY"); + logerror("%s: Slot %d = %s\n", tag(), i, (m_slot[i] != nullptr)? m_slot[i]->m_card->tag() : "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, std::string tag, device_t *owner, UINT32 clock) +peribox_gen_device::peribox_gen_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +peribox_998_device::peribox_998_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +peribox_sg_device::peribox_sg_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +peribox_ev_device::peribox_ev_device(const machine_config &mconfig, const char *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().c_str(); + const char *mytag = tag(); 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, std::string tag, device_t *owner, UINT32 clock) +peribox_slot_device::peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, PERIBOX_SLOT, "TI P-Box slot", tag, owner, clock, "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 72b168cd449..429d8ba8610 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, 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); + 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); template static devcb_base &static_set_inta_callback(device_t &device, _Object object) { return downcast(device).m_console_inta.set_callback(object); } template static devcb_base &static_set_intb_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + peribox_ev_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + peribox_sg_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + peribox_gen_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + peribox_998_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + peribox_slot_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_card_interface(mconfig, *this), m_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 8f603f8d0ec..0ff3e27d928 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, std::string tag, device_t *owner, UINT32 clock) +sams_memory_expansion_device::sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_SAMSMEM, "SuperAMS memory expansion card", tag, owner, clock, "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 c14966aab48..d5e1cb9b062 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, std::string tag, device_t *owner, UINT32 clock); + sams_memory_expansion_device(const machine_config &mconfig, const char *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 8e018bae354..1fb447f6d17 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, std::string tag, device_t *owner, UINT32 clock) +ti_speech_synthesizer_device::ti_speech_synthesizer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_SPEECH, "TI-99 Speech synthesizer (on adapter card)", tag, owner, clock, "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 1ca399f82c9..44e7aca54c4 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, std::string tag, device_t *owner, UINT32 clock); + ti_speech_synthesizer_device(const machine_config &mconfig, const char *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 81339ed3731..9e4a2b82349 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, std::string tag, device_t *owner, UINT32 clock) +ti_32k_expcard_device::ti_32k_expcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI_32KMEM, "TI-99 32KiB memory expansion card", tag, owner, clock, "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 646890bda89..fe3bf860753 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, std::string tag, device_t *owner, UINT32 clock); + ti_32k_expcard_device(const machine_config &mconfig, const char *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 7745e6c9edf..82585c424ce 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, std::string tag, device_t *owner, UINT32 clock) +ti_fdc_device::ti_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_FDC, "TI-99 Standard DSSD Floppy Controller", tag, owner, clock, "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 7870158d16a..ed1082d3b0a 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, std::string tag, device_t *owner, UINT32 clock); + ti_fdc_device(const machine_config &mconfig, const char *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 bd99239a909..e93bb86d015 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, std::string tag, device_t *owner, UINT32 clock) +ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_RS232, "TI-99 RS232/PIO interface", tag, owner, clock, "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, std::str /**************************************************************************/ /* Ports */ -ti_rs232_attached_device::ti_rs232_attached_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ti_rs232_attached_device::ti_rs232_attached_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ti_pio_attached_device::ti_pio_attached_device(const machine_config &mconfig, const char *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().c_str(); + const char *mytag = tag(); 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 0ecdfa1397d..24c190aac2d 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, std::string tag, device_t *owner, UINT32 clock); + ti_rs232_pio_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ti_rs232_attached_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ti_pio_attached_device(const machine_config &mconfig, const char *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 13c25c07f3e..3b9e9b1f6ce 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, std::string tag, device_t *owner, UINT32 clock) +nouspikel_ide_interface_device::nouspikel_ide_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_IDE, "Nouspikel IDE interface card", tag, owner, clock, "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 5afc0355fab..52694555b3b 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, std::string tag, device_t *owner, UINT32 clock); + nouspikel_ide_interface_device(const machine_config &mconfig, const char *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 9448592dc6e..63662ce692a 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, std::string tag, device_t *owner, UINT32 clock) +nouspikel_usb_smartmedia_device::nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_USBSM, "Nouspikel USB/Smartmedia card", tag, owner, clock, "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 d07aa8a5562..08d7f281fe8 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, std::string tag, device_t *owner, UINT32 clock); + nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *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 b74e041d724..16fd5920d7c 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +fd800_legacy_device::fd800_legacy_device(const machine_config &mconfig, const char *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 f1b0296430d..ffb7f79784a 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, std::string tag, device_t *owner, UINT32 clock); + fd800_legacy_device(const machine_config &mconfig, const char *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 7d1df50c7c9..b884f8be444 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 (":harddisk1" == device->tag()) + if ( ! strcmp( ":harddisk1", device->tag() ) ) { id = 0; } - else if (":harddisk2"==device->tag()) + else if ( ! strcmp( ":harddisk2", device->tag() ) ) { id = 1; } - else if (":harddisk3"==device->tag()) + else if ( ! strcmp( ":harddisk3", device->tag() ) ) { id = 2; } - else if (":harddisk4"==device->tag()) + else if ( ! strcmp( ":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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ti990_hdc_device::ti990_hdc_device(const machine_config &mconfig, const char *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 0c2017d7b20..f6468a807f9 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, std::string tag, device_t *owner, UINT32 clock); + ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast(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 8bd5c0f75d5..3f6e48ddc52 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, std::string tag, device_t *owner, UINT32 clock); + ti990_tape_image_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ti990_tape_image_device::ti990_tape_image_device(const machine_config &mconfig, const char *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 (tag()==":tape0") drive = 0; - if (tag()==":tape1") drive = 1; - if (tag()==":tape2") drive = 2; - if (tag()==":tape3") drive = 3; + 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; return drive; } @@ -978,7 +978,7 @@ MACHINE_CONFIG_END const device_type TI990_TAPE_CTRL = &device_creator; -tap_990_device::tap_990_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tap_990_device::tap_990_device(const machine_config &mconfig, const char *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 94892a947d8..6622e2af587 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, std::string tag, device_t *owner, UINT32 clock); + tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast(device).m_int_line.set_callback(object); diff --git a/src/devices/bus/ti99x/998board.cpp b/src/devices/bus/ti99x/998board.cpp index db93d16f309..6df84271cc4 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, std::string tag, device_t *owner, UINT32 clock) +mainboard8_device::mainboard8_device(const machine_config &mconfig, const char *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, std::string READ8Z_MEMBER(mainboard8_device::crureadz) { - if (TRACE_CRU) logerror("%s: read CRU %04x ignored\n", tag().c_str(), offset); + if (TRACE_CRU) logerror("%s: read CRU %04x ignored\n", tag(), 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().c_str(), data); + if (TRACE_CRU) logerror("%s: DSR select = %d\n", tag(), data); break; case 1: - if (TRACE_CRU) logerror("%s: System reset by CRU request\n", tag().c_str()); + if (TRACE_CRU) logerror("%s: System reset by CRU request\n", tag()); 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().c_str(), data); + if (TRACE_CRU) logerror("%s: Hexbus select = %d\n", tag(), data); break; default: - if (TRACE_CRU) logerror("%s: Set CRU>%04x (Hexbus) to %d\n", tag().c_str(), offset,data); + if (TRACE_CRU) logerror("%s: Set CRU>%04x (Hexbus) to %d\n", tag(), 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().c_str(), offset,data); + if (TRACE_CRU) logerror("%s: Set CRU>%04x (unknown) to %d\n", tag(), offset,data); return; } } void mainboard8_device::CRUS_set(bool state) { - if (TRACE_CRU) logerror("%s: set CRUS=%d\n", tag().c_str(), state); + if (TRACE_CRU) logerror("%s: set CRUS=%d\n", tag(), 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().c_str(), state? 1:0); + if (TRACE_CRU) logerror("%s: set PTGEN=%d\n", tag(), 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().c_str(), offset); + if (TRACE_MEM) logerror("%s: read from %04x\n", tag(), 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().c_str(), offset, *value); + if (TRACE_MEM) logerror("%s: (intDSR) %04x -> %02x\n", tag(), 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().c_str(), offset, *value); + if (TRACE_MEM) logerror("%s: (HexDSR) %04x -> %02x\n", tag(), 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().c_str(), offset); + if (TRACE_MEM) logerror("%s: read access to mapper ignored: %04x\n", tag(), offset); } } } @@ -410,18 +410,18 @@ WRITE8_MEMBER( mainboard8_device::write ) } else { - logerror("%s: Write access to Hexbus DSR address %06x ignored\n", tag().c_str(), offset); + logerror("%s: Write access to Hexbus DSR address %06x ignored\n", tag(), offset); } } else { if (m_dsr_selected) { - logerror("%s: Write access to internal DSR address %06x ignored\n", tag().c_str(), offset); + logerror("%s: Write access to internal DSR address %06x ignored\n", tag(), offset); } else { - logerror("%s: Write access to unmapped DSR space at address %06x ignored\n", tag().c_str(), offset); + logerror("%s: Write access to unmapped DSR space at address %06x ignored\n", tag(), 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().c_str(), bankindx); + if (TRACE_MAP) logerror("%s: load mapper from SRAM, bank %d\n", tag(), 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().c_str(), i, m_pas_offset[i]); + if (TRACE_MAP) logerror("%s: load %d=%08x\n", tag(), i, m_pas_offset[i]); } } else { - if (TRACE_MAP) logerror("%s: store mapper to SRAM, bank %d\n", tag().c_str(), bankindx); + if (TRACE_MAP) logerror("%s: store mapper to SRAM, bank %d\n", tag(), 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().c_str(), i, m_pas_offset[i]); + if (TRACE_MAP) logerror("%s: save %d=%08x\n", tag(), 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().c_str(), offset, m_CRUS? 1:0, m_PTGE? 0:1); + if (TRACE_MEM) logerror("%s: offset=%04x; CRUS=%d, PTGEN=%d\n", tag(), offset, m_CRUS? 1:0, m_PTGE? 0:1); while (ldev != nullptr) { - if (TRACE_MEM) logerror("%s: checking node=%s\n", tag().c_str(), ldev->m_config->name); + if (TRACE_MEM) logerror("%s: checking node=%s\n", tag(), 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().c_str(), offset, *value); + if (TRACE_MEM) logerror("%s: (SRAM) %04x -> %02x\n", tag(), 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().c_str(), offset, *value); + if (TRACE_MEM) logerror("%s: (ROM0) %04x -> %02x\n", tag(), offset, *value); break; case MAP8_DEV: // device bdev = static_cast(ldev->m_device); bdev->readz(space, offset, value, mem_mask); - if (TRACE_MEM) logerror("%s: (dev %s) %04x -> %02x\n", tag().c_str(), ldev->m_config->name, offset, *value); + if (TRACE_MEM) logerror("%s: (dev %s) %04x -> %02x\n", tag(), ldev->m_config->name, offset, *value); break; default: - if (TRACE_MEM) logerror("%s: Invalid kind for read access: %d\n", tag().c_str(), ldev->m_kind); + if (TRACE_MEM) logerror("%s: Invalid kind for read access: %d\n", tag(), 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().c_str(), offset, data); + if (TRACE_MEM) logerror("%s: (SRAM) %04x <- %02x\n", tag(), offset, data); break; case MAP8_ROM0: - if (TRACE_MEM) logerror("%s: (ROM0) %04x <- %02x (ignored)\n", tag().c_str(), offset, data); + if (TRACE_MEM) logerror("%s: (ROM0) %04x <- %02x (ignored)\n", tag(), offset, data); break; case MAP8_DEV: // device bdev = static_cast(ldev->m_device); bdev->write(space, offset, data, mem_mask); - if (TRACE_MEM) logerror("%s: (dev %s) %04x <- %02x\n", tag().c_str(), ldev->m_config->name, offset, data); + if (TRACE_MEM) logerror("%s: (dev %s) %04x <- %02x\n", tag(), ldev->m_config->name, offset, data); break; default: - if (TRACE_MEM) logerror("%s: Invalid kind for write access: %d\n", tag().c_str(), ldev->m_kind); + if (TRACE_MEM) logerror("%s: Invalid kind for write access: %d\n", tag(), 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().c_str(), pas_address, *value); + if (TRACE_MEM) logerror("%s: (DRAM) %06x -> %02x\n", tag(), 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().c_str(), pas_address, *value); + if (TRACE_MEM) logerror("%s: (ROM) %06x -> %02x\n", tag(), 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().c_str(), pas_address, *value); + if (TRACE_MEM) logerror("%s: (ROM) %06x -> %02x\n", tag(), pas_address, *value); break; case MAP8_PCODE: *value = m_pcode[pas_address & 0x3fff]; - if (TRACE_MEM) logerror("%s: (PCODE) %06x -> %02x\n", tag().c_str(), pas_address, *value); + if (TRACE_MEM) logerror("%s: (PCODE) %06x -> %02x\n", tag(), pas_address, *value); break; case MAP8_INTS: // Interrupt sense - logerror("%s: ILSENSE not implemented.\n", tag().c_str()); + logerror("%s: ILSENSE not implemented.\n", tag()); break; case MAP8_DEV: // devices bdev = static_cast(pdev->m_device); bdev->readz(space, pas_address, value, mem_mask); - if (TRACE_MEM) logerror("%s: (dev %s) %06x -> %02x\n", tag().c_str(), pdev->m_config->name, pas_address, *value); + if (TRACE_MEM) logerror("%s: (dev %s) %06x -> %02x\n", tag(), pdev->m_config->name, pas_address, *value); break; default: - logerror("%s: Invalid kind for physical read access: %d\n", tag().c_str(), pdev->m_kind); + logerror("%s: Invalid kind for physical read access: %d\n", tag(), 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().c_str(), pas_address, data); + if (TRACE_MEM) logerror("%s: (DRAM) %06x <- %02x\n", tag(), pas_address, data); break; case MAP8_ROM1A0: case MAP8_ROM1C0: - if (TRACE_MEM) logerror("%s: (ROM1) %06x <- %02x (ignored)\n", tag().c_str(), pas_address, data); + if (TRACE_MEM) logerror("%s: (ROM1) %06x <- %02x (ignored)\n", tag(), pas_address, data); break; case MAP8_PCODE: - if (TRACE_MEM) logerror("%s: (PCODE) %06x <- %02x (ignored)\n", tag().c_str(), pas_address, data); + if (TRACE_MEM) logerror("%s: (PCODE) %06x <- %02x (ignored)\n", tag(), pas_address, data); break; case MAP8_INTS: // Interrupt sense - logerror("%s: write to ilsense ignored\n", tag().c_str()); + logerror("%s: write to ilsense ignored\n", tag()); break; case MAP8_DEV: // devices bdev = static_cast(pdev->m_device); - if (TRACE_MEM) logerror("%s: (dev %s) %06x <- %02x\n", tag().c_str(), pdev->m_config->name, pas_address, data); + if (TRACE_MEM) logerror("%s: (dev %s) %06x <- %02x\n", tag(), 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().c_str(), pdev->m_kind); + logerror("%s: Invalid kind for physical write access: %d\n", tag(), 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().c_str()); + logerror("%s: Starting mapper\n", tag()); // 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().c_str(), entry[i].name); + if (TRACE_CONFIG) logerror("%s: Device %s mounted into logical address space.\n", tag(), 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().c_str(), entry[i].name); + if (TRACE_CONFIG) logerror("%s: Device %s mounted into physical address space.\n", tag(), entry[i].name); } } else { - if (TRACE_CONFIG) logerror("%s: Device %s not found.\n", tag().c_str(), entry[i].name); + if (TRACE_CONFIG) logerror("%s: Device %s not found.\n", tag(), entry[i].name); } } } } - 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()); + 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()); m_dsr_selected = false; m_CRUS = true; @@ -858,7 +858,7 @@ enum SHSK = 0x01 }; -ti998_oso_device::ti998_oso_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ti998_oso_device::ti998_oso_device(const machine_config &mconfig, const char *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().c_str(), value); + if (TRACE_OSO) logerror("%s: Read data register = %02x\n", tag(), 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().c_str(), value); + if (TRACE_OSO) logerror("%s: Read status %02x\n", tag(), value); break; case 2: // read 5FFC: read control register value = m_control; - if (TRACE_OSO) logerror("%s: Read control register = %02x\n", tag().c_str(), value); + if (TRACE_OSO) logerror("%s: Read control register = %02x\n", tag(), value); break; case 3: // read 5FFE: read transmit register value = m_xmit; - if (TRACE_OSO) logerror("%s: Read transmit register = %02x\n", tag().c_str(), value); + if (TRACE_OSO) logerror("%s: Read transmit register = %02x\n", tag(), 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().c_str(), data); + if (TRACE_OSO) logerror("%s: Write transmit register %02x\n", tag(), 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().c_str(), data); + if (TRACE_OSO) logerror("%s: Write control register %02x\n", tag(), data); m_control = data; break; default: // write 5FFC, 5FFE: undefined - if (TRACE_OSO) logerror("%s: Invalid write on %04x: %02x\n", tag().c_str(), (offset<<1) | 0x5ff0, data); + if (TRACE_OSO) logerror("%s: Invalid write on %04x: %02x\n", tag(), (offset<<1) | 0x5ff0, data); break; } } @@ -947,7 +947,7 @@ const device_type OSO = &device_creator; #define SPEECHSYN_TAG "speechsyn" #define REAL_TIMING 0 -ti998_spsyn_device::ti998_spsyn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ti998_spsyn_device::ti998_spsyn_device(const machine_config &mconfig, const char *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().c_str(), *value); + if (TRACE_SPEECH) logerror("%s: read value = %02x\n", tag(), *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().c_str(), data); + if (TRACE_SPEECH) logerror("%s: write value = %02x\n", tag(), 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().c_str(), *value); + if (TRACE_SPEECH) logerror("%s: read value = %02x\n", tag(), *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("maincpu")->attotime_to_cycles(time_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); + if (TRACE_SPEECH && TRACE_DETAIL) logerror("%s: time to ready: %f -> %d\n", tag(), 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().c_str(), data); + if (TRACE_SPEECH) logerror("%s: write value = %02x\n", tag(), 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().c_str(), (state==0)); + if (TRACE_SPEECH) logerror("%s: READY = %d\n", tag(), (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().c_str()); + if (TRACE_SPEECH) logerror("%s: reset\n", tag()); } // 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 b5586afcbf3..9231d9be647 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, std::string tag, device_t *owner, UINT32 clock); + ti998_oso_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ti998_spsyn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast(device).m_ready.set_callback(object); } @@ -186,7 +186,7 @@ private: class mainboard8_device : public bus8z_device { public: - mainboard8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mainboard8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast(device).m_ready.set_callback(object); } diff --git a/src/devices/bus/ti99x/datamux.cpp b/src/devices/bus/ti99x/datamux.cpp index 25987a49f29..1b8ec8de02f 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, std::string tag, device_t *owner, UINT32 clock) +ti99_datamux_device::ti99_datamux_device(const machine_config &mconfig, const char *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 6adec37d121..604dfb2e62f 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, std::string tag, device_t *owner, UINT32 clock); + ti99_datamux_device(const machine_config &mconfig, const char *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 f653944c3df..9d6aeef7e76 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, std::string tag, device_t *owner, UINT32 clock) +geneve_mapper_device::geneve_mapper_device(const machine_config &mconfig, const char *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().c_str(), value); + if (TRACE_SETTING) logerror("%s: Setting turbo flag to %d\n", tag(), 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().c_str(), value); + if (TRACE_SETTING) logerror("%s: Setting timode flag to %d\n", tag(), 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().c_str(), number); + logerror("%s: Unknown setting %d ignored\n", tag(), 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().c_str(), min); + if (TRACE_LINES) logerror("%s: Pulling down READY line for %d cycles\n", tag(), 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().c_str()); + logerror("%s: Using 0.98 boot eprom\n", tag()); 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().c_str()); + logerror("%s: Using 1.00 boot eprom\n", tag()); m_eprom = machine().root_device().memregion("maincpu")->base(); m_pfm_mode = 0; break; case GENEVE_PFM512: - logerror("%s: Using PFM512 (AT29C040)\n", tag().c_str()); + logerror("%s: Using PFM512 (AT29C040)\n", tag()); m_pfm_mode = 1; break; case GENEVE_PFM512A: - logerror("%s: Using PFM512A (AT29C040A)\n", tag().c_str()); + logerror("%s: Using PFM512A (AT29C040A)\n", tag()); m_pfm_mode = 2; break; default: - logerror("%s: Unknown boot ROM selection\n", tag().c_str()); + logerror("%s: Unknown boot ROM selection\n", tag()); } } void geneve_mapper_device::set_geneve_mode(bool geneve) { - if (TRACE_SETTING) logerror("%s: Setting Geneve mode = %d\n", tag().c_str(), geneve); + if (TRACE_SETTING) logerror("%s: Setting Geneve mode = %d\n", tag(), 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().c_str(), direct); + if (TRACE_SETTING) logerror("%s: Setting direct mode = %d\n", tag(), 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().c_str(), size); + if (TRACE_SETTING) logerror("%s: Setting cartridge size to %d\n", tag(), 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().c_str(), base, write); + if (TRACE_SETTING) logerror("%s: Cartridge %04x space writable = %d\n", tag(), 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().c_str(), wait); + if (TRACE_SETTING) logerror("%s: Setting video waitstates = %d\n", tag(), 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().c_str(), wait); + if (TRACE_SETTING) logerror("%s: Setting extra waitstates = %d\n", tag(), 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().c_str(), dec->offset, value); + if (TRACE_READ) logerror("%s: Read video %04x -> %02x\n", tag(), 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().c_str(), dec->offset, value); + if (TRACE_READ) logerror("%s: read mapper %04x -> %02x\n", tag(), 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().c_str(), value); + if (TRACE_READ) logerror("%s: Read keyboard -> %02x\n", tag(), 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().c_str(), dec->offset, value); + if (TRACE_READ) logerror("%s: Read clock %04x -> %02x\n", tag(), dec->offset, value); break; case MLTMAPPER: // mapper value = m_map[dec->offset]; - if (TRACE_READ) logerror("%s: Read mapper %04x -> %02x\n", tag().c_str(), dec->offset, value); + if (TRACE_READ) logerror("%s: Read mapper %04x -> %02x\n", tag(), 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().c_str(), value); + if (TRACE_READ) logerror("%s: Read keyboard -> %02x\n", tag(), 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().c_str(), dec->offset, value); + if (TRACE_READ) logerror("%s: Read clock %04x -> %02x\n", tag(), 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().c_str(), dec->offset, value); + if (TRACE_READ) logerror("%s: Read video %04x -> %02x\n", tag(), 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().c_str(), value); + if (TRACE_READ) logerror("%s: Read speech -> %02x\n", tag(), 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().c_str(), dec->offset, value); + if (TRACE_READ) logerror("%s: Read GROM %04x -> %02x\n", tag(), 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().c_str(), dec->offset, dec->physaddr, value); + if (TRACE_READ) logerror("%s: Read DRAM %04x (%06x) -> %02x\n", tag(), 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().c_str(), dec->physaddr); + if (TRACE_READ) logerror("%s: Read unmapped area %06x\n", tag(), 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().c_str(), dec->offset, dec->physaddr, value); + if (TRACE_READ) logerror("%s: Read EPROM %04x (%06x) -> %02x\n", tag(), 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().c_str(), dec->offset, dec->physaddr, value); + if (TRACE_READ) logerror("%s: Read SRAM %04x (%06x) -> %02x\n", tag(), 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().c_str(), dec->offset, dec->physaddr, value); + if (TRACE_READ) logerror("%s: Read P-Box %04x (%06x) -> %02x\n", tag(), 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().c_str(), dec->offset, dec->physaddr, value); + if (TRACE_READ) logerror("%s: Read EPROM %04x (%06x) -> %02x\n", tag(), 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().c_str(), offset, data); + if (TRACE_WRITE) logerror("%s: Write video %04x <- %02x\n", tag(), 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().c_str(), offset, data); + if (TRACE_WRITE) logerror("%s: Write mapper %04x <- %02x\n", tag(), offset, data); break; case MLGCLOCK: // clock // ++++ ++++ ++++ ---- m_clock->write(space, dec->offset, data); - if (TRACE_WRITE) logerror("%s: Write clock %04x <- %02x\n", tag().c_str(), offset, data); + if (TRACE_WRITE) logerror("%s: Write clock %04x <- %02x\n", tag(), offset, data); break; case MLGSOUND: // sound // ++++ ++++ ++++ ---+ m_sound->write(space, 0, data, 0xff); - if (TRACE_WRITE) logerror("%s: Write sound <- %02x\n", tag().c_str(), data); + if (TRACE_WRITE) logerror("%s: Write sound <- %02x\n", tag(), data); break; case MLTMAPPER: // mapper m_map[dec->offset] = data; - if (TRACE_WRITE) logerror("%s: Write mapper %04x <- %02x\n", tag().c_str(), offset, data); + if (TRACE_WRITE) logerror("%s: Write mapper %04x <- %02x\n", tag(), offset, data); break; case MLTCLOCK: // clock m_clock->write(space, dec->offset, data); - if (TRACE_WRITE) logerror("%s: Write clock %04x <- %02x\n", tag().c_str(), offset, data); + if (TRACE_WRITE) logerror("%s: Write clock %04x <- %02x\n", tag(), 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().c_str(), offset, data); + if (TRACE_WRITE) logerror("%s: Write video %04x <- %02x\n", tag(), 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().c_str(), data); + if (TRACE_WRITE) logerror("%s: Write speech <- %02x\n", tag(), 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().c_str(), offset, data); + if (TRACE_WRITE) logerror("%s: Write GROM %04x <- %02x\n", tag(), 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().c_str(), data); + if (TRACE_WRITE) logerror("%s: Write sound <- %02x\n", tag(), 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().c_str(), offset, dec->physaddr, data); + if (TRACE_WRITE) logerror("%s: Write DRAM %04x (%06x) <- %02x\n", tag(), 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().c_str(), dec->physaddr); + if (TRACE_WRITE) logerror("%s: Write unmapped area %06x\n", tag(), 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().c_str(), offset, dec->physaddr, data); + logerror("%s: Write EPROM %04x (%06x) <- %02x, ignored\n", tag(), 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().c_str(), offset, dec->physaddr, data); + if (TRACE_WRITE) logerror("%s: Write SRAM %04x (%06x) <- %02x\n", tag(), 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().c_str(), offset, dec->physaddr, data); + if (TRACE_WRITE) logerror("%s: Write P-Box %04x (%06x) <- %02x\n", tag(), 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().c_str(), offset, dec->physaddr, data); + logerror("%s: Write EPROM %04x (%06x) <- %02x, ignored\n", tag(), 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().c_str(), m_cartridge_secondpage); + if (TRACE_WRITE) logerror("%s: Set cartridge page %02x\n", tag(), 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().c_str(), dec->offset); + logerror("%s: Writing to protected cartridge space %04x ignored\n", tag(), 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().c_str(), m_pfm_mode); + logerror("%s: Illegal mode for reading PFM: %d\n", tag(), m_pfm_mode); return 0; } - if (TRACE_PFM) logerror("%s: Reading from PFM at address %05x -> %02x\n", tag().c_str(), address, value); + if (TRACE_PFM) logerror("%s: Reading from PFM at address %05x -> %02x\n", tag(), 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().c_str(), address, data); + if (TRACE_PFM) logerror("%s: Writing to PFM at address %05x <- %02x\n", tag(), 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().c_str(), m_pfm_mode); + logerror("%s: Illegal mode for writing to PFM: %d\n", tag(), 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().c_str(), offset); + if (TRACE_DETAIL) logerror("%s: setoffset = %04x\n", tag(), 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().c_str()); + if (TRACE_CLOCK) logerror("%s: clock, READY asserted\n", tag()); m_ready(ASSERT_LINE); m_ready_asserted = true; } else { - if (TRACE_CLOCK) logerror("%s: clock\n", tag().c_str()); + if (TRACE_CLOCK) logerror("%s: clock\n", tag()); } } 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().c_str()); + if (TRACE_CLOCK) logerror("%s: clock, READY asserted after video\n", tag()); m_ready(ASSERT_LINE); m_ready_asserted = true; } else { - if (TRACE_CLOCK) logerror("%s: vclock, ew=%d\n", tag().c_str(), m_ext_waitcount); + if (TRACE_CLOCK) logerror("%s: vclock, ew=%d\n", tag(), 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().c_str()); + if (TRACE_CLOCK) logerror("%s: clock, READY cleared for video\n", tag()); 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().c_str(), m_read_mode? 1:0); + if (TRACE_DETAIL) logerror("%s: dbin = %02x\n", tag(), 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().c_str(), m_pfm_bank); + if (TRACE_PFM) logerror("%s: Setting bank (l) = %d\n", tag(), 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().c_str(), m_pfm_bank); + if (TRACE_PFM) logerror("%s: Setting bank (u) = %d\n", tag(), 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().c_str(), m_pfm_output_enable? "enable" : "disable"); + if (TRACE_PFM) logerror("%s: PFM output %s\n", tag(), 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().c_str()); + logerror("%s: Using GenMod modification\n", tag()); 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, std::string tag, device_t *owner, UINT32 clock) +geneve_keyboard_device::geneve_keyboard_device(const machine_config &mconfig, const char *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().c_str(), keycode); + if (TRACE_KEYBOARD) logerror("%s: Posting keycode %02x\n", tag(), 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().c_str()); + if (TRACE_KEYBOARD) logerror("%s: Poll keyboard\n", tag()); 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().c_str()); + if (TRACE_KEYBOARD) logerror("%s: Signalling key available\n", tag()); 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().c_str(), m_keyboard_clock); + if (TRACE_KEYBOARD) logerror("%s: Keyboard clock_control state=%d\n", tag(), m_keyboard_clock); if (rising_edge) signal_when_key_available(); } @@ -1919,7 +1919,7 @@ const device_type GENEVE_KEYBOARD = &device_creator; Mouse support ****************************************************************************/ -geneve_mouse_device::geneve_mouse_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +geneve_mouse_device::geneve_mouse_device(const machine_config &mconfig, const char *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 66c02ec94ad..2248c64f9fe 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, std::string tag, device_t *owner, UINT32 clock); + geneve_mouse_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + geneve_keyboard_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + geneve_mapper_device(const machine_config &mconfig, const char *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 d58a137c63f..1ecb0168d80 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, std::string tag, device_t *owner, UINT32 clock) +ti99_grom_device::ti99_grom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, GROM, "TI-99 GROM device", tag, owner, clock, "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 8019076fa0a..a3129b6997f 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, std::string tag, device_t *owner, UINT32 clock); + ti99_grom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast(device).m_gromready.set_callback(object); } diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp index c98a8d2e58a..9e1533cb9a8 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, std::string tag, device_t *owner, UINT32 clock) +gromport_device::gromport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, GROMPORT, "Cartridge port", tag, owner, clock, "gromport", __FILE__), device_slot_interface(mconfig, *this), m_connector(nullptr), @@ -294,7 +294,7 @@ const device_type GROMPORT_SINGLE = &device_creator; const device_type GROMPORT_MULTI = &device_creator; const device_type GROMPORT_GK = &device_creator; -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) +ti99_cartridge_connector_device::ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_gromport(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, std::string tag, device_t *owner, UINT32 clock) +single_conn_device::single_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti99_cartridge_connector_device(mconfig, GROMPORT_SINGLE, "Standard cartridge connector", tag, owner, clock, "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, std::string tag, device_t *owner, UINT32 clock) +multi_conn_device::multi_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti99_cartridge_connector_device(mconfig, GROMPORT_MULTI, "Multi-cartridge extender", tag, owner, clock, "multi", __FILE__), m_active_slot(0), m_fixed_slot(0), @@ -462,7 +462,7 @@ multi_conn_device::multi_conn_device(const machine_config &mconfig, std::string void multi_conn_device::set_slot(int slotnumber) { if (TRACE_CHANGE) - if (m_active_slot != slotnumber) logerror("%s: Setting cartslot to %d\n", tag().c_str(), slotnumber); + if (m_active_slot != slotnumber) logerror("%s: Setting cartslot to %d\n", tag(), 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().c_str(), index); + if (TRACE_CHANGE) logerror("%s: Insert slot %d\n", tag(), 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().c_str(), index); + if (TRACE_CHANGE) logerror("%s: Remove slot %d\n", tag(), 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().c_str(), slot); + // logerror("%s: try it on slot %d\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) +gkracker_device::gkracker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti99_cartridge_connector_device(mconfig, GROMPORT_GK, "GRAMKracker", tag, owner, clock, "ti99_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().c_str(), offset, *value); + if (TRACE_READ) logerror("%s: Read %04x -> %02x\n", tag(), 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().c_str(), m_grom_address); + if (TRACE_GROM) logerror("%s: Set grom address %04x\n", tag(), 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().c_str(), offset, m_grom_address, data); + if (TRACE_GROM) logerror("%s: gwrite %04x(%04x) <- %02x\n", tag(), 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().c_str(), offset, data); + if (TRACE_GROM) logerror("%s: write %04x <- %02x\n", tag(), 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().c_str(), (int)((UINT64)param & 0x07), newval); + if (TRACE_GKRACKER) logerror("%s: Input changed %d - %d\n", tag(), (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().c_str()); + if (TRACE_CHANGE) logerror("%s: Insert cartridge\n", tag()); 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().c_str()); + if (TRACE_CHANGE) logerror("%s: Remove cartridge\n", tag()); 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().c_str()); + if (TRACE_GKRACKER) logerror("%s: Creating default NVRAM\n", tag()); 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().c_str()); + if (TRACE_GKRACKER) logerror("%s: Reading NVRAM\n", tag()); // 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().c_str()); + if (TRACE_GKRACKER) logerror("%s: Writing NVRAM\n", tag()); 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, std::string tag, device_t *owner, UINT32 clock) +ti99_cartridge_device::ti99_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : bus8z_device(mconfig, TI99CART, "TI-99 cartridge", tag, owner, clock, "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().c_str(), m_pcb->m_grom_size); + if (TRACE_CONFIG) logerror("%s: grom_socket.size=0x%04x\n", tag(), 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().c_str(), m_pcb->m_rom_size); + if (TRACE_CONFIG) logerror("%s: rom_socket.size=0x%04x\n", tag(), 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().c_str(); + const char *mytag = tag(); 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().c_str(), m_basename.c_str(), tag().c_str()); + if (TRACE_CHANGE) logerror("%s: Loading %s in slot %s\n", tag(), m_basename.c_str(), tag()); if (m_softlist) { - if (TRACE_CONFIG) logerror("%s: Using softlists\n", tag().c_str()); + if (TRACE_CONFIG) logerror("%s: Using softlists\n", tag()); 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().c_str(), pcb, m_pcbtype); + if (TRACE_CONFIG) logerror("%s: Cartridge type is %s (%d)\n", tag(), 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().c_str(), basename(), err.to_string()); + logerror("%s: Failed to load cartridge '%s': %s\n", tag(), 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().c_str()); + if (TRACE_CONFIG) logerror("%s: Standard PCB\n", tag()); m_pcb = new ti99_standard_cartridge(); break; case PCB_PAGED: - if (TRACE_CONFIG) logerror("%s: Paged PCB\n", tag().c_str()); + if (TRACE_CONFIG) logerror("%s: Paged PCB\n", tag()); m_pcb = new ti99_paged_cartridge(); break; case PCB_MINIMEM: - if (TRACE_CONFIG) logerror("%s: Minimem PCB\n", tag().c_str()); + if (TRACE_CONFIG) logerror("%s: Minimem PCB\n", tag()); m_pcb = new ti99_minimem_cartridge(); break; case PCB_SUPER: - if (TRACE_CONFIG) logerror("%s: Superspace PCB\n", tag().c_str()); + if (TRACE_CONFIG) logerror("%s: Superspace PCB\n", tag()); m_pcb = new ti99_super_cartridge(); break; case PCB_MBX: - if (TRACE_CONFIG) logerror("%s: MBX PCB\n", tag().c_str()); + if (TRACE_CONFIG) logerror("%s: MBX PCB\n", tag()); m_pcb = new ti99_mbx_cartridge(); break; case PCB_PAGED379I: - if (TRACE_CONFIG) logerror("%s: Paged379i PCB\n", tag().c_str()); + if (TRACE_CONFIG) logerror("%s: Paged379i PCB\n", tag()); m_pcb = new ti99_paged379i_cartridge(); break; case PCB_PAGED378: - if (TRACE_CONFIG) logerror("%s: Paged378 PCB\n", tag().c_str()); + if (TRACE_CONFIG) logerror("%s: Paged378 PCB\n", tag()); m_pcb = new ti99_paged378_cartridge(); break; case PCB_PAGED377: - if (TRACE_CONFIG) logerror("%s: Paged377 PCB\n", tag().c_str()); + if (TRACE_CONFIG) logerror("%s: Paged377 PCB\n", tag()); m_pcb = new ti99_paged377_cartridge(); break; case PCB_PAGEDCRU: - if (TRACE_CONFIG) logerror("%s: PagedCRU PCB\n", tag().c_str()); + if (TRACE_CONFIG) logerror("%s: PagedCRU PCB\n", tag()); m_pcb = new ti99_pagedcru_cartridge(); break; case PCB_GROMEMU: - if (TRACE_CONFIG) logerror("%s: Grom Emulation PCB\n", tag().c_str()); + if (TRACE_CONFIG) logerror("%s: Grom Emulation PCB\n", tag()); 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().c_str()); + if (TRACE_CHANGE) logerror("%s: Unload\n", tag()); 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().c_str(), swlist.list_name(), swname); + if (TRACE_CONFIG) logerror("%s: swlist = %s, swname = %s\n", tag(), 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; 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) +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) { } @@ -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().c_str(), offset, *value); + // logerror("%s: read cartridge rom space %04x = %02x\n", tag(), offset, *value); } } } WRITE8_MEMBER(ti99_cartridge_pcb::write) { - // logerror("%s: write standard\n", tag().c_str()); + // logerror("%s: write standard\n", tag()); 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().c_str(), offset); + if (TRACE_ILLWRITE) space.device().logerror("%s: Cannot write to ROM space at %04x\n", tag(), offset); } } @@ -1601,7 +1601,7 @@ READ8Z_MEMBER(ti99_paged_cartridge::readz) WRITE8_MEMBER(ti99_paged_cartridge::write) { - // logerror("%s: write standard\n", tag().c_str()); + // logerror("%s: write standard\n", tag()); 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().c_str()); + // logerror("%s: write standard\n", tag()); 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().c_str(), offset); + if (TRACE_ILLWRITE) space.device().logerror("%s: Write access to cartridge ROM at address %04x ignored", tag(), 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().c_str(), offset); + if (TRACE_CRU) space.device().logerror("%s: CRU accessed at %04x\n", tag(), 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().c_str(), offset); + if (TRACE_CRU) space.device().logerror("%s: CRU accessed at %04x\n", tag(), 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().c_str()); + // logerror("%s: write standard\n", tag()); 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().c_str(), m_grom_address); + if (TRACE_GROM) space.device().logerror("%s: Set grom address %04x\n", tag(), 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().c_str(), m_grom_address); + if (TRACE_ILLWRITE) space.device().logerror("%s: Ignoring write to GROM area at address %04x\n", tag(), m_grom_address); } } diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h index 406b80f5db3..7655173b10d 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, std::string tag, device_t *owner, UINT32 clock); + gromport_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ti99_cartridge_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + single_conn_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + multi_conn_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gkracker_device(const machine_config &mconfig, const char *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(); - std::string tag() { return m_tag; } - void set_tag(std::string tag) { m_tag = tag; } + const char* tag() { return m_tag; } + void set_tag(const char* 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 - std::string m_tag; + const char* m_tag; }; /******************** Standard cartridge ******************************/ diff --git a/src/devices/bus/ti99x/handset.cpp b/src/devices/bus/ti99x/handset.cpp index cdc526ccb67..2a073636910 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, std::string tag, device_t *owner, UINT32 clock) +ti99_handset_device::ti99_handset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : joyport_attached_device(mconfig, HANDSET, "TI-99/4 IR handset", tag, owner, clock, "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, std::string tag, device_t *owner, UINT32 clock) +ti99_twin_joystick::ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : joyport_attached_device(mconfig, HANDSET, "TI-99/4(A) Twin Joystick", tag, owner, clock, "twinjoy", __FILE__), m_joystick(0) { } diff --git a/src/devices/bus/ti99x/handset.h b/src/devices/bus/ti99x/handset.h index b5ceb353ed2..3f9de1b6221 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, std::string tag, device_t *owner, UINT32 clock); + ti99_handset_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ti99_twin_joystick(const machine_config &mconfig, const char *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 73f83e360e9..9aab362f812 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, std::string tag, device_t *owner, UINT32 clock) +joyport_device::joyport_device(const machine_config &mconfig, const char *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 019ff14c677..82129db726e 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, std::string 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, 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_joyport(nullptr) { } @@ -51,7 +51,7 @@ protected: class joyport_device : public device_t, public device_slot_interface { public: - joyport_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + joyport_device(const machine_config &mconfig, const char *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 3e54ae802bb..573fce594ff 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, std::string tag, device_t *owner, UINT32 clock) +mecmouse_device::mecmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : joyport_attached_device(mconfig, MECMOUSE, "Mechatronics Mouse", tag, owner, clock, "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 abd52dff0fa..37390a7461c 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, std::string tag, device_t *owner, UINT32 clock); + mecmouse_device(const machine_config &mconfig, const char *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 2f8f31379a9..130c0cfbc40 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) + bus8z_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } virtual DECLARE_READ8Z_MEMBER(readz) =0; virtual DECLARE_WRITE8_MEMBER(write) =0; @@ -90,7 +90,7 @@ public: class bus16z_device : device_t { public: - 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) + 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) : 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 b4b8a9f0fcf..6f09da722e7 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_tms9928a(nullptr) { } -ti_std_video_device::ti_std_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ti_std_video_device::ti_std_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_video_device(mconfig, TI99VIDEO, "TI99 STD Video subsystem", tag, owner, clock, "ti99_video", __FILE__) { } -ti_exp_video_device::ti_exp_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ti_exp_video_device::ti_exp_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_video_device(mconfig, V9938VIDEO, "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, std::string tag, device_t *owner, UINT32 clock) +ti_sound_sn94624_device::ti_sound_sn94624_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ti_sound_sn76496_device::ti_sound_sn76496_device(const machine_config &mconfig, const char *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 d71d3f90c92..de08dfb3dce 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + ti_std_video_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ti_exp_video_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source), m_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, std::string tag, device_t *owner, UINT32 clock); + ti_sound_sn94624_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ti_sound_sn76496_device(const machine_config &mconfig, const char *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 27cd2f6b929..d8c9fe201b5 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, std::string tag, device_t *owner, UINT32 clock) : +tiki100_8088_t::tiki100_8088_t(const machine_config &mconfig, const char *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 acadbb004ec..7ce0fe64776 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, std::string tag, device_t *owner, UINT32 clock); + tiki100_8088_t(const machine_config &mconfig, const char *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 b17eb8e9402..9ec594375b2 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 - constructor //------------------------------------------------- -tiki100_bus_slot_t::tiki100_bus_slot_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +tiki100_bus_slot_t::tiki100_bus_slot_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +tiki100_bus_t::tiki100_bus_t(const machine_config &mconfig, const char *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 373b31ecaf1..511d449beea 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, std::string tag, device_t *owner, UINT32 clock); + tiki100_bus_slot_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tiki100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tiki100_bus_t() { m_device_list.detach_all(); } template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } diff --git a/src/devices/bus/tiki100/hdc.cpp b/src/devices/bus/tiki100/hdc.cpp index cee10080dcd..504222f0f48 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, std::string tag, device_t *owner, UINT32 clock) : +tiki100_hdc_t::tiki100_hdc_t(const machine_config &mconfig, const char *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 1504c72c079..0d533bf7f96 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, std::string tag, device_t *owner, UINT32 clock); + tiki100_hdc_t(const machine_config &mconfig, const char *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 ff4473f5f85..8fd354a18c4 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 - constructor //------------------------------------------------- -tvc_hbf_device::tvc_hbf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tvc_hbf_device::tvc_hbf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TVC_HBF, "HBF floppy interface", tag, owner, clock, "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().c_str(), offset, data); + logerror("'%s': unmapped write to %04x %02x\n", tag(), offset, data); } diff --git a/src/devices/bus/tvc/hbf.h b/src/devices/bus/tvc/hbf.h index 5c99296023f..da677aa617e 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, std::string tag, device_t *owner, UINT32 clock); + tvc_hbf_device(const machine_config &mconfig, const char *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 0e839bd3a32..2ee28a2f3c0 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, std::string tag, device_t *owner, UINT32 clock) : +tvcexp_slot_device::tvcexp_slot_device(const machine_config &mconfig, const char *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 93975272379..9fa9e89fd2b 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, std::string tag, device_t *owner, UINT32 clock); + tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~tvcexp_slot_device(); template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(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 19a9791a257..587be158610 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; const device_type VBOY_ROM_EEPROM = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +vboy_rom_device::vboy_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +vboy_eeprom_device::vboy_eeprom_device(const machine_config &mconfig, const char *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 5da06ed726d..9ced7b51296 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + vboy_eeprom_device(const machine_config &mconfig, const char *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 a12ad79fb7b..4b8fc1bf4d2 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, std::string tag) +void device_vboy_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +vboy_cart_slot_device::vboy_cart_slot_device(const machine_config &mconfig, const char *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 5b2f93b9bfc..ca9e784ad8c 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + vboy_cart_slot_device(const machine_config &mconfig, const char *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 fc74f0c0d05..5c8ebf5c7bb 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; const device_type VC4000_ROM_CHESS2 = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +vc4000_rom4k_device::vc4000_rom4k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +vc4000_ram1k_device::vc4000_ram1k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +vc4000_chess2_device::vc4000_chess2_device(const machine_config &mconfig, const char *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 3c9d4b80e7d..af7bb070271 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + vc4000_rom4k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + vc4000_ram1k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + vc4000_chess2_device(const machine_config &mconfig, const char *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 5f44086b0e5..0b67a264c34 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, std::string tag) +void device_vc4000_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +vc4000_cart_slot_device::vc4000_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h21_cart_slot_device::h21_cart_slot_device(const machine_config &mconfig, const char *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 6559e27dc88..6b40c6cbcbe 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + vc4000_cart_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + h21_cart_slot_device(const machine_config &mconfig, const char *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 124ed28dc7f..4fc7d9cba5b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +a26_rom_cm_device::a26_rom_cm_device(const machine_config &mconfig, const char *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 e60a7e84c31..986cab23320 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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_cm_device(const machine_config &mconfig, const char *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 ab11a1766d1..fac776fabb1 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(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : +dpc_device::dpc_device(const machine_config& mconfig, const char* 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +a26_rom_dpc_device::a26_rom_dpc_device(const machine_config &mconfig, const char *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 67b6c5444c5..f9af63202a3 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, std::string tag, device_t *owner, UINT32 clock); + dpc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_dpc_device(const machine_config &mconfig, const char *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 4226a0c43a9..af5b09e0d8a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +a26_rom_harmony_device::a26_rom_harmony_device(const machine_config &mconfig, const char *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 d7e3501e120..344d929af29 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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_harmony_device(const machine_config &mconfig, const char *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 f72aab1725b..2c4dcd0d3a0 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; const device_type A26_ROM_X07 = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_4k_device::a26_rom_4k_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_f4_device::a26_rom_f4_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +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_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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_fa_device::a26_rom_fa_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_fe_device::a26_rom_fe_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_3e_device::a26_rom_3e_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_3f_device::a26_rom_3f_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_e0_device::a26_rom_e0_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_e7_device::a26_rom_e7_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_ua_device::a26_rom_ua_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_cv_device::a26_rom_cv_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_dc_device::a26_rom_dc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_fv_device::a26_rom_fv_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_jvp_device::a26_rom_jvp_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_4in1_device::a26_rom_4in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_8in1_device::a26_rom_8in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_32in1_device::a26_rom_32in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +a26_rom_x07_device::a26_rom_x07_device(const machine_config &mconfig, const char *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 e5174b12525..a6c37465c07 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_4k_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_f4_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_f8_sw_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_fa_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_fe_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_3e_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_3f_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_e0_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_e7_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_ua_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_cv_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_dc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_fv_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_jvp_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_4in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_8in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_32in1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_x07_device(const machine_config &mconfig, const char *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 74a04f74083..aeebde0f4c6 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +a26_rom_ss_device::a26_rom_ss_device(const machine_config &mconfig, const char *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 2aa36db6774..141a08e00e7 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, std::string tag, device_t *owner, UINT32 clock); + a26_rom_ss_device(const machine_config &mconfig, const char *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 cea3e2d10c0..b946c8051e7 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, std::string tag) +void device_vcs_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +vcs_cart_slot_device::vcs_cart_slot_device(const machine_config &mconfig, const char *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 f091980d340..984cf5c9d12 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + vcs_cart_slot_device(const machine_config &mconfig, const char *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 93327c3c00d..a74c5ae1b84 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, std::string tag, device_t *owner, UINT32 clock) : +vcs_control_port_device::vcs_control_port_device(const machine_config &mconfig, const char *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 69230ee655b..41f7c12e75a 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, std::string tag, device_t *owner, UINT32 clock); + vcs_control_port_device(const machine_config &mconfig, const char *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 b46ea971820..e1fbfec7c90 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, std::string tag, device_t *owner, UINT32 clock) : +vcs_joystick_booster_device::vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VCS_JOYSTICK_BOOSTER, "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 0f3b08f5fd0..d04be025ab9 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, std::string tag, device_t *owner, UINT32 clock); + vcs_joystick_booster_device(const machine_config &mconfig, const char *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 c3f4619b9f9..f1539eabeef 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, std::string tag, device_t *owner, UINT32 clock) : +vcs_joystick_device::vcs_joystick_device(const machine_config &mconfig, const char *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 53ec0e86de0..d43f6912dff 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, std::string tag, device_t *owner, UINT32 clock); + vcs_joystick_device(const machine_config &mconfig, const char *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 1fa375b8871..b1a1f2079d6 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, std::string tag, device_t *owner, UINT32 clock) : +vcs_keypad_device::vcs_keypad_device(const machine_config &mconfig, const char *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 84a2a037be1..ffa4c1fed63 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, std::string tag, device_t *owner, UINT32 clock); + vcs_keypad_device(const machine_config &mconfig, const char *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 4bc8a632cdb..446e57cd6a0 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, std::string tag, device_t *owner, UINT32 clock) : +vcs_lightpen_device::vcs_lightpen_device(const machine_config &mconfig, const char *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 80baf41a9c8..0aed6ac85a4 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, std::string tag, device_t *owner, UINT32 clock); + vcs_lightpen_device(const machine_config &mconfig, const char *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 b49fb6acee4..b8a4f4a6de5 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, std::string tag, device_t *owner, UINT32 clock) : +vcs_paddles_device::vcs_paddles_device(const machine_config &mconfig, const char *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 1d17b3f02a0..65ffd394fef 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, std::string tag, device_t *owner, UINT32 clock); + vcs_paddles_device(const machine_config &mconfig, const char *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 318ba47c2b4..9d1f3009596 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, std::string tag, device_t *owner, UINT32 clock) : +vcs_wheel_device::vcs_wheel_device(const machine_config &mconfig, const char *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 970cb722b75..9cb8818144e 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, std::string tag, device_t *owner, UINT32 clock); + vcs_wheel_device(const machine_config &mconfig, const char *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 47fbd9a3059..d8f2993a3be 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; const device_type VECTREX_ROM_SRAM = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +vectrex_rom64k_device::vectrex_rom64k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +vectrex_sram_device::vectrex_sram_device(const machine_config &mconfig, const char *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 65bcf94d513..453cbfed89b 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + vectrex_rom64k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + vectrex_sram_device(const machine_config &mconfig, const char *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 0669baf4356..1a9bbed7d29 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, std::string tag) +void device_vectrex_cart_interface::rom_alloc(UINT32 size, const char *tag) { if (m_rom == nullptr) { @@ -62,7 +62,7 @@ void device_vectrex_cart_interface::rom_alloc(UINT32 size, std::string tag) //------------------------------------------------- // vectrex_cart_slot_device - constructor //------------------------------------------------- -vectrex_cart_slot_device::vectrex_cart_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +vectrex_cart_slot_device::vectrex_cart_slot_device(const machine_config &mconfig, const char *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 a3e2479eb52..5a1bf306213 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + vectrex_cart_slot_device(const machine_config &mconfig, const char *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 05a16c4f757..1aa6f2e6363 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, std::string tag, device_t *owner, UINT32 clock) : +vic10_expansion_slot_device::vic10_expansion_slot_device(const machine_config &mconfig, const char *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 9ad734b5ffe..9ca71e33653 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, std::string tag, device_t *owner, UINT32 clock); + vic10_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_res_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_res.set_callback(object); } diff --git a/src/devices/bus/vic10/std.cpp b/src/devices/bus/vic10/std.cpp index dbfb2d89281..a0cd1aa67cf 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 - constructor //------------------------------------------------- -vic10_standard_cartridge_device::vic10_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vic10_standard_cartridge_device::vic10_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC10_STD, "VIC-10 Standard Cartridge", tag, owner, clock, "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 633cddf9c1e..5f7e206a166 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, std::string tag, device_t *owner, UINT32 clock); + vic10_standard_cartridge_device(const machine_config &mconfig, const char *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 d46e4348350..67901823065 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, std::string tag, device_t *owner, UINT32 clock) : +c64_4cga_device::c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C64_4CGA, "C64 Protovision 4 Player Interface", tag, owner, clock, "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 8b5a2b83c56..e95e682ae1d 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, std::string tag, device_t *owner, UINT32 clock); + c64_4cga_device(const machine_config &mconfig, const char *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 f11ec3ecd82..37761ab7d14 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, std::string tag, device_t *owner, UINT32 clock) : +vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &mconfig, const char *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 38fe4ef45a6..15d67b00e53 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, std::string tag, device_t *owner, UINT32 clock); + vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_nmi.set_callback(object); } diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp index c8e67fa9f99..9c24b0de19e 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, std::string tag, device_t *owner, UINT32 clock) : +vic20_final_expansion_3_t::vic20_final_expansion_3_t(const machine_config &mconfig, const char *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 0b478d9b95e..93669f5ace3 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, std::string tag, device_t *owner, UINT32 clock); + vic20_final_expansion_3_t(const machine_config &mconfig, const char *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 874a3718840..e92e1dbbc55 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, std::string tag, device_t *owner, UINT32 clock) +vic20_megacart_device::vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC20_MEGACART, "Mega-Cart", tag, owner, clock, "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 44bcd98293c..678ddac1cff 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, std::string tag, device_t *owner, UINT32 clock); + vic20_megacart_device(const machine_config &mconfig, const char *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 5f0e9cbf710..fe02022f2be 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 - constructor //------------------------------------------------- -vic20_standard_cartridge_device::vic20_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vic20_standard_cartridge_device::vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIC20_STD, "VIC-20 Standard Cartridge", tag, owner, clock, "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 5258f1bb685..0ea4cdec1ab 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, std::string tag, device_t *owner, UINT32 clock); + vic20_standard_cartridge_device(const machine_config &mconfig, const char *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 0ad656efc2a..5aa981edb5a 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, std::string tag, device_t *owner, UINT32 clock) +vic1010_device::vic1010_device(const machine_config &mconfig, const char *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 78cf79a5e34..a481ba9cb08 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, std::string tag, device_t *owner, UINT32 clock); + vic1010_device(const machine_config &mconfig, const char *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 7e4f655bfb8..0b0d30f97f5 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, std::string tag, device_t *owner, UINT32 clock) +vic1011_device::vic1011_device(const machine_config &mconfig, const char *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 07f5c74c750..0e5b104b0e3 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, std::string tag, device_t *owner, UINT32 clock); + vic1011_device(const machine_config &mconfig, const char *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 54a8e9975ee..c8d9acb1398 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, std::string tag, device_t *owner, UINT32 clock) +vic1110_device::vic1110_device(const machine_config &mconfig, const char *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 746ca23df77..21a4660d282 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, std::string tag, device_t *owner, UINT32 clock); + vic1110_device(const machine_config &mconfig, const char *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 bbb89ab86be..770d5639d8f 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 - constructor //------------------------------------------------- -vic1111_device::vic1111_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vic1111_device::vic1111_device(const machine_config &mconfig, const char *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 739bc262c45..83783da6878 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, std::string tag, device_t *owner, UINT32 clock); + vic1111_device(const machine_config &mconfig, const char *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 1f0c75e50f6..9ccb180aa6a 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, std::string tag, device_t *owner, UINT32 clock) +vic1112_device::vic1112_device(const machine_config &mconfig, const char *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 1acfa4b9c51..fce5971c533 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, std::string tag, device_t *owner, UINT32 clock); + vic1112_device(const machine_config &mconfig, const char *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 2430ccd5cde..5acb518cd08 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 - constructor //------------------------------------------------- -vic1210_device::vic1210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vic1210_device::vic1210_device(const machine_config &mconfig, const char *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 9b2dccafc12..90de25cddae 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, std::string tag, device_t *owner, UINT32 clock); + vic1210_device(const machine_config &mconfig, const char *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 93fd9bb77e4..2b4ac800ff3 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, std::string tag, device_t *owner, UINT32 clock) : +videobrain_expansion_slot_device::videobrain_expansion_slot_device(const machine_config &mconfig, const char *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 664a479c7d2..e431ff3f1a6 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, std::string tag, device_t *owner, UINT32 clock); + videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~videobrain_expansion_slot_device() { } template static devcb_base &set_extres_wr_callback(device_t &device, _Object object) { return downcast(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 491fb5e0a11..f5fa70bd868 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_standard_cartridge_device - constructor //------------------------------------------------- -videobrain_standard_cartridge_device::videobrain_standard_cartridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +videobrain_standard_cartridge_device::videobrain_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VB_STD, "VideoBrain standard cartridge", tag, owner, clock, "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 52f027d830a..8cde3c70db4 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, std::string tag, device_t *owner, UINT32 clock); + videobrain_standard_cartridge_device(const machine_config &mconfig, const char *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 6f3d8da12ea..196bf66db2e 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 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 a5e9646251a..59db0c4844d 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, std::string tag, device_t *owner, UINT32 clock) : +vip_expansion_slot_device::vip_expansion_slot_device(const machine_config &mconfig, const char *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 0269231eee5..8aad60fafc8 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, std::string tag, device_t *owner, UINT32 clock); + vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_int.set_callback(object); } template static devcb_base &set_dma_out_wr_callback(device_t &device, _Object object) { return downcast(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 eadcd90731b..dbf25a6a190 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, std::string tag, device_t *owner, UINT32 clock) : +vp550_device::vp550_device(const machine_config &mconfig, const char *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().c_str()); + if (LOG) logerror("VP550 '%s' Interrupt\n", tag()); 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().c_str()); + if (LOG) logerror("VP550 '%s' Clear Interrupt\n", tag()); 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().c_str(), 'A' + channel, clock2); + if (LOG) logerror("VP550 '%s' Clock %c: %u Hz\n", tag(), '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().c_str(), data & 0x0f); + if (LOG) logerror("VP550 '%s' A Volume: %u\n", tag(), 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().c_str(), data & 0x0f); + if (LOG) logerror("VP550 '%s' B Volume: %u\n", tag(), 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().c_str(), BIT(data, 0)); + if (LOG) logerror("VP550 '%s' Interrupt Enable: %u\n", tag(), 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 8590f1a2cfe..99ba25b64fd 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, std::string tag, device_t *owner, UINT32 clock); + vp550_device(const machine_config &mconfig, const char *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 5c07c4ec020..42ec4119c21 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, std::string tag, device_t *owner, UINT32 clock) : +vp570_device::vp570_device(const machine_config &mconfig, const char *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 b670591386e..745b96cff95 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, std::string tag, device_t *owner, UINT32 clock); + vp570_device(const machine_config &mconfig, const char *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 53b9c94ffa6..680a2a14369 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, std::string tag, device_t *owner, UINT32 clock) : +vp575_device::vp575_device(const machine_config &mconfig, const char *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 bb5f5417e00..a91bf188aef 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, std::string tag, device_t *owner, UINT32 clock); + vp575_device(const machine_config &mconfig, const char *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 bb61d3b1b3b..81d73634fe1 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, std::string tag, device_t *owner, UINT32 clock) : +vp585_device::vp585_device(const machine_config &mconfig, const char *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 43bec3b743c..8ae23737b64 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, std::string tag, device_t *owner, UINT32 clock); + vp585_device(const machine_config &mconfig, const char *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 6ffac4b2295..b9027a9c943 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, std::string tag, device_t *owner, UINT32 clock) : +vp590_device::vp590_device(const machine_config &mconfig, const char *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 d466524742c..fe006db8e6d 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, std::string tag, device_t *owner, UINT32 clock); + vp590_device(const machine_config &mconfig, const char *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 706c40e8262..d2ed10de18d 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, std::string tag, device_t *owner, UINT32 clock) : +vp595_device::vp595_device(const machine_config &mconfig, const char *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 e1c1e0238f5..43dcebd6d57 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, std::string tag, device_t *owner, UINT32 clock); + vp595_device(const machine_config &mconfig, const char *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 946161ee1af..42a00b37444 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, std::string tag, device_t *owner, UINT32 clock) : +vp620_device::vp620_device(const machine_config &mconfig, const char *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 4a93e01f9c4..036cf482e68 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, std::string tag, device_t *owner, UINT32 clock); + vp620_device(const machine_config &mconfig, const char *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 497d7b7c007..7d9b32536a7 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, std::string tag, device_t *owner, UINT32 clock) : +vp700_device::vp700_device(const machine_config &mconfig, const char *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 6dce3cce8b4..2631dc01c62 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, std::string tag, device_t *owner, UINT32 clock); + vp700_device(const machine_config &mconfig, const char *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 cd86b4a5404..55671583558 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 - constructor //------------------------------------------------- -ioexp_slot_device::ioexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +ioexp_slot_device::ioexp_slot_device(const machine_config &mconfig, const char *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 0e25112d44b..c8ec78042d6 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, std::string tag, device_t *owner, UINT32 clock); + ioexp_slot_device(const machine_config &mconfig, const char *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 ef3f54ad75a..38e9732d17a 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, std::string tag, device_t *owner, UINT32 clock) : +joystick_interface_device::joystick_interface_device(const machine_config &mconfig, const char *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 749d0139d0b..1575dde42f2 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, std::string tag, device_t *owner, UINT32 clock); + joystick_interface_device(const machine_config &mconfig, const char *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 0cb07224de1..a122c9fa2c7 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, std::string tag, device_t *owner, UINT32 clock) : +printer_interface_device::printer_interface_device(const machine_config &mconfig, const char *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 5eb3fdc407c..0f2b8746400 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, std::string tag, device_t *owner, UINT32 clock); + printer_interface_device(const machine_config &mconfig, const char *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 87df52bf591..afe88fce06a 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, std::string tag, device_t *owner, UINT32 clock) : +floppy_controller_device::floppy_controller_device(const machine_config &mconfig, const char *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 f60e8681891..7b01c742d07 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, std::string tag, device_t *owner, UINT32 clock); + floppy_controller_device(const machine_config &mconfig, const char *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 45c21d37fdb..5b547103645 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 - constructor //------------------------------------------------- -memexp_slot_device::memexp_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +memexp_slot_device::memexp_slot_device(const machine_config &mconfig, const char *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 4586d88c953..9085c2ce6cb 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, std::string tag, device_t *owner, UINT32 clock); + memexp_slot_device(const machine_config &mconfig, const char *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 47e2f001ee3..5b4b9d71701 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; // laser110_16k_device - constructor //------------------------------------------------- -laser110_16k_device::laser110_16k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +laser110_16k_device::laser110_16k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +laser210_16k_device::laser210_16k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +laser310_16k_device::laser310_16k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +laser_64k_device::laser_64k_device(const machine_config &mconfig, const char *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 5955e75d0c1..87518d20123 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, std::string tag, device_t *owner, UINT32 clock); + laser110_16k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + laser210_16k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + laser310_16k_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + laser_64k_device(const machine_config &mconfig, const char *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 94e83a3288b..42e281151b1 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, std::string tag, device_t *owner, UINT32 clock) : +rs232_interface_device::rs232_interface_device(const machine_config &mconfig, const char *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 a37d2bb023f..20508d86469 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, std::string tag, device_t *owner, UINT32 clock); + rs232_interface_device(const machine_config &mconfig, const char *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 617758529e6..1a038bcf0ac 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, std::string tag, device_t *owner, UINT32 clock) : +wordpro_device::wordpro_device(const machine_config &mconfig, const char *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 0b8e64c5b25..79e78735cd4 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, std::string tag, device_t *owner, UINT32 clock); + wordpro_device(const machine_config &mconfig, const char *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 32d5d7e4b21..43e1176e04c 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 - constructor //------------------------------------------------- -wangpc_emb_device::wangpc_emb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +wangpc_emb_device::wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_EMB, "Wang PC-PM031-B", tag, owner, clock, "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 ecb8b92beb4..f40f7fe4e1c 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, std::string tag, device_t *owner, UINT32 clock); + wangpc_emb_device(const machine_config &mconfig, const char *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 77b1d45875c..cebc359a942 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, std::string tag, device_t *owner, UINT32 clock) : +wangpc_lic_device::wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_LIC, "Wang PC-PM070", tag, owner, clock, "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 48a4730a9de..98f9f83fd3a 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, std::string tag, device_t *owner, UINT32 clock); + wangpc_lic_device(const machine_config &mconfig, const char *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 dd1a878fa03..7f7e0ebe25b 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, std::string tag, device_t *owner, UINT32 clock) : +wangpc_lvc_device::wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_LVC, "Wang PC Low Resolution Video Card", tag, owner, clock, "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 a6e6f0110c3..ada6f261fd3 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, std::string tag, device_t *owner, UINT32 clock); + wangpc_lvc_device(const machine_config &mconfig, const char *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 5fb915c13f6..37bd21dda25 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, std::string tag, device_t *owner, UINT32 clock) : +wangpc_mcc_device::wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_MCC, "Wang PC-PM043", tag, owner, clock, "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 db0197dae07..54b0b868e45 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, std::string tag, device_t *owner, UINT32 clock); + wangpc_mcc_device(const machine_config &mconfig, const char *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 eec60b34aca..ac5b09a0466 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, std::string tag, device_t *owner, UINT32 clock) : +wangpc_mvc_device::wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_MVC, "Wang PC Medium Resolution Video Card", tag, owner, clock, "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 6c98e597c06..eed98d499f0 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, std::string tag, device_t *owner, UINT32 clock); + wangpc_mvc_device(const machine_config &mconfig, const char *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 dc818577423..f8a436af0c8 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, std::string tag, device_t *owner, UINT32 clock) : +wangpc_rtc_device::wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_RTC, "Wang PC-PM040-B", tag, owner, clock, "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 9753ad4ef72..f59de8c8139 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, std::string tag, device_t *owner, UINT32 clock); + wangpc_rtc_device(const machine_config &mconfig, const char *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 8682d6273a3..efadfc332dc 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, std::string tag, device_t *owner, UINT32 clock) : +wangpc_tig_device::wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_TIG, "Wang PC TIG Controller", tag, owner, clock, "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 353076a7808..8f9f8f9a5eb 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, std::string tag, device_t *owner, UINT32 clock); + wangpc_tig_device(const machine_config &mconfig, const char *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 997d77c31a0..d3aebaf1fac 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 - constructor //------------------------------------------------- -wangpcbus_slot_device::wangpcbus_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +wangpcbus_slot_device::wangpcbus_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +wangpcbus_device::wangpcbus_device(const machine_config &mconfig, const char *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 d43a58f6743..e892cc3b880 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, std::string tag, device_t *owner, UINT32 clock); + wangpcbus_slot_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~wangpcbus_device() { m_device_list.detach_all(); } template static devcb_base &set_irq2_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq2.set_callback(object); } diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp index 319640cdeb6..7b2dafdd5f9 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, std::string tag, device_t *owner, UINT32 clock) : +wangpc_wdc_device::wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_WDC, "Wang PC-PM001", tag, owner, clock, "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 8c871f85e20..fd8edbcbfdf 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, std::string tag, device_t *owner, UINT32 clock); + wangpc_wdc_device(const machine_config &mconfig, const char *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 b0c6ddf787e..fbfab9272e4 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; const device_type WS_ROM_EEPROM = &device_creator; -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) +ws_rom_device::ws_rom_device(const machine_config &mconfig, const char *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, std::string tag, dev { } -ws_rom_sram_device::ws_rom_sram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ws_rom_sram_device::ws_rom_sram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ws_rom_eeprom_device::ws_rom_eeprom_device(const machine_config &mconfig, const char *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 0d3bbc3a6e8..e3a15550e73 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + ws_rom_sram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ws_rom_eeprom_device(const machine_config &mconfig, const char *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 662f27bd1e0..b5b95851f00 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, std::string tag) +void device_ws_cart_interface::rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock) : +ws_cart_slot_device::ws_cart_slot_device(const machine_config &mconfig, const char *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 e436e4d87f4..ae5ab7d81d6 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, std::string tag); + void rom_alloc(UINT32 size, const char *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, std::string tag, device_t *owner, UINT32 clock); + ws_cart_slot_device(const machine_config &mconfig, const char *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 393a4f75709..1b97427be3e 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, std::string tag, device_t *owner, UINT32 clock) +x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, X68K_NEPTUNEX, "Neptune-X", tag, owner, clock, "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 cff4150dd83..6700f1bea3b 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, std::string tag, device_t *owner, UINT32 clock); + x68k_neptune_device(const machine_config &mconfig, const char *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 fec17636469..fce3c4a89ca 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, std::string tag, device_t *owner, UINT32 clock) +x68k_scsiext_device::x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, X68K_SCSIEXT, "Sharp CZ-6BS1 SCSI-1", tag, owner, clock, "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 57e79f23a6b..7cd45c2c6da 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, std::string tag, device_t *owner, UINT32 clock); + x68k_scsiext_device(const machine_config &mconfig, const char *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 2cb1c3e5b57..39f1f74eec9 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, std::string tag, device_t *owner, UINT32 clock) : +x68k_expansion_slot_device::x68k_expansion_slot_device(const machine_config &mconfig, const char *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 14aa34fdcf4..b3a07242180 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, std::string tag, device_t *owner, UINT32 clock); + x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~x68k_expansion_slot_device(); template static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast(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 2980b814745..0793f126c18 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, std::string tag, device_t *owner, UINT32 clock) +z88_1024k_flash_device::z88_1024k_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, Z88_1024K_FLASH, "Z88 1024KB Flash", tag, owner, clock, "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 93c0a5a132f..37fe76e2f99 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, std::string tag, device_t *owner, UINT32 clock); + z88_1024k_flash_device(const machine_config &mconfig, const char *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 5a534e6564d..b9c8cc6cea7 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_32k_ram_device - constructor //------------------------------------------------- -z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, Z88_32K_RAM, "Z88 32KB RAM", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_z88cart_interface( mconfig, *this ), 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, std::string tag, device_t *owner, UINT32 clock) +z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : z88_32k_ram_device(mconfig, Z88_128K_RAM, "Z88 128KB RAM", tag, owner, clock, "z88_128k_ram", __FILE__) { } @@ -57,7 +57,7 @@ z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, std::str // z88_512k_ram_device - constructor //------------------------------------------------- -z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : z88_32k_ram_device(mconfig, Z88_512K_RAM, "Z88 512KB RAM", tag, owner, clock, "z88_512k_ram", __FILE__) { } @@ -66,7 +66,7 @@ z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, std::str // z88_1024k_ram_device - constructor //------------------------------------------------- -z88_1024k_ram_device::z88_1024k_ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +z88_1024k_ram_device::z88_1024k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : z88_32k_ram_device(mconfig, Z88_1024K_RAM, "Z88 1024KB RAM", tag, owner, clock, "z88_1024k_ram", __FILE__) { } @@ -78,7 +78,7 @@ z88_1024k_ram_device::z88_1024k_ram_device(const machine_config &mconfig, std::s void z88_32k_ram_device::device_start() { - m_ram = machine().memory().region_alloc(tag().c_str(), get_cart_size(), 1, ENDIANNESS_LITTLE)->base(); + m_ram = machine().memory().region_alloc(tag(), 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 b02630b67dc..d8515a6b9c0 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + z88_128k_ram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + z88_512k_ram_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + z88_1024k_ram_device(const machine_config &mconfig, const char *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 aab89859be2..08f14011c9d 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_32k_rom_device - constructor //------------------------------------------------- -z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, Z88_32K_ROM, "Z88 32KB ROM", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_z88cart_interface( mconfig, *this ), 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, std::string tag, device_t *owner, UINT32 clock) +z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : z88_32k_rom_device(mconfig, Z88_128K_ROM, "Z88 128KB ROM", tag, owner, clock, "z88_128k_rom", __FILE__) { } @@ -56,7 +56,7 @@ z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, std::str // z88_256k_rom_device - constructor //------------------------------------------------- -z88_256k_rom_device::z88_256k_rom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +z88_256k_rom_device::z88_256k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : z88_32k_rom_device(mconfig, Z88_256K_ROM, "Z88 256KB ROM", tag, owner, clock, "z88_256k_rom", __FILE__) { } @@ -67,7 +67,7 @@ z88_256k_rom_device::z88_256k_rom_device(const machine_config &mconfig, std::str void z88_32k_rom_device::device_start() { - m_rom = machine().memory().region_alloc(tag().c_str(), get_cart_size(), 1, ENDIANNESS_LITTLE)->base(); + m_rom = machine().memory().region_alloc(tag(), get_cart_size(), 1, ENDIANNESS_LITTLE)->base(); } /*------------------------------------------------- diff --git a/src/devices/bus/z88/rom.h b/src/devices/bus/z88/rom.h index 696ee31f41c..8ebc4da3bc8 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + z88_128k_rom_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + z88_256k_rom_device(const machine_config &mconfig, const char *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 6c00235c4c7..7af6b781369 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, std::string tag, device_t *owner, UINT32 clock) : +z88cart_slot_device::z88cart_slot_device(const machine_config &mconfig, const char *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 568240ca6b7..0c39edd5e24 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, std::string tag, device_t *owner, UINT32 clock); + z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~z88cart_slot_device(); template static devcb_base &set_out_flp_callback(device_t &device, _Object object) { return downcast(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 7fee318615c..a18f4d50c73 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +n8x300_cpu_device::n8x300_cpu_device(const machine_config &mconfig, const char *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 27686d0f993..dd236372e5d 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, std::string tag, device_t *owner, UINT32 clock); + n8x300_cpu_device(const machine_config &mconfig, const char *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 c55257331f2..63788892288 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; // adsp21xx_device - constructor //------------------------------------------------- -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +adsp2100_device::adsp2100_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +adsp2101_device::adsp2101_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +adsp2104_device::adsp2104_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +adsp2105_device::adsp2105_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +adsp2115_device::adsp2115_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +adsp2181_device::adsp2181_device(const machine_config &mconfig, const char *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 6fc3a295e13..f2393f986d2 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + adsp2100_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + adsp2101_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + adsp2181_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + adsp2104_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class adsp2105_device : public adsp2101_device { public: - adsp2105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + adsp2105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class adsp2115_device : public adsp2101_device { public: - adsp2115_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + adsp2115_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/alph8201/alph8201.cpp b/src/devices/cpu/alph8201/alph8201.cpp index 81756a1c334..9c40d8d55ee 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; #define FN(x) &alpha8201_cpu_device::x -alpha8201_cpu_device::alpha8201_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +alpha8201_cpu_device::alpha8201_cpu_device(const machine_config &mconfig, const char *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, std::s } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +alpha8301_cpu_device::alpha8301_cpu_device(const machine_config &mconfig, const char *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 8a234a9b12c..22130bc5464 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + alpha8301_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/alto2/alto2cpu.cpp b/src/devices/cpu/alto2/alto2cpu.cpp index aea00a6bd89..a3538dee290 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, std::string tag, device_t* owner, UINT32 clock) : +alto2_cpu_device::alto2_cpu_device(const machine_config& mconfig, const char* 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 cfa59bc4a0e..071cbd3cb2a 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, std::string tag, device_t *owner, UINT32 clock); + alto2_cpu_device(const machine_config &mconfig, const char *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 b70ccc31a09..a31dc3b0374 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; STATE ACCESSORS ***************************************************************************/ -am29000_cpu_device::am29000_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +am29000_cpu_device::am29000_cpu_device(const machine_config &mconfig, const char *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 7c35578b74f..4f0c1a1a4af 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, std::string tag, device_t *owner, UINT32 clock); + am29000_cpu_device(const machine_config &mconfig, const char *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 dfd246e9053..57ed4d99578 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, std::string tag, device_t *owner, UINT32 clock) +amis2000_cpu_device::amis2000_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +amis2150_cpu_device::amis2150_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +amis2152_cpu_device::amis2152_cpu_device(const machine_config &mconfig, const char *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 95eea213f41..5beee90fae9 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, 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) + 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) : 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, std::string tag, device_t *owner, UINT32 clock); + amis2000_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class amis2150_cpu_device : public amis2000_base_device { public: - amis2150_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + amis2150_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class amis2152_cpu_device : public amis2000_base_device { public: - amis2152_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + amis2152_cpu_device(const machine_config &mconfig, const char *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 44e5ca93696..3a172590bf3 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().c_str(), m_op, m_pc); + logerror("%s unknown opcode $%02X at $%04X\n", tag(), 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().c_str(), m_op, m_pc); + logerror("%s unknown opcode $%02X at $%04X\n", tag(), 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().c_str(), m_op, m_pc); + logerror("%s unknown opcode $%02X at $%04X\n", tag(), 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 0d994129583..87c5ff9a351 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; #define DELAY(n) {m_icount -= (n); m_current_word = (m_current_word + (n)) & 0x1f;} -apexc_cpu_device::apexc_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +apexc_cpu_device::apexc_cpu_device(const machine_config &mconfig, const char *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 2d384538d4f..ad07fba71c6 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, std::string tag, device_t *owner, UINT32 clock); + apexc_cpu_device(const machine_config &mconfig, const char *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 bfb0664204d..e38d853f9be 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +arc_device::arc_device(const machine_config &mconfig, const char *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 5b9c053e5d5..5b9302cc99f 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, std::string tag, device_t *owner, UINT32 clock); + arc_device(const machine_config &mconfig, const char *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 e5fd233e108..7c56a774601 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, std::string tag, device_t *owner, UINT32 clock) +arcompact_device::arcompact_device(const machine_config &mconfig, const char *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 87d379dd353..a6d10528040 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, std::string tag, device_t *owner, UINT32 clock); + arcompact_device(const machine_config &mconfig, const char *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 591253c5087..41724668f53 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; const device_type ARM_BE = &device_creator; -arm_cpu_device::arm_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +arm_cpu_device::arm_cpu_device(const machine_config &mconfig, const char *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, std::string tag, d } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +arm_be_cpu_device::arm_be_cpu_device(const machine_config &mconfig, const char *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 947dc8a8e5f..d2f6156127b 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, 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); + 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); static void set_copro_type(device_t &device, int type) { downcast(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, std::string tag, device_t *owner, UINT32 clock); + arm_be_cpu_device(const machine_config &mconfig, const char *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 aacf55983f8..828f8562811 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; const device_type SA1110 = &device_creator; -arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, const char *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, std::string tag, } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +arm7_be_cpu_device::arm7_be_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +arm7500_cpu_device::arm7500_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +arm9_cpu_device::arm9_cpu_device(const machine_config &mconfig, const char *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, std::string tag, } -arm920t_cpu_device::arm920t_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +arm920t_cpu_device::arm920t_cpu_device(const machine_config &mconfig, const char *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, std::strin } -pxa255_cpu_device::pxa255_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pxa255_cpu_device::pxa255_cpu_device(const machine_config &mconfig, const char *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, std::string } -sa1110_cpu_device::sa1110_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sa1110_cpu_device::sa1110_cpu_device(const machine_config &mconfig, const char *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 c1301741acb..24ab02f2b86 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + arm7_be_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + arm7500_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + arm9_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + arm920t_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pxa255_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sa1110_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/arm7/lpc210x.cpp b/src/devices/cpu/arm7/lpc210x.cpp index 1143619c067..1d6acac4c79 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, std::string tag, device_t *owner, UINT32 clock) +lpc210x_device::lpc210x_device(const machine_config &mconfig, const char *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 f948ba68e21..1d083f39dbc 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, std::string tag, device_t *owner, UINT32); + lpc210x_device(const machine_config &mconfig, const char *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 5b3b40225d7..c22d0cdcee2 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 - constructor //------------------------------------------------- -asap_device::asap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +asap_device::asap_device(const machine_config &mconfig, const char *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 9e2d97c3901..87d11282072 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, std::string tag, device_t *owner, UINT32 clock); + asap_device(const machine_config &mconfig, const char *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 590b058aa01..756562f0ea7 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, std::string tag, device_t *owner, UINT32 clock) +atmega88_device::atmega88_device(const machine_config &mconfig, const char *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, std::string tag, // atmega644_device - constructor //------------------------------------------------- -atmega644_device::atmega644_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atmega644_device::atmega644_device(const machine_config &mconfig, const char *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, std::string ta // atmega1280_device - constructor //------------------------------------------------- -atmega1280_device::atmega1280_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atmega1280_device::atmega1280_device(const machine_config &mconfig, const char *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, std::string // atmega2560_device - constructor //------------------------------------------------- -atmega2560_device::atmega2560_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atmega2560_device::atmega2560_device(const machine_config &mconfig, const char *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,12 +632,13 @@ atmega2560_device::atmega2560_device(const machine_config &mconfig, std::string // avr8_device - constructor //------------------------------------------------- -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) +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) : 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 089202fa1ac..86207566ffc 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, std::string tag) { downcast(device).m_eeprom_tag = tag; } + static void set_eeprom_tag(device_t &device, const char *tag) { downcast(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, 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); + 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); // 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; - std::string m_eeprom_tag; + const char *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, std::string tag, device_t *owner, UINT32 clock); + atmega88_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + atmega644_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + atmega1280_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + atmega2560_device(const machine_config &mconfig, const char *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 2449cb66e72..bde43753786 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, std::string tag, device_t *owner, UINT32 clock) +ccpu_cpu_device::ccpu_cpu_device(const machine_config &mconfig, const char *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 206ef185ca7..9247e54f16d 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, std::string tag, device_t *owner, UINT32 clock); + ccpu_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_external_func(device_t &device, _Object object) { return downcast(device).m_external_input.set_callback(object); } diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp index f4d3453cb85..ae14bd59cab 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, 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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +cop401_cpu_device::cop401_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cop410_cpu_device::cop410_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cop411_cpu_device::cop411_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cop402_cpu_device::cop402_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cop420_cpu_device::cop420_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cop421_cpu_device::cop421_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cop422_cpu_device::cop422_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cop404_cpu_device::cop404_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cop424_cpu_device::cop424_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cop425_cpu_device::cop425_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cop426_cpu_device::cop426_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cop444_cpu_device::cop444_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cop445_cpu_device::cop445_cpu_device(const machine_config &mconfig, const char *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 a647bbea107..43e7755f1f4 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + cop401_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cop410_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cop411_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cop402_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cop420_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cop421_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cop422_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cop404_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cop424_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cop425_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cop426_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cop444_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cop445_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/cosmac/cosmac.cpp b/src/devices/cpu/cosmac/cosmac.cpp index c4cd2ff04d9..d8e3d52c6fd 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; // cosmac_device - constructor //------------------------------------------------- -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +cdp1801_device::cdp1801_device(const machine_config &mconfig, const char *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, std::string tag, d // cdp1802_device - constructor //------------------------------------------------- -cdp1802_device::cdp1802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cdp1802_device::cdp1802_device(const machine_config &mconfig, const char *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().c_str()); + logerror("COSMAC '%s' Tried to initiate RUN mode from LOAD mode\n", tag()); m_mode = COSMAC_MODE_LOAD; break; diff --git a/src/devices/cpu/cosmac/cosmac.h b/src/devices/cpu/cosmac/cosmac.h index 6695a62dd8e..31b1d8dc11c 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); template static devcb_base &set_wait_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_wait.set_callback(object); } template static devcb_base &set_clear_rd_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + cdp1801_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cdp1802_device(const machine_config &mconfig, const char *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 ee55564bc1d..a05bbbc0d49 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, std::string tag, device_t *owner, UINT32 clock) +cp1610_cpu_device::cp1610_cpu_device(const machine_config &mconfig, const char *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 7c245351e87..84611f75a2c 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, std::string _tag, device_t *_owner, UINT32 _clock); + cp1610_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); template void set_bext_callback(_read rd) { diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp index ce3a3166469..a657a23680e 100644 --- a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp +++ b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp @@ -75,10 +75,11 @@ const device_type CQUESTROT = &device_creator; const device_type CQUESTLIN = &device_creator; -cquestsnd_cpu_device::cquestsnd_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cquestsnd_cpu_device::cquestsnd_cpu_device(const machine_config &mconfig, const char *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) { } @@ -90,7 +91,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, std::string tag, device_t *owner, UINT32 clock) +cquestrot_cpu_device::cquestrot_cpu_device(const machine_config &mconfig, const char *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) @@ -111,7 +112,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, std::string tag, device_t *owner, UINT32 clock) +cquestlin_cpu_device::cquestlin_cpu_device(const machine_config &mconfig, const char *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) @@ -167,7 +168,7 @@ READ16_MEMBER( cquestrot_cpu_device::rotram_r ) void cquestsnd_cpu_device::device_start() { m_dac_w.resolve_safe(); - assert(!m_sound_region_tag.empty()); + assert(m_sound_region_tag != nullptr); 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 c40357e5ddb..23bfbf84f5b 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, std::string tag, device_t *owner, UINT32 clock); + cquestsnd_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_dac_w(device_t &device, _Object object) { return downcast(device).m_dac_w.set_callback(object); } - static void set_sound_region(device_t &device, std::string tag) { downcast(device).m_sound_region_tag = tag; } + static void set_sound_region(device_t &device, const char *tag) { downcast(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; - std::string m_sound_region_tag; + const char *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, std::string tag, device_t *owner, UINT32 clock); + cquestrot_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_linedata_w(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + cquestlin_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_linedata_r(device_t &device, _Object object) { return downcast(device).m_linedata_r.set_callback(object); } diff --git a/src/devices/cpu/dsp16/dsp16.cpp b/src/devices/cpu/dsp16/dsp16.cpp index 8816103c4d3..8b97ce4c064 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 - constructor //------------------------------------------------- -dsp16_device::dsp16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dsp16_device::dsp16_device(const machine_config &mconfig, const char *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 d49577b53ca..6e509da0569 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, std::string tag, device_t *owner, UINT32 clock); + dsp16_device(const machine_config &mconfig, const char *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 bffe017ba69..f060e81d13c 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 - constructor //------------------------------------------------- -dsp32c_device::dsp32c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dsp32c_device::dsp32c_device(const machine_config &mconfig, const char *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 3578f50e59d..b83888b7a6a 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, std::string tag, device_t *owner, UINT32 clock); + dsp32c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_output_pins_callback(device_t &device, _Object object) { return downcast(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 d96528478be..7c4b7abd163 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, std::string tag, device_t *owner, UINT32 clock) +dsp56k_device::dsp56k_device(const machine_config &mconfig, const char *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 b065beba03a..185b52dc033 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, std::string _tag, device_t *_owner, UINT32 _clock); + dsp56k_device(const machine_config &mconfig, const char *_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 52fc294749b..637f7b6e067 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(std::string tag) +int dsp56k_get_irq_index_by_tag(const char* tag) { int i; for (i = 0; i < 32; i++) { - if (strcmp(tag.c_str(), dsp56k_interrupt_sources[i].irq_source) == 0) + if (strcmp(tag, dsp56k_interrupt_sources[i].irq_source) == 0) { return i; } } - fatalerror("DSP56K ERROR : IRQ TAG specified incorrectly (get_vector_by_tag) : %s.\n", tag.c_str()); + fatalerror("DSP56K ERROR : IRQ TAG specified incorrectly (get_vector_by_tag) : %s.\n", tag); // never executed //return -1; } diff --git a/src/devices/cpu/dsp56k/dsp56pcu.h b/src/devices/cpu/dsp56k/dsp56pcu.h index 710f5ef792c..b3b83109a35 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(std::string tag); +int dsp56k_get_irq_index_by_tag(const char* 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 398b384596e..0b87b9eaa7d 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().c_str(), m_op, m_prev_pc); + logerror("%s unknown opcode $%03X at $%04X\n", tag(), m_op, m_prev_pc); break; } // 0xff0 diff --git a/src/devices/cpu/e0c6200/e0c6200.h b/src/devices/cpu/e0c6200/e0c6200.h index 62c2f8dced7..7e47f817380 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, std::string 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, const char *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 0834c34bf3a..4dc37fa11fe 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, std::string tag, device_t *owner, UINT32 clock) +e0c6s46_device::e0c6s46_device(const machine_config &mconfig, const char *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().c_str()); + logerror("%s watchdog reset\n", tag()); 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().c_str(), offset, m_prev_pc); + logerror("%s unknown io_r from $0F%02X at $%04X\n", tag(), 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().c_str(), m_prev_pc); + logerror("%s io_w selected OSC3! PC=$%04X\n", tag(), 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().c_str(), m_prev_pc); + logerror("%s io_w enabled envelope, PC=$%04X\n", tag(), 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().c_str(), data, offset, m_prev_pc); + logerror("%s unknown io_w $%X to $0F%02X at $%04X\n", tag(), data, offset, m_prev_pc); break; } } diff --git a/src/devices/cpu/e0c6200/e0c6s46.h b/src/devices/cpu/e0c6200/e0c6s46.h index 56c5b736649..692f2332cd5 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, std::string tag, device_t *owner, UINT32 clock); + e0c6s46_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_write_r0_callback(device_t &device, _Object object) { return downcast(device).m_write_r0.set_callback(object); } diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp index 961a16f3809..afa0da8d962 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, std::string tag, device_t *owner, UINT32 clock, +hyperstone_device::hyperstone_device(const machine_config &mconfig, const char *name, const char *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, std::string tag, device_t *owner, UINT32 clock) +e116t_device::e116t_device(const machine_config &mconfig, const char *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, std::string tag, devic // e116xt_device - constructor //------------------------------------------------- -e116xt_device::e116xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e116xt_device::e116xt_device(const machine_config &mconfig, const char *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, std::string tag, dev // e116xs_device - constructor //------------------------------------------------- -e116xs_device::e116xs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e116xs_device::e116xs_device(const machine_config &mconfig, const char *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, std::string tag, dev // e116xsr_device - constructor //------------------------------------------------- -e116xsr_device::e116xsr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e116xsr_device::e116xsr_device(const machine_config &mconfig, const char *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, std::string tag, d // e132n_device - constructor //------------------------------------------------- -e132n_device::e132n_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e132n_device::e132n_device(const machine_config &mconfig, const char *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, std::string tag, devic // e132t_device - constructor //------------------------------------------------- -e132t_device::e132t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e132t_device::e132t_device(const machine_config &mconfig, const char *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, std::string tag, devic // e132xn_device - constructor //------------------------------------------------- -e132xn_device::e132xn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e132xn_device::e132xn_device(const machine_config &mconfig, const char *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, std::string tag, dev // e132xt_device - constructor //------------------------------------------------- -e132xt_device::e132xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e132xt_device::e132xt_device(const machine_config &mconfig, const char *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, std::string tag, dev // e132xs_device - constructor //------------------------------------------------- -e132xs_device::e132xs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e132xs_device::e132xs_device(const machine_config &mconfig, const char *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, std::string tag, dev // e132xsr_device - constructor //------------------------------------------------- -e132xsr_device::e132xsr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e132xsr_device::e132xsr_device(const machine_config &mconfig, const char *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, std::string tag, d // gms30c2116_device - constructor //------------------------------------------------- -gms30c2116_device::gms30c2116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gms30c2116_device::gms30c2116_device(const machine_config &mconfig, const char *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, std::string // gms30c2132_device - constructor //------------------------------------------------- -gms30c2132_device::gms30c2132_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gms30c2132_device::gms30c2132_device(const machine_config &mconfig, const char *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, std::string // gms30c2216_device - constructor //------------------------------------------------- -gms30c2216_device::gms30c2216_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gms30c2216_device::gms30c2216_device(const machine_config &mconfig, const char *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, std::string // gms30c2232_device - constructor //------------------------------------------------- -gms30c2232_device::gms30c2232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gms30c2232_device::gms30c2232_device(const machine_config &mconfig, const char *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 75291e1b0f1..28149e1a742 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, std::string tag, device_t *owner, UINT32 clock, + hyperstone_device(const machine_config &mconfig, const char *name, const char *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, std::string tag, device_t *owner, UINT32 clock); + e116t_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + e116xt_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + e116xs_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + e116xsr_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + e132n_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + e132t_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + e132xn_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + e132xt_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + e132xs_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + e132xsr_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gms30c2116_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gms30c2132_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gms30c2216_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + gms30c2232_device(const machine_config &mconfig, const char *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 cc57acedfae..17a73204f09 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, std::string tag, device_t *owner, UINT32 clock) +es5510_device::es5510_device(const machine_config &mconfig, const char *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 2fe3c05dfe8..7cc2d7fba7e 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, std::string tag, device_t *owner, UINT32 clock); + es5510_device(const machine_config &mconfig, const char *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 28923a622eb..a788c2a3ab3 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 - constructor //------------------------------------------------- -esrip_device::esrip_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +esrip_device::esrip_device(const machine_config &mconfig, const char *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 7115fa69270..852ce65533e 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, std::string tag, device_t *owner, UINT32 clock); + esrip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers template static devcb_base &static_set_fdt_r_callback(device_t &device, _Object object) { return downcast(device).m_fdt_r.set_callback(object); } diff --git a/src/devices/cpu/f8/f8.cpp b/src/devices/cpu/f8/f8.cpp index f75b0dcf423..2bc875e12ee 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +f8_cpu_device::f8_cpu_device(const machine_config &mconfig, const char *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 dbe63976b83..8afddae22bd 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, std::string tag, device_t *owner, UINT32 clock); + f8_cpu_device(const machine_config &mconfig, const char *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 5aad79b391c..47b0e035798 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; const device_type _5A22 = &device_creator<_5a22_device>; -g65816_device::g65816_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +g65816_device::g65816_device(const machine_config &mconfig, const char *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, std::string tag, dev } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +_5a22_device::_5a22_device(const machine_config &mconfig, const char *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 33df92d71a8..c04b9adf71c 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + _5a22_device(const machine_config &mconfig, const char *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 0b6431dff92..ec0b62b5076 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 - constructor //------------------------------------------------- -h6280_device::h6280_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +h6280_device::h6280_device(const machine_config &mconfig, const char *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 f9b793b8c21..ecf93dee843 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, std::string tag, device_t *owner, UINT32 clock); + h6280_device(const machine_config &mconfig, const char *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 302c466cbd3..bc78626b00b 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, std::string 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, const char *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().c_str(), PPC); + throw emu_fatalerror("%s: Illegal instruction at address %x\n", tag(), PPC); } int h8_device::trace_setup() { - throw emu_fatalerror("%s: Trace setup called but unimplemented.\n", tag().c_str()); + throw emu_fatalerror("%s: Trace setup called but unimplemented.\n", tag()); } int h8_device::trapa_setup() { - throw emu_fatalerror("%s: Trapa setup called but unimplemented.\n", tag().c_str()); + throw emu_fatalerror("%s: Trapa setup called but unimplemented.\n", tag()); } 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 26087de3314..8ed2bee2796 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, std::string 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, const char *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 74b0a925144..96fc201dfab 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h83002_device::h83002_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: syscr = %02x\n", tag(), data); } diff --git a/src/devices/cpu/h8/h83002.h b/src/devices/cpu/h8/h83002.h index 0946aca20e0..860aee68ccc 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, std::string tag, device_t *owner, UINT32 clock); + h83002_device(const machine_config &mconfig, const char *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 2ccbdfe08fb..431d257a4b4 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; const device_type H83007 = &device_creator; -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) : +h83006_device::h83006_device(const machine_config &mconfig, const char *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, std::string tag, dev } -h83007_device::h83007_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h83007_device::h83007_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: syscr = %02x\n", tag(), data); } diff --git a/src/devices/cpu/h8/h83006.h b/src/devices/cpu/h8/h83006.h index 576c3a45273..bb2fe644a47 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + h83007_device(const machine_config &mconfig, const char *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 85f0cf0e20f..33b49317a89 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h83008_device::h83008_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: syscr = %02x\n", tag(), data); } diff --git a/src/devices/cpu/h8/h83008.h b/src/devices/cpu/h8/h83008.h index 49d794f84a1..8a19568f43f 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, std::string tag, device_t *owner, UINT32 clock); + h83008_device(const machine_config &mconfig, const char *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 fd37a324fe6..0cad91b1d72 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; const device_type H83047 = &device_creator; const device_type H83048 = &device_creator; -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) : +h83048_device::h83048_device(const machine_config &mconfig, const char *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, std::string tag, dev ram_start = 0xffef10; } -h83044_device::h83044_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h83044_device::h83044_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h83045_device::h83045_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h83047_device::h83047_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: syscr = %02x\n", tag(), data); } diff --git a/src/devices/cpu/h8/h83048.h b/src/devices/cpu/h8/h83048.h index bf7e02848d1..e29af57fb3e 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + h83044_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h83045_device : public h83048_device { public: - h83045_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h83045_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h83047_device : public h83048_device { public: - h83047_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h83047_device(const machine_config &mconfig, const char *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 64b3608ebf7..dc0e4c50bb2 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; const device_type H83337 = &device_creator; -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) : +h83337_device::h83337_device(const machine_config &mconfig, const char *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, std::string tag, dev ram_start = 0xf780; } -h83334_device::h83334_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h83334_device::h83334_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h83336_device::h83336_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: syscr = %02x\n", tag(), 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().c_str(), data); + logerror("%s: wscr = %02x\n", tag(), 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().c_str(), data); + logerror("%s: stcr = %02x\n", tag(), 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().c_str(), data); + logerror("%s: mdcr = %02x\n", tag(), data); } diff --git a/src/devices/cpu/h8/h83337.h b/src/devices/cpu/h8/h83337.h index 87cef30e2a0..9ece1765979 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + h83334_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h83336_device : public h83337_device { public: - h83336_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h83336_device(const machine_config &mconfig, const char *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 cb028de02f0..7e76bf28114 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; const device_type H8_ADC_2357 = &device_creator; const device_type H8_ADC_2655 = &device_creator; -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) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - 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), + 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), 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(std::string _intc_tag, int _intc_vector) +void h8_adc_device::set_info(const char *_intc_tag, int _intc_vector) { intc_tag = _intc_tag; intc_vector = _intc_vector; @@ -27,31 +27,31 @@ void h8_adc_device::set_info(std::string _intc_tag, int _intc_vector) READ8_MEMBER(h8_adc_device::addr8_r) { - logerror("%s: addr8_r %d %03x\n", tag().c_str(), offset, addr[offset >> 1]); + logerror("%s: addr8_r %d %03x\n", tag(), 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().c_str(), offset, addr[offset]); + logerror("%s: addr16_r %d %03x\n", tag(), offset, addr[offset]); return addr[offset]; } READ8_MEMBER(h8_adc_device::adcsr_r) { - logerror("%s: adcsr_r %02x\n", tag().c_str(), adcsr); + logerror("%s: adcsr_r %02x\n", tag(), adcsr); return adcsr; } READ8_MEMBER(h8_adc_device::adcr_r) { - logerror("%s: adcr_r %02x\n", tag().c_str(), adcr); + logerror("%s: adcr_r %02x\n", tag(), adcr); return adcr; } WRITE8_MEMBER(h8_adc_device::adcsr_w) { - logerror("%s: adcsr_w %02x\n", tag().c_str(), data); + logerror("%s: adcsr_w %02x\n", tag(), 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().c_str(), data); + logerror("%s: adcr_w %02x\n", tag(), 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().c_str(), port, buffer, buf[buffer]); + logerror("%s: adc buffer %d -> %d:%03x\n", tag(), 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().c_str(), buffer, reg, buf[buffer]); + logerror("%s: adc commit %d -> %d:%03x\n", tag(), 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().c_str()); + throw emu_fatalerror("%s: Buffering requested but unimplemented for this device\n", tag()); } int h8_adc_device::get_channel_index(int count) { - throw emu_fatalerror("%s: Indexing requested but unimplemented for this device\n", tag().c_str()); + throw emu_fatalerror("%s: Indexing requested but unimplemented for this device\n", tag()); } -h8_adc_3337_device::h8_adc_3337_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h8_adc_3337_device::h8_adc_3337_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8_adc_3006_device::h8_adc_3006_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8_adc_2245_device::h8_adc_2245_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8_adc_2320_device::h8_adc_2320_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8_adc_2357_device::h8_adc_2357_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8_adc_2655_device::h8_adc_2655_device(const machine_config &mconfig, const char *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 c55b2dd2b16..02e670ba144 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - void set_info(std::string intc_tag, int vect); + void set_info(const char *intc_tag, int vect); DECLARE_READ8_MEMBER(addr8_r); DECLARE_READ16_MEMBER(addr16_r); @@ -58,7 +58,7 @@ protected: required_device cpu; h8_intc_device *intc; address_space *io; - std::string intc_tag; + const char *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, std::string tag, device_t *owner, UINT32 clock); + h8_adc_3337_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + h8_adc_3006_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + h8_adc_2245_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + h8_adc_2320_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + h8_adc_2357_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + h8_adc_2655_device(const machine_config &mconfig, const char *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 1e8e53591a9..7a77a988aa0 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; const device_type H8H_INTC = &device_creator; const device_type H8S_INTC = &device_creator; -h8_intc_device::h8_intc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h8_intc_device::h8_intc_device(const machine_config &mconfig, const char *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, std::string tag, d irq_vector_nmi = 3; } -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) : +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) : 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().c_str(), vector); + logerror("%s: taking internal interrupt %d\n", tag(), 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().c_str(), vector); + logerror("%s: internal interrupt %d\n", tag(), 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().c_str(), data); + logerror("%s: ier = %02x\n", tag(), data); update_irq_state(); } void h8_intc_device::check_level_irqs(bool force_update) { - logerror("%s: irq_input=%02x\n", tag().c_str(), irq_input); + logerror("%s: irq_input=%02x\n", tag(), 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().c_str(), iscr); + logerror("%s: iscr = %02x\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) : +h8h_intc_device::h8h_intc_device(const machine_config &mconfig, const char *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, std::string 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, const char *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().c_str(), data, isr); + logerror("%s: isr = %02x / %02x\n", tag(), 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().c_str(), offset, data); + logerror("%s: icr %d = %02x\n", tag(), 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().c_str(), iscr); + logerror("%s: iscr = %04x\n", tag(), 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().c_str(), iscr); + logerror("%s: iscr = %04x\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) : +h8s_intc_device::h8s_intc_device(const machine_config &mconfig, const char *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().c_str(), offset, data); + logerror("%s: ipr %d = %02x\n", tag(), 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 0ba1fdb3da5..b6a6da31af7 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, 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); + 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); 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + h8s_intc_device(const machine_config &mconfig, const char *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 0e705f74917..6896a5b167a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h8_port_device::h8_port_device(const machine_config &mconfig, const char *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().c_str(), data); + // logerror("%s: ddr_w %02x\n", tag(), data); ddr = data; update_output(); } WRITE8_MEMBER(h8_port_device::dr_w) { - // logerror("%s: dr_w %02x\n", tag().c_str(), data); + // logerror("%s: dr_w %02x\n", tag(), data); dr = data; update_output(); } READ8_MEMBER(h8_port_device::dr_r) { - // logerror("%s: dr_r %02x\n", tag().c_str(), (dr | mask) & 0xff); + // logerror("%s: dr_r %02x\n", tag(), (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().c_str(), res, ddr & ~mask, UINT8(~mask)); + // logerror("%s: port_r %02x (%02x %02x)\n", tag(), res, ddr & ~mask, UINT8(~mask)); return res; } WRITE8_MEMBER(h8_port_device::pcr_w) { - logerror("%s: pcr_w %02x\n", tag().c_str(), data); + logerror("%s: pcr_w %02x\n", tag(), data); pcr = data; } READ8_MEMBER(h8_port_device::pcr_r) { - logerror("%s: dr_r %02x\n", tag().c_str(), (pcr | mask) & 0xff); + logerror("%s: dr_r %02x\n", tag(), (pcr | mask) & 0xff); return pcr | mask; } WRITE8_MEMBER(h8_port_device::odr_w) { - logerror("%s: odr_w %02x\n", tag().c_str(), data); + logerror("%s: odr_w %02x\n", tag(), data); odr = data; } READ8_MEMBER(h8_port_device::odr_r) { - logerror("%s: odr_r %02x\n", tag().c_str(), (odr | mask) & 0xff); + logerror("%s: odr_r %02x\n", tag(), (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 8e9a6aa0950..3b1230f9d17 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, std::string tag, device_t *owner, UINT32 clock); + h8_port_device(const machine_config &mconfig, const char *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 1670f4fdb35..f3b26bd8198 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; 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, std::string tag, device_t *owner, UINT32 clock) : +h8_sci_device::h8_sci_device(const machine_config &mconfig, const char *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), 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), 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), 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(std::string _intc_tag,int eri, int rxi, int txi, int tei) +void h8_sci_device::set_info(const char *_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().c_str(), data, + logerror("%s: smr_w %02x %s %c%c%c%s /%d (%06x)\n", tag(), 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().c_str(), smr, cpu->pc()); + logerror("%s: smr_r %02x (%06x)\n", tag(), smr, cpu->pc()); return smr; } WRITE8_MEMBER(h8_sci_device::brr_w) { brr = data; - logerror("%s: brr_w %02x (%06x)\n", tag().c_str(), data, cpu->pc()); + logerror("%s: brr_w %02x (%06x)\n", tag(), data, cpu->pc()); clock_update(); } READ8_MEMBER(h8_sci_device::brr_r) { - logerror("%s: brr_r %02x (%06x)\n", tag().c_str(), brr, cpu->pc()); + logerror("%s: brr_r %02x (%06x)\n", tag(), 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().c_str(), data, + logerror("%s: scr_w %02x%s%s%s%s%s%s clk=%d (%06x)\n", tag(), 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().c_str(), scr, cpu->pc()); + logerror("%s: scr_r %02x (%06x)\n", tag(), scr, cpu->pc()); return scr; } WRITE8_MEMBER(h8_sci_device::tdr_w) { - logerror("%s: tdr_w %02x (%06x)\n", tag().c_str(), data, cpu->pc()); + logerror("%s: tdr_w %02x (%06x)\n", tag(), data, cpu->pc()); tdr = data; } READ8_MEMBER(h8_sci_device::tdr_r) { - logerror("%s: tdr_r %02x (%06x)\n", tag().c_str(), tdr, cpu->pc()); + logerror("%s: tdr_r %02x (%06x)\n", tag(), 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().c_str(), data, ssr, cpu->pc()); + logerror("%s: ssr_w %02x -> %02x (%06x)\n", tag(), 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().c_str(), ssr, cpu->pc()); + logerror("%s: ssr_r %02x (%06x)\n", tag(), ssr, cpu->pc()); return ssr; } READ8_MEMBER(h8_sci_device::rdr_r) { - logerror("%s: rdr_r %02x (%06x)\n", tag().c_str(), rdr, cpu->pc()); + logerror("%s: rdr_r %02x (%06x)\n", tag(), rdr, cpu->pc()); return rdr; } WRITE8_MEMBER(h8_sci_device::scmr_w) { - logerror("%s: scmr_w %02x (%06x)\n", tag().c_str(), data, cpu->pc()); + logerror("%s: scmr_w %02x (%06x)\n", tag(), data, cpu->pc()); } READ8_MEMBER(h8_sci_device::scmr_r) { - logerror("%s: scmr_r (%06x)\n", tag().c_str(), cpu->pc()); + logerror("%s: scmr_r (%06x)\n", tag(), 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().c_str(), int(cpu->clock() / divider), int(cpu->clock() / (divider*16))); + logerror("%s: clock internal at %d Hz, async, bitrate %d bps\n", tag(), 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().c_str(), int(cpu->clock() / divider), int(cpu->clock() / (divider*16))); + logerror("%s: clock internal at %d Hz, async, bitrate %d bps, output\n", tag(), 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().c_str(), 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(), int(cpu->clock()*internal_to_external_ratio), int(cpu->clock()*internal_to_external_ratio/16)); } else - logerror("%s: clock external, async\n", tag().c_str()); + logerror("%s: clock external, async\n", tag()); break; case CLKM_INTERNAL_SYNC_OUT: - logerror("%s: clock internal at %d Hz, sync, output\n", tag().c_str(), int(cpu->clock() / (divider*2))); + logerror("%s: clock internal at %d Hz, sync, output\n", tag(), 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().c_str(), int(cpu->clock()*internal_to_external_ratio)); + logerror("%s: clock external at %d Hz, sync\n", tag(), int(cpu->clock()*internal_to_external_ratio)); } else - logerror("%s: clock external, sync\n", tag().c_str()); + logerror("%s: clock external, sync\n", tag()); 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().c_str(), state); + logerror("%s: rx=%d\n", tag(), 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().c_str()); + logerror("%s: Starting internal clock\n", tag()); clock_base = cpu->total_cycles(); cpu->internal_update(); break; case CLKM_EXTERNAL_RATE_ASYNC: - logerror("%s: Simulating external clock async\n", tag().c_str()); + logerror("%s: Simulating external clock async\n", tag()); 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().c_str()); + logerror("%s: Simulating external clock sync\n", tag()); 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().c_str()); + logerror("%s: Waiting for external clock async\n", tag()); ext_clock_counter = 15; break; case CLKM_EXTERNAL_SYNC: - logerror("%s: Waiting for external clock sync\n", tag().c_str()); + logerror("%s: Waiting for external clock sync\n", tag()); 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().c_str(), tsr); + logerror("%s: start transmit %02x\n", tag(), 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().c_str(), state_names[tx_state], tx_bit); + logerror("%s: tx_dropped_edge state=%s bit=%d\n", tag(), 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().c_str(), state_names[tx_state], tx_bit); + logerror("%s: -> state=%s bit=%d\n", tag(), 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().c_str()); + logerror("%s: start receive\n", tag()); 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().c_str()); + logerror("%s: Receive parity error\n", tag()); } else if(ssr & SSR_RDRF) { ssr |= SSR_ORER; - logerror("%s: Receive overrun\n", tag().c_str()); + logerror("%s: Receive overrun\n", tag()); } else { ssr |= SSR_RDRF; - logerror("%s: Received %02x\n", tag().c_str(), rsr); + logerror("%s: Received %02x\n", tag(), 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().c_str(), state_names[rx_state], rx_bit); + logerror("%s: rx_raised_edge state=%s bit=%d\n", tag(), 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().c_str(), state_names[rx_state], rx_bit); + logerror("%s: -> state=%s, bit=%d\n", tag(), 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 fd94df839ee..9b88fcc98a0 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, std::string tag, device_t *owner, UINT32 clock); + h8_sci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void set_info(std::string intc, int eri, int rxi, int txi, int tei); + void set_info(const char *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 cpu; devcb_write_line tx_cb, clk_cb; h8_intc_device *intc; - std::string intc_tag; + const char *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 2e7645f59b1..fd4e47a13a2 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; const device_type H8S_TIMER16_CHANNEL = &device_creator; -h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, const char *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), 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), 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), 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.clear(); + chain_tag = nullptr; } -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) : +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - 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), + 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), 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.clear(); + chain_tag = nullptr; } -void h8_timer16_channel_device::set_info(int _tgr_count, int _tbr_count, std::string intc, int irq_base) +void h8_timer16_channel_device::set_info(int _tgr_count, int _tbr_count, const char *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().c_str(), data); + logerror("%s: tcr_w %02x\n", tag(), 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().c_str(), data); + logerror("%s: tmdr_w %02x\n", tag(), 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().c_str(), offset, data); + logerror("%s: tior_w %d, %02x\n", tag(), 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().c_str(), data); + logerror("%s: tier_w %02x\n", tag(), data); tier = data; tier_update(); logerror("%s: irq %c%c%c%c%c%c trigger=%d\n", - tag().c_str(), + tag(), 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().c_str(), data); + logerror("%s: tsr_w %02x\n", tag(), 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().c_str(), tcnt); + logerror("%s: tcnt_w %04x\n", tag(), 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().c_str(), 'a'+offset, tgr[offset]); + logerror("%s: tgr%c_w %04x\n", tag(), '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().c_str(), 'a'+offset, tgr[offset]); + logerror("%s: tbr%c_w %04x\n", tag(), '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().c_str(), long(current_time), tcnt, int(current_time - event_time)); + logerror("%s: Reached event time (%ld), counter=%04x, dt=%d\n", tag(), 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().c_str(), + tag(), 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().c_str(), tcnt, 'a'+i, tgr[i], counter_cycle, new_delay); + tag(), 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().c_str(), int(event_time - cpu->total_cycles()), long(event_time)); + logerror("%s: next event in %d cycles (%ld)\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) : +h8_timer16_device::h8_timer16_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: tstr_w %02x\n", tag(), data); tstr = data; for(int i=0; iset_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().c_str(), data); + logerror("%s: tsyr_w %02x\n", tag(), 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().c_str(), data); + logerror("%s: tmdr_w %02x\n", tag(), 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().c_str(), data); + logerror("%s: tfcr_w %02x\n", tag(), 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().c_str(), data); + logerror("%s: toer_w %02x\n", tag(), 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().c_str(), data); + logerror("%s: tocr_w %02x\n", tag(), 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 <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().c_str(), data); + logerror("%s: tocr_w %02x\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) : +h8h_timer16_channel_device::h8h_timer16_channel_device(const machine_config &mconfig, const char *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, std::string intc, int irq_base) +void h8h_timer16_channel_device::set_info(int _tgr_count, int _tbr_count, const char *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().c_str()); + logerror("%s: No automatic tcnt clearing\n", tag()); break; case 0x20: case 0x40: { tgr_clearing = tcr & 0x20 ? 0 : 1; - logerror("%s: Auto-clear on tgr%c (%04x)\n", tag().c_str(), 'a'+tgr_clearing, tgr[tgr_clearing]); + logerror("%s: Auto-clear on tgr%c (%04x)\n", tag(), 'a'+tgr_clearing, tgr[tgr_clearing]); break; } case 0x60: tgr_clearing = TGR_CLEAR_EXT; - logerror("%s: External sync clear\n", tag().c_str()); + logerror("%s: External sync clear\n", tag()); 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().c_str(), clock_divider, 1 << clock_divider); + logerror("%s: clock divider %d (%d)\n", tag(), 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().c_str()); + logerror("%s: Phase 0\n", tag()); break; case 0x08: phase = 1 << (clock_divider-1); - logerror("%s: Phase 180\n", tag().c_str()); + logerror("%s: Phase 180\n", tag()); break; case 0x10: case 0x18: phase = 0; clock_divider--; - logerror("%s: Phase 0+180\n", tag().c_str()); + logerror("%s: Phase 0+180\n", tag()); 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().c_str(), 'a'+count_type-INPUT_A); + logerror("%s: counting input %c\n", tag(), 'a'+count_type-INPUT_A); } } -h8s_timer16_channel_device::h8s_timer16_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h8s_timer16_channel_device::h8s_timer16_channel_device(const machine_config &mconfig, const char *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(std::string _chain_tag) +void h8s_timer16_channel_device::set_chain(const char *_chain_tag) { chain_tag = _chain_tag; } -void h8s_timer16_channel_device::set_info(int _tgr_count, UINT8 _tier_mask, std::string intc, int irq_base, +void h8s_timer16_channel_device::set_info(int _tgr_count, UINT8 _tier_mask, const char *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().c_str()); + logerror("%s: No automatic tcnt clearing\n", tag()); 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().c_str(), 'a'+tgr_clearing); + logerror("%s: Auto-clear on tgr%c\n", tag(), 'a'+tgr_clearing); break; } case 0x60: tgr_clearing = TGR_CLEAR_EXT; - logerror("%s: External sync clear\n", tag().c_str()); + logerror("%s: External sync clear\n", tag()); 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().c_str(), clock_divider, 1 << clock_divider); + logerror("%s: clock divider %d (%d)\n", tag(), clock_divider, 1 << clock_divider); if(!clock_divider) phase = 0; else { switch(tcr & 0x18) { case 0x00: phase = 0; - logerror("%s: Phase 0\n", tag().c_str()); + logerror("%s: Phase 0\n", tag()); break; case 0x08: phase = 1 << (clock_divider-1); - logerror("%s: Phase 180\n", tag().c_str()); + logerror("%s: Phase 180\n", tag()); break; case 0x10: case 0x18: phase = 0; clock_divider--; - logerror("%s: Phase 0+180\n", tag().c_str()); + logerror("%s: Phase 0+180\n", tag()); 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().c_str()); + logerror("%s: chained timer\n", tag()); } 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().c_str(), 'a'+count_type-INPUT_A); + logerror("%s: counting input %c\n", tag(), 'a'+count_type-INPUT_A); } } diff --git a/src/devices/cpu/h8/h8_timer16.h b/src/devices/cpu/h8/h8_timer16.h index 92382bb2c06..f8f6c1efda2 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, 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); + 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); - void set_info(int tgr_count, int tbr_count, std::string intc, int irq_base); + void set_info(int tgr_count, int tbr_count, const char *intc, int irq_base); DECLARE_READ8_MEMBER(tcr_r); DECLARE_WRITE8_MEMBER(tcr_w); @@ -105,8 +105,7 @@ protected: required_device cpu; h8_timer16_channel_device *chained_timer; h8_intc_device *intc; - std::string chain_tag; - std::string intc_tag; + const char *chain_tag, *intc_tag; int interrupt[6]; UINT8 tier_mask; @@ -133,10 +132,10 @@ protected: class h8h_timer16_channel_device : public h8_timer16_channel_device { public: - h8h_timer16_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8h_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~h8h_timer16_channel_device(); - void set_info(int tgr_count, int tbr_count, std::string intc, int irq_base); + void set_info(int tgr_count, int tbr_count, const char *intc, int irq_base); protected: virtual void tcr_update() override; @@ -147,12 +146,12 @@ protected: class h8s_timer16_channel_device : public h8_timer16_channel_device { public: - h8s_timer16_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~h8s_timer16_channel_device(); - void set_info(int tgr_count, UINT8 _tier_mask, std::string intc, int irq_base, + void set_info(int tgr_count, UINT8 _tier_mask, const char *intc, int irq_base, int t0, int t1, int t2, int t3, int t4, int t5, int t6, int t7); - void set_chain(std::string chain_tag); + void set_chain(const char *chain_tag); protected: int count_types[8]; @@ -165,7 +164,7 @@ protected: class h8_timer16_device : public device_t { public: - h8_timer16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8_timer16_device(const machine_config &mconfig, const char *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 762977d01ae..29e156edfee 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; const device_type H8H_TIMER8_CHANNEL = &device_creator; -h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, const char *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), 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), 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), 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, std::string 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, const char *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), 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), 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), 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(std::string 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(const char *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.clear(); + chain_tag = nullptr; 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().c_str()); + logerror("%s: clock stopped", tag()); 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().c_str(), cpu->clock()/clock_divider); + logerror("%s: clock %dHz", tag(), cpu->clock()/clock_divider); break; case 4: clock_type = chain_type; clock_divider = 0; - logerror("%s: clock chained %s", tag().c_str(), clock_type == CHAIN_A ? "tcora" : "overflow"); + logerror("%s: clock chained %s", tag(), clock_type == CHAIN_A ? "tcora" : "overflow"); break; case 5: clock_type = INPUT_UP; clock_divider = 0; - logerror("%s: clock external raising edge", tag().c_str()); + logerror("%s: clock external raising edge", tag()); break; case 6: clock_type = INPUT_DOWN; clock_divider = 0; - logerror("%s: clock external falling edge", tag().c_str()); + logerror("%s: clock external falling edge", tag()); break; case 7: clock_type = INPUT_UPDOWN; clock_divider = 0; - logerror("%s: clock external both edges", tag().c_str()); + logerror("%s: clock external both edges", tag()); 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().c_str(), tcsr); + logerror("%s: tcsr_w %02x\n", tag(), 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().c_str(), 'a'+offset, data); + logerror("%s: tcor%c_w %02x\n", tag(), '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().c_str(), data); + logerror("%s: tcnt_w %02x\n", tag(), data); recalc_event(); } void h8_timer8_channel_device::device_start() { intc = siblingdevice(intc_tag); - if(!chain_tag.empty()) + if(chain_tag) chained_timer = siblingdevice(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().c_str(), long(current_time), tcnt, int(current_time - event_time)); + logerror("%s: Reached event time (%ld), counter=%02x, dt=%d\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) : +h8h_timer8_channel_device::h8h_timer8_channel_device(const machine_config &mconfig, const char *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(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) +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) { 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 c6be16fa6e8..0ab4055ea38 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, 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); + 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); - 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); + 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); DECLARE_READ8_MEMBER(tcr_r); DECLARE_WRITE8_MEMBER(tcr_w); @@ -80,8 +80,7 @@ protected: required_device cpu; h8_timer8_channel_device *chained_timer; h8_intc_device *intc; - std::string chain_tag; - std::string intc_tag; + const char *chain_tag, *intc_tag; int irq_ca, irq_cb, irq_v, chain_type; int div_tab[6]; UINT8 tcor[2]; @@ -102,10 +101,10 @@ protected: class h8h_timer8_channel_device : public h8_timer8_channel_device { public: - h8h_timer8_channel_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8h_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~h8h_timer8_channel_device(); - 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); + 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); }; extern const device_type H8_TIMER8_CHANNEL; diff --git a/src/devices/cpu/h8/h8h.cpp b/src/devices/cpu/h8/h8h.cpp index 7dc7a86b98e..89615fadad5 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, std::string 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, const char *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 8c908cb1c95..5999ad1030f 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, std::string 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, const char *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 1b86ca1de3b..4686e718666 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, std::string 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, const char *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 9abae61de89..46712311861 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, std::string 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, const char *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 2050b249d1b..c89bdfa2e5e 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; const device_type H8S2246 = &device_creator; -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) : +h8s2245_device::h8s2245_device(const machine_config &mconfig, const char *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, std::string tag, d ram_start = 0xffec00; } -h8s2241_device::h8s2241_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h8s2241_device::h8s2241_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2242_device::h8s2242_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2246_device::h8s2246_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: syscr = %02x\n", tag(), data); } diff --git a/src/devices/cpu/h8/h8s2245.h b/src/devices/cpu/h8/h8s2245.h index 6b7f25d4f1d..b4364f68501 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + h8s2241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2242_device : public h8s2245_device { public: - h8s2242_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2246_device : public h8s2245_device { public: - h8s2246_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2246_device(const machine_config &mconfig, const char *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 a08a9d1c4e3..352229079b5 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; const device_type H8S2329 = &device_creator; -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) : +h8s2320_device::h8s2320_device(const machine_config &mconfig, const char *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, std::string tag, d ram_start = 0xffec00; } -h8s2321_device::h8s2321_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h8s2321_device::h8s2321_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2322_device::h8s2322_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2323_device::h8s2323_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2324_device::h8s2324_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2326_device::h8s2326_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2327_device::h8s2327_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2328_device::h8s2328_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2329_device::h8s2329_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: syscr = %02x\n", tag(), data); } diff --git a/src/devices/cpu/h8/h8s2320.h b/src/devices/cpu/h8/h8s2320.h index 9e64ebbc111..2a5a6f8f225 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + h8s2321_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2322_device : public h8s2320_device { public: - h8s2322_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2322_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2323_device : public h8s2320_device { public: - h8s2323_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2323_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2324_device : public h8s2320_device { public: - h8s2324_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2324_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2326_device : public h8s2320_device { public: - h8s2326_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2326_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2327_device : public h8s2320_device { public: - h8s2327_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2327_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2328_device : public h8s2320_device { public: - h8s2328_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2328_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2329_device : public h8s2320_device { public: - h8s2329_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2329_device(const machine_config &mconfig, const char *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 4585d9c8c42..d9a1ecc7cfa 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; const device_type H8S2392 = &device_creator; const device_type H8S2390 = &device_creator; -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) : +h8s2357_device::h8s2357_device(const machine_config &mconfig, const char *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, std::string tag, d ram_start = 0xffdc00; } -h8s2352_device::h8s2352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h8s2352_device::h8s2352_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2398_device::h8s2398_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2394_device::h8s2394_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2392_device::h8s2392_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +h8s2390_device::h8s2390_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: syscr = %02x\n", tag(), data); } diff --git a/src/devices/cpu/h8/h8s2357.h b/src/devices/cpu/h8/h8s2357.h index 81bc13b6db2..b13c0b9aab3 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + h8s2352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2398_device : public h8s2357_device { public: - h8s2398_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2398_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2394_device : public h8s2357_device { public: - h8s2394_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2392_device : public h8s2357_device { public: - h8s2392_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2392_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class h8s2390_device : public h8s2357_device { public: - h8s2390_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + h8s2390_device(const machine_config &mconfig, const char *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 f7c6a0ce12f..a72cf591a19 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, std::string 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, const char *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 ed3f4abd5ae..1a8e723c142 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, std::string 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, const char *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 4ff5b406a86..a8a02dd1bee 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; const device_type H8S2653 = &device_creator; -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) : +h8s2655_device::h8s2655_device(const machine_config &mconfig, const char *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, std::string tag, d has_trace = true; } -h8s2653_device::h8s2653_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +h8s2653_device::h8s2653_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: syscr = %02x\n", tag(), data); } diff --git a/src/devices/cpu/h8/h8s2655.h b/src/devices/cpu/h8/h8s2655.h index 4ee16c1ecf6..8211f457698 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + h8s2653_device(const machine_config &mconfig, const char *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 5f9dc376a05..e6104627990 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +hcd62121_cpu_device::hcd62121_cpu_device(const machine_config &mconfig, const char *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 e3f9270d4eb..2339f2229c3 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, std::string tag, device_t *owner, UINT32 clock); + hcd62121_cpu_device(const machine_config &mconfig, const char *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 567a6b65b5d..c786c7235ba 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 - constructor //------------------------------------------------- -hd61700_cpu_device::hd61700_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +hd61700_cpu_device::hd61700_cpu_device(const machine_config &mconfig, const char *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 f4ac99a6b40..838ea8833bb 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, std::string _tag, device_t *_owner, UINT32 _clock); + hd61700_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); template static devcb_base &set_lcd_ctrl_callback(device_t &device, _Object object) { return downcast(device).m_lcd_ctrl_cb.set_callback(object); } template static devcb_base &set_lcd_write_callback(device_t &device, _Object object) { return downcast(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 f1a86de7775..58cd711f8da 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd38750_device::hd38750_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd38755_device::hd38755_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd44750_device::hd44750_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd44758_device::hd44758_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd38800_device::hd38800_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd38805_device::hd38805_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd44801_device::hd44801_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd44808_device::hd44808_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd38820_device::hd38820_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd38825_device::hd38825_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd44820_device::hd44820_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd44828_device::hd44828_device(const machine_config &mconfig, const char *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().c_str(), (index >= 4) ? "unknown" : "output", index, m_prev_pc); + logerror("%s read from %s port R%d at $%04X\n", tag(), (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().c_str(), index, data & 0xf, m_prev_pc); + logerror("%s ineffective write to port R%d = $%X at $%04X\n", tag(), 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().c_str(), index, m_prev_pc); + logerror("%s read from output pin D%d at $%04X\n", tag(), 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().c_str(), index, m_prev_pc); + logerror("%s read from unknown port R%d at $%04X\n", tag(), 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().c_str(), index, data & 0xf, m_prev_pc); + logerror("%s ineffective write to port R%d = $%X at $%04X\n", tag(), 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().c_str(), (index == 7) ? "unknown" : "output", index, m_prev_pc); + logerror("%s read from %s port R%d at $%04X\n", tag(), (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().c_str(), index, data & 0xf, m_prev_pc); + logerror("%s ineffective write to port R%d = $%X at $%04X\n", tag(), index, data & 0xf, m_prev_pc); } diff --git a/src/devices/cpu/hmcs40/hmcs40.h b/src/devices/cpu/hmcs40/hmcs40.h index 24ef5adba9e..d9e30a92f72 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, 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) + 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) : 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, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname); + 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); protected: // overrides @@ -361,32 +361,32 @@ protected: class hd38750_device : public hmcs43_cpu_device { public: - hd38750_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hd38750_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class hd38755_device : public hmcs43_cpu_device { public: - hd38755_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hd38755_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class hd44750_device : public hmcs43_cpu_device { public: - hd44750_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hd44750_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class hd44758_device : public hmcs43_cpu_device { public: - hd44758_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hd44758_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname); + 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); protected: // overrides @@ -397,32 +397,32 @@ protected: class hd38800_device : public hmcs44_cpu_device { public: - hd38800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hd38800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class hd38805_device : public hmcs44_cpu_device { public: - hd38805_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hd38805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class hd44801_device : public hmcs44_cpu_device { public: - hd44801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hd44801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class hd44808_device : public hmcs44_cpu_device { public: - hd44808_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hd44808_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock, UINT16 polarity, const char *shortname); + 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); protected: // overrides @@ -433,25 +433,25 @@ protected: class hd38820_device : public hmcs45_cpu_device { public: - hd38820_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hd38820_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class hd38825_device : public hmcs45_cpu_device { public: - hd38825_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hd38825_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class hd44820_device : public hmcs45_cpu_device { public: - hd44820_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hd44820_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class hd44828_device : public hmcs45_cpu_device { public: - hd44828_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hd44828_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/hmcs40/hmcs40op.cpp b/src/devices/cpu/hmcs40/hmcs40op.cpp index 78596e4ce5a..f6faab90360 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().c_str(), m_op, m_prev_pc); + logerror("%s unknown opcode $%03X at $%04X\n", tag(), m_op, m_prev_pc); } diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp index 54c09e694bd..3d9c9631c5d 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +hp_5061_3001_cpu_device::hp_5061_3001_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hp_5061_3011_cpu_device::hp_5061_3011_cpu_device(const machine_config &mconfig, const char *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 f51b6c8dc52..8baeeb66c1d 100644 --- a/src/devices/cpu/hphybrid/hphybrid.h +++ b/src/devices/cpu/hphybrid/hphybrid.h @@ -90,7 +90,7 @@ public: template static devcb_base &set_pa_changed_func(device_t &device, _Object object) { return downcast(device).m_pa_changed_func.set_callback(object); } protected: - 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + hp_5061_3001_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_boot_mode_static(device_t &device, bool mode) { downcast(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, std::string tag, device_t *owner, UINT32 clock); + hp_5061_3011_cpu_device(const machine_config &mconfig, const char *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 63998f35a7d..f0d57ada9a0 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; const device_type PENTIUM4 = &device_creator; -i386_device::i386_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i386_device::i386_device(const machine_config &mconfig, const char *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, std::string tag, device_ } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +i386SX_device::i386SX_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i486_device::i486_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : i386_device(mconfig, I486, "I486", tag, owner, clock, "i486", __FILE__) { } -pentium_device::pentium_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pentium_device::pentium_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +mediagx_device::mediagx_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pentium_pro_device::pentium_pro_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pentium_mmx_device::pentium_mmx_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pentium2_device::pentium2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pentium3_device::pentium3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pentium4_device::pentium4_device(const machine_config &mconfig, const char *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 e9a1df89f33..c9ef38b4280 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, 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); + 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); // static configuration helpers template static devcb_base &set_smiact(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + i386SX_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + i486_device(const machine_config &mconfig, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + mediagx_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pentium_pro_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pentium_mmx_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pentium2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pentium3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pentium4_device(const machine_config &mconfig, const char *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 44b9299f768..d4ba8891260 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i4004_cpu_device::i4004_cpu_device(const machine_config &mconfig, const char *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 c34ae3631dc..fd60a9a5d10 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, std::string _tag, device_t *_owner, UINT32 _clock); + i4004_cpu_device(const machine_config &mconfig, const char *_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 54388dfa90a..6baeacfe7bb 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 - constructor //------------------------------------------------- -i8008_device::i8008_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i8008_device::i8008_device(const machine_config &mconfig, const char *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 0b2f35fcdb9..74c727290eb 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, std::string tag, device_t *owner, UINT32 clock); + i8008_device(const machine_config &mconfig, const char *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 dc5d54ee82f..308de09e4a1 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; const device_type I8085A = &device_creator; -i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i8085a_cpu_device::i8085a_cpu_device(const machine_config &mconfig, const char *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, std::string } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +i8080_cpu_device::i8080_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8080a_cpu_device::i8080a_cpu_device(const machine_config &mconfig, const char *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 75f14968e33..9a866577ca6 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, 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); + 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); // static configuration helpers template static devcb_base &set_out_status_func(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + i8080_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + i8080a_cpu_device(const machine_config &mconfig, const char *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 c35be988595..22494cfdd2f 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 - constructor //------------------------------------------------- -i8089_device::i8089_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +i8089_device::i8089_device(const machine_config &mconfig, const char *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 b61444effad..e4100b8fa94 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, std::string tag, device_t *owner, UINT32 clock); + i8089_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // callbacks template 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 2114e293107..932d59ff229 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 - constructor //------------------------------------------------- -i8089_channel::i8089_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +i8089_channel::i8089_channel(const machine_config &mconfig, const char *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().c_str()); + logerror("%s('%s'): terminating dma transfer\n", shortname(), tag()); 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().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); + 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); } } @@ -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().c_str(), m_r[BC].w); + logerror("%s('%s'): entering state: DMA_IDLE (bc = %04x)\n", shortname(), tag(), 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().c_str()); + logerror("%s('%s'): entering state: DMA_FETCH\n", shortname(), tag()); // 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().c_str()); + fatalerror("%s('%s'): dma translate requested\n", shortname(), tag()); 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().c_str()); + logerror("%s('%s'): entering state: DMA_STORE", shortname(), tag()); // 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().c_str()); + fatalerror("%s('%s'): dma compare requested\n", shortname(), tag()); case DMA_TERMINATE: if (VERBOSE_DMA) - logerror("%s('%s'): entering state: DMA_TERMINATE\n", shortname(), tag().c_str()); + logerror("%s('%s'): entering state: DMA_TERMINATE\n", shortname(), tag()); // terminate on masked compare? if (CC_TMC & 0x03) - fatalerror("%s('%s'): terminate on masked compare not supported\n", shortname(), tag().c_str()); + fatalerror("%s('%s'): terminate on masked compare not supported\n", shortname(), tag()); // 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().c_str()); + fatalerror("%s('%s'): terminate on single transfer not supported\n", shortname(), tag()); // 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().c_str(), (m_dma_value >> 8) & 0xff); + logerror("%s('%s'): entering state: DMA_STORE_BYTE_HIGH[ %02x ]\n", shortname(), tag(), (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().c_str()); + logerror("%s('%s'): command received: update psw\n", shortname(), tag()); 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().c_str()); + logerror("%s('%s'): command received: start channel in local space\n", shortname(), tag()); examine_ccw(ccw); @@ -737,9 +737,9 @@ void i8089_channel::attention() if (VERBOSE) { - 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); + 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); } 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().c_str()); + logerror("%s('%s'): command received: invalid command 010\n", shortname(), tag()); 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().c_str()); + logerror("%s('%s'): command received: start channel in system space\n", shortname(), tag()); examine_ccw(ccw); @@ -768,16 +768,16 @@ void i8089_channel::attention() if (VERBOSE) { - 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); + 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); } break; case 4: if (VERBOSE) - logerror("%s('%s'): command received: invalid command 100\n", shortname(), tag().c_str()); + logerror("%s('%s'): command received: invalid command 100\n", shortname(), tag()); 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().c_str()); + logerror("%s('%s'): command received: continue channel processing\n", shortname(), tag()); // 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().c_str()); - logerror("%s('%s'): task pointer: %06x\n", shortname(), tag().c_str(), m_r[TP].w); + logerror("%s('%s'): ---- continuing channel ----\n", shortname(), tag()); + logerror("%s('%s'): task pointer: %06x\n", shortname(), tag(), 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().c_str()); + logerror("%s('%s'): command received: halt channel and save tp\n", shortname(), tag()); // 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().c_str()); + logerror("%s('%s'): command received: halt channel\n", shortname(), tag()); 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().c_str(), state); + logerror("%s('%s'): ext_w: %d\n", shortname(), tag(), 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().c_str(), state); + logerror("%s('%s'): drq_w: %d\n", shortname(), tag(), state); m_drq = state; } diff --git a/src/devices/cpu/i8089/i8089_channel.h b/src/devices/cpu/i8089/i8089_channel.h index ecab0fa9747..569112e41e8 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, std::string tag, device_t *owner, UINT32 clock); + i8089_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template 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 c158b6a72eb..09c8f5cd037 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().c_str(), opc); + logerror("%s('%s'): invalid opcode: %02x\n", shortname(), tag(), opc); } diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp index ea1daedfe9f..7d30f5b9771 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; const device_type I80188 = &device_creator; -i80188_cpu_device::i80188_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i80188_cpu_device::i80188_cpu_device(const machine_config &mconfig, const char *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, std::string 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, std::string tag, device_t *owner, UINT32 clock) +i80186_cpu_device::i80186_cpu_device(const machine_config &mconfig, const char *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, std::string 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, std::string 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, const char *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 (tmphigh) interrupt(5); CLK(BOUND); - logerror("%s: %06x: bound %04x high %04x low %04x tmp\n", tag().c_str(), pc(), high, low, tmp); + logerror("%s: %06x: bound %04x high %04x low %04x tmp\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: Mov Sreg - Invalid register\n", tag(), 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().c_str(), pc(), op); + logerror("%s: %06x: Invalid Opcode %02x\n", tag(), 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 b209df96067..cff4c9f8606 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, 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); + 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); template static devcb_base &static_set_read_slave_ack_callback(device_t &device, _Object object) { return downcast(device).m_read_slave_ack_func.set_callback(object); } template static devcb_base &static_set_chip_select_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + i80188_cpu_device(const machine_config &mconfig, const char *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 970ef3fad76..9f79007506a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i80286_cpu_device::i80286_cpu_device(const machine_config &mconfig, const char *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 (tmphigh) interrupt(5); CLK(BOUND); - logerror("%s: %06x: bound %04x high %04x low %04x tmp\n", tag().c_str(), pc(), high, low, tmp); + logerror("%s: %06x: bound %04x high %04x low %04x tmp\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: Mov Sreg - Invalid register\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: Mov Sreg - Invalid register\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: Warning - BUSLOCK\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: FF Pre with unimplemented mod\n", tag(), 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().c_str(), pc(), op); + logerror("%s: %06x: Invalid Opcode %02x\n", tag(), 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 12121512d6c..8df1bf43d94 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, std::string tag, device_t *owner, UINT32 clock); + i80286_cpu_device(const machine_config &mconfig, const char *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 ebded51bd53..cffe2793516 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; const device_type I8088 = &device_creator; -i8088_cpu_device::i8088_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i8088_cpu_device::i8088_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8086_cpu_device::i8086_cpu_device(const machine_config &mconfig, const char *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, std::string ta m_fetch_xor = BYTE_XOR_LE(0); } -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_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_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().c_str(), pc(), op); + logerror("%s: %06x: Invalid Opcode %02x\n", tag(), 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, std::string 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, const char *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().c_str(), pc(), op, m_modrm); + logerror("%s: %06x: Unimplemented floating point escape %02x%02x\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: Warning - BUSLOCK\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: REPNE invalid\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: REPE invalid\n", tag(), 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().c_str(), pc()); + //logerror("%s: %06x: HALT\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: FE Pre with unimplemented mod\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: FF Pre with unimplemented mod\n", tag(), pc()); break; } } diff --git a/src/devices/cpu/i86/i86.h b/src/devices/cpu/i86/i86.h index e338414a4eb..978fa7d1690 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template static devcb_base &set_lock_handler(device_t &device, _Object object) { return downcast(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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + i8088_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/i860/i860.cpp b/src/devices/cpu/i860/i860.cpp index a1a03c99216..4a02ab51dd6 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i860_cpu_device::i860_cpu_device(const machine_config &mconfig, const char *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 c9d1c13b92a..248cab2d4ba 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, std::string tag, device_t *owner, UINT32 clock); + i860_cpu_device(const machine_config &mconfig, const char *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 7a555aeedf0..4600af7a0b8 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().c_str(), m_pc); + fprintf(stderr, "(%s) 0x%08x: snag 0x20000000\n", tag(), m_pc); m_single_stepping = 0; } else if (m_pc == 0xfffc0384 || m_pc == 0xfffc03b8) { - fprintf(stderr, "(%s) 0x%08x: passed 0x20000000\n", tag().c_str(), m_pc); + fprintf(stderr, "(%s) 0x%08x: passed 0x20000000\n", tag(), m_pc); m_single_stepping = 0; } #endif diff --git a/src/devices/cpu/i960/i960.cpp b/src/devices/cpu/i960/i960.cpp index 5420474e98e..224b844387c 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i960_cpu_device::i960_cpu_device(const machine_config &mconfig, const char *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 468efa7039e..3f26fbb46d1 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, std::string tag, device_t *owner, UINT32 clock); + i960_cpu_device(const machine_config &mconfig, const char *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 e525a219882..87de1cb2217 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 - constructor //------------------------------------------------- -ie15_device::ie15_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ie15_device::ie15_device(const machine_config &mconfig, const char *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 8bf15d52a33..ce5cb46bf81 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, std::string tag, device_t *owner, UINT32 clock); + ie15_device(const machine_config &mconfig, const char *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 f9ef7232a23..000d6375cce 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; const device_type JAGUARDSP = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +jaguargpu_cpu_device::jaguargpu_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +jaguardsp_cpu_device::jaguardsp_cpu_device(const machine_config &mconfig, const char *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 f276d3467f0..cc2e8938961 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + jaguargpu_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + jaguardsp_cpu_device(const machine_config &mconfig, const char *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 20e39fd39c1..d24b3f64775 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, std::string tag, device_t *owner, UINT32 clock) +lc8670_cpu_device::lc8670_cpu_device(const machine_config &mconfig, const char *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<; -lh5801_cpu_device::lh5801_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +lh5801_cpu_device::lh5801_cpu_device(const machine_config &mconfig, const char *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 421efb3870e..fe6f3c44f63 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, std::string tag, device_t *owner, UINT32 clock); + lh5801_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_in_func(device_t &device, _Object object) { return downcast(device).m_in_func.set_callback(object); } diff --git a/src/devices/cpu/lr35902/lr35902.cpp b/src/devices/cpu/lr35902/lr35902.cpp index dbdf56a6865..8f365c18c54 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +lr35902_cpu_device::lr35902_cpu_device(const machine_config &mconfig, const char *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 a59c7690889..74ad24d07f8 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, std::string _tag, device_t *_owner, UINT32 _clock); + lr35902_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); // static configuration helpers template static devcb_base &set_timer_cb(device_t &device, _Object object) { return downcast(device).m_timer_func.set_callback(object); } diff --git a/src/devices/cpu/m37710/m37710.cpp b/src/devices/cpu/m37710/m37710.cpp index 324de6ac217..43568915dce 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +m37702m2_device::m37702m2_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +m37702s1_device::m37702s1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m37710s4_device::m37710s4_device(const machine_config &mconfig, const char *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 0bea6bfcf76..e88408e527a 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + m37702s1_device(const machine_config &mconfig, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + m37710s4_device(const machine_config &mconfig, const char *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 0c002ed66e9..b0651e97171 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +deco16_device::deco16_device(const machine_config &mconfig, const char *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 e679a6cfaa1..134b1e3aae4 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, std::string tag, device_t *owner, UINT32 clock); + deco16_device(const machine_config &mconfig, const char *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 92c95b05a39..a7f40fa7ada 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; //------------------------------------------------- // m3745x_device - constructor //------------------------------------------------- -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) : +m3745x_device::m3745x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source) : m740_device(mconfig, type, name, tag, owner, clock, "m3745x", source), m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0, internal_map), read_p3(*this), @@ -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, std::string tag, device_t *owner, UINT32 clock) : +m37450_device::m37450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m3745x_device(mconfig, M37450, "Mitsubishi M37450", tag, owner, clock, ADDRESS_MAP_NAME(m37450_map), "m3745x", __FILE__) { } -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) : +m37450_device::m37450_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : m3745x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m37450_map), shortname, source) { } diff --git a/src/devices/cpu/m6502/m3745x.h b/src/devices/cpu/m6502/m3745x.h index 9ffbf6a431a..0ddc69d099d 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source); const address_space_config m_program_config; @@ -144,8 +144,8 @@ private: class m37450_device : public m3745x_device { public: - 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); + 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); }; extern const device_type M37450; diff --git a/src/devices/cpu/m6502/m4510.cpp b/src/devices/cpu/m6502/m4510.cpp index 79699f7b6dd..b741b7dbeca 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m4510_device::m4510_device(const machine_config &mconfig, const char *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 29295dd2024..f6a8f904863 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, std::string tag, device_t *owner, UINT32 clock); + m4510_device(const machine_config &mconfig, const char *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 76038c49729..965e8866467 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; //------------------------------------------------- // m5074x_device - constructor //------------------------------------------------- -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) : +m5074x_device::m5074x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source) : m740_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_LITTLE, 8, 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, std::string tag, device_t *owner, UINT32 clock) : +m50740_device::m50740_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m5074x_device(mconfig, M50740, "Mitsubishi M50740", tag, owner, clock, ADDRESS_MAP_NAME(m50740_map), "m50740", __FILE__) { } -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) : +m50740_device::m50740_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : m5074x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m50740_map), shortname, source) { } @@ -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, std::string tag, device_t *owner, UINT32 clock) : +m50741_device::m50741_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m5074x_device(mconfig, M50740, "Mitsubishi M50741", tag, owner, clock, ADDRESS_MAP_NAME(m50741_map), "m50741", __FILE__) { } -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) : +m50741_device::m50741_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : m5074x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m50741_map), shortname, source) { } diff --git a/src/devices/cpu/m6502/m5074x.h b/src/devices/cpu/m6502/m5074x.h index 42d41b0d6a8..79de50f63fb 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, address_map_constructor internal_map, const char *shortname, const char *source); const address_space_config m_program_config; @@ -122,15 +122,15 @@ private: class m50740_device : public m5074x_device { public: - 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); + 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); }; class m50741_device : public m5074x_device { public: - 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); + 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); }; extern const device_type M50740; diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp index 4727ece8ed5..0ecd12258f1 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m6502_device::m6502_device(const machine_config &mconfig, const char *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, std::string tag, devic direct_disabled = false; } -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) : +m6502_device::m6502_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), 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 c847e0e69a9..b8f8b16a6dd 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, 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); + 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); 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 2d717c2217f..f2ae2c4b6d9 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m6504_device::m6504_device(const machine_config &mconfig, const char *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 d7e3eb8db71..6a4e4f5f9df 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, std::string tag, device_t *owner, UINT32 clock); + m6504_device(const machine_config &mconfig, const char *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 3cd4e701094..0f561b17e62 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m6507_device::m6507_device(const machine_config &mconfig, const char *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 61acd95b26e..b349b9f8bb7 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, std::string tag, device_t *owner, UINT32 clock); + m6507_device(const machine_config &mconfig, const char *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 5bd39f71fdb..ec21e4c725c 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m6509_device::m6509_device(const machine_config &mconfig, const char *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 eda805951a9..803afcff0e9 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, std::string tag, device_t *owner, UINT32 clock); + m6509_device(const machine_config &mconfig, const char *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 0555490e380..5ab9b0a6259 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m6510_device::m6510_device(const machine_config &mconfig, const char *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, std::string tag, devic floating = 0x00; } -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) : +m6510_device::m6510_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : m6502_device(mconfig, type, name, tag, owner, clock, shortname, source), read_port(*this), write_port(*this), dir(0), port(0), drive(0) diff --git a/src/devices/cpu/m6502/m6510.h b/src/devices/cpu/m6502/m6510.h index addd82dff55..dbd0132baff 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, 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); + 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); 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 e3ac1c14db1..7e8a34c6f20 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m6510t_device::m6510t_device(const machine_config &mconfig, const char *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 8f305ed244e..f580ed6aef3 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, std::string tag, device_t *owner, UINT32 clock); + m6510t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; enum { diff --git a/src/devices/cpu/m6502/m65c02.cpp b/src/devices/cpu/m6502/m65c02.cpp index 4066bc3b0c5..4f02de6471c 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m65c02_device::m65c02_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : m6502_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/cpu/m6502/m65c02.h b/src/devices/cpu/m6502/m65c02.h index 80961953b1d..6a929368512 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, 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); + 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); static const disasm_entry disasm_entries[0x100]; diff --git a/src/devices/cpu/m6502/m65ce02.cpp b/src/devices/cpu/m6502/m65ce02.cpp index 2ab01420028..01f6fe34b2f 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m65ce02_device::m65ce02_device(const machine_config &mconfig, const char *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, std::string 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, const char *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 4600ab7b41d..d0d457d313c 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, 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); + 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); static const disasm_entry disasm_entries[0x100]; diff --git a/src/devices/cpu/m6502/m65sc02.cpp b/src/devices/cpu/m6502/m65sc02.cpp index 5311408b546..f61bc63cf7f 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m65sc02_device::m65sc02_device(const machine_config &mconfig, const char *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 2e7bd6f1b54..f754fc3de89 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, std::string tag, device_t *owner, UINT32 clock); + m65sc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; enum { diff --git a/src/devices/cpu/m6502/m740.cpp b/src/devices/cpu/m6502/m740.cpp index fa932808b11..061f6dd75c7 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m740_device::m740_device(const machine_config &mconfig, const char *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, std::string 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, const char *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 a8549813225..7f312b256cd 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, 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); + 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); 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 58f9b7fb0f7..83bc290a172 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m7501_device::m7501_device(const machine_config &mconfig, const char *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 9ed4ba1331b..7ded4caffe2 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, std::string tag, device_t *owner, UINT32 clock); + m7501_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; enum { diff --git a/src/devices/cpu/m6502/m8502.cpp b/src/devices/cpu/m6502/m8502.cpp index 65280cf35fb..a967d03d74c 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m8502_device::m8502_device(const machine_config &mconfig, const char *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 4298ec9338d..1969ba6ffad 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, std::string tag, device_t *owner, UINT32 clock); + m8502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; enum { diff --git a/src/devices/cpu/m6502/n2a03.cpp b/src/devices/cpu/m6502/n2a03.cpp index e01b512a7f0..f168995ce5f 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, std::string tag, device_t *owner, UINT32 clock) : +n2a03_device::n2a03_device(const machine_config &mconfig, const char *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 495a91eae3f..266449bea36 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, std::string tag, device_t *owner, UINT32 clock); + n2a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_apu; diff --git a/src/devices/cpu/m6502/odeco16.lst b/src/devices/cpu/m6502/odeco16.lst index 2cf47f18170..6cea2fa7282 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().c_str(), inst_state); + logerror("%s: Unimplemented instruction %02x\n", tag(), inst_state); prefetch(); u0B_zpg TMP2 = read_pc(); if(DECO16_VERBOSE) - logerror("%s: OP0B %02x (%04x)\n", tag().c_str(), NPC, TMP2); + logerror("%s: OP0B %02x (%04x)\n", tag(), NPC, TMP2); prefetch(); u13_zpg TMP2 = read_pc(); if(DECO16_VERBOSE) - logerror("%s: OP13 %02x (%04x)\n", tag().c_str(), NPC, TMP2); + logerror("%s: OP13 %02x (%04x)\n", tag(), NPC, TMP2); prefetch(); u23_zpg TMP2 = read_pc(); if(DECO16_VERBOSE) - logerror("%s: OP23 %02x (%04x)\n", tag().c_str(), NPC, TMP2); + logerror("%s: OP23 %02x (%04x)\n", tag(), NPC, TMP2); prefetch(); u3F_zpg TMP2 = read_pc(); if(DECO16_VERBOSE) - logerror("%s: OPBB %02x (%04x)\n", tag().c_str(), NPC, TMP2); + logerror("%s: OPBB %02x (%04x)\n", tag(), 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().c_str(), NPC, TMP2); + logerror("%s: OP87 %02x (%04x)\n", tag(), NPC, TMP2); prefetch(); u8F_zpg TMP2 = read_pc(); if(DECO16_VERBOSE) - logerror("%s: OP8F (BANK) %02x (%04x)\n", tag().c_str(), NPC, TMP2); + logerror("%s: OP8F (BANK) %02x (%04x)\n", tag(), NPC, TMP2); io->write_byte(0, TMP2); prefetch(); uA3_zpg TMP2 = read_pc(); if(DECO16_VERBOSE) - logerror("%s: OPA3 %02x (%04x)\n", tag().c_str(), NPC, TMP2); + logerror("%s: OPA3 %02x (%04x)\n", tag(), NPC, TMP2); prefetch(); uBB_zpg TMP2 = read_pc(); if(DECO16_VERBOSE) - logerror("%s: OPBB %02x (%04x)\n", tag().c_str(), NPC, TMP2); + logerror("%s: OPBB %02x (%04x)\n", tag(), NPC, TMP2); prefetch(); vbl_zpg TMP2 = read_pc(); A = io->read_byte(0); if(DECO16_VERBOSE) - logerror("%s: VBL %02x (%04x)\n", tag().c_str(), NPC, TMP2); + logerror("%s: VBL %02x (%04x)\n", tag(), NPC, TMP2); prefetch(); # exceptions diff --git a/src/devices/cpu/m6502/r65c02.cpp b/src/devices/cpu/m6502/r65c02.cpp index a022bb65b1e..3101ffd0341 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +r65c02_device::r65c02_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : m65c02_device(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/cpu/m6502/r65c02.h b/src/devices/cpu/m6502/r65c02.h index ae0c564a414..75077aab749 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, 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); + 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); static const disasm_entry disasm_entries[0x100]; diff --git a/src/devices/cpu/m6800/m6800.cpp b/src/devices/cpu/m6800/m6800.cpp index 5ff3585761b..84d3b8d03e2 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; const device_type HD6303Y = &device_creator; -m6800_cpu_device::m6800_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m6800_cpu_device::m6800_cpu_device(const machine_config &mconfig, const char *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, std::string ta m_clock_divider = 1; } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +m6801_cpu_device::m6801_cpu_device(const machine_config &mconfig, const char *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, 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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +m6802_cpu_device::m6802_cpu_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +m6803_cpu_device::m6803_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m6808_cpu_device::m6808_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd6301_cpu_device::hd6301_cpu_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd63701_cpu_device::hd63701_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +nsc8105_cpu_device::nsc8105_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd6303r_cpu_device::hd6303r_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd6303y_cpu_device::hd6303y_cpu_device(const machine_config &mconfig, const char *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().c_str())); + LOG((message, tag())); 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().c_str()); + //logerror("M6800 '%s' SCI interrupt\n", tag()); 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().c_str()); + //logerror("M6800 '%s' Tx Tick\n", tag()); 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().c_str(), m_tsr); + //logerror("M6800 '%s' Transmit START Data %02x\n", tag(), 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().c_str()); + //logerror("M6800 '%s' Transmit STOP\n", tag()); 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().c_str(), m_txbits, m_tx); + //logerror("M6800 '%s' Transmit Bit %u: %u\n", tag(), 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().c_str(), m_trcsr, m_rxbits, m_trcsr & M6800_TRCSR_RE); + //logerror("M6800 '%s' Rx Tick TRCSR %02x bits %u check %02x\n", tag(), 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().c_str(), m_rxbits); + //logerror("M6800 '%s' Received WAKE UP bit %u\n", tag(), m_rxbits); if (m_rxbits == 10) { - //logerror("M6800 '%s' Receiver Wake Up\n", tag().c_str()); + //logerror("M6800 '%s' Receiver Wake Up\n", tag()); 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().c_str()); + //logerror("M6800 '%s' Receiver Wake Up interrupted\n", tag()); 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().c_str()); + //logerror("M6800 '%s' Received START bit\n", tag()); } break; case M6800_SERIAL_STOP: if (m6800_rx() == 1) { - //logerror("M6800 '%s' Received STOP bit\n", tag().c_str()); + //logerror("M6800 '%s' Received STOP bit\n", tag()); if (m_trcsr & M6800_TRCSR_RDRF) { // overrun error m_trcsr |= M6800_TRCSR_ORFE; - //logerror("M6800 '%s' Receive Overrun Error\n", tag().c_str()); + //logerror("M6800 '%s' Receive Overrun Error\n", tag()); 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().c_str(), m_rdr); + //logerror("M6800 '%s' Receive Data Register: %02x\n", tag(), 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().c_str()); + //logerror("M6800 '%s' Receive Framing Error\n", tag()); 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().c_str(), m_rxbits, BIT(m_rsr, 7)); + //logerror("M6800 '%s' Received DATA bit %u: %u\n", tag(), 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().c_str(), m_port3_data); + //logerror("M6801 '%s' Latched Port 3 Data: %02x\n", tag(), 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().c_str(), irqline, state)); + LOG(("M6800 '%s' set_irq_line %d,%d\n", tag(), 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().c_str(), state); + //logerror("M6801 '%s' OS3: %u\n", tag(), 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().c_str()); + logerror("M6801 '%s' Port 3 DDR is a write-only register\n", space.device().tag()); 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().c_str(),space.device().safe_pc(),offset); + logerror("M6801 '%s' PC %04x: warning - read from reserved internal register %02x\n",space.device().tag(),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().c_str(),space.device().safe_pc(),data,offset); + logerror("M6801 '%s' PC %04x: warning - write %02x to reserved internal register %02x\n",space.device().tag(),space.device().safe_pc(),data,offset); break; } } diff --git a/src/devices/cpu/m6800/m6800.h b/src/devices/cpu/m6800/m6800.h index d7b15d7822d..bb6055e8ad0 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, 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); + 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); // static configuration helpers template static devcb_base &set_out_sc2_func(device_t &device, _Object object) { return downcast(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, 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); + 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); 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + m6803_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m6808_cpu_device(const machine_config &mconfig, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + hd63701_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nsc8105_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + hd6303r_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + hd6303y_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h index 70dc66e3158..013627ac6c0 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, std::string tag, device_t *owner, UINT32 clock, + m68000_base_device(const machine_config &mconfig, const char *name, const char *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, std::string tag, device_t *owner, UINT32 clock, + m68000_base_device(const machine_config &mconfig, const char *name, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68000_base_device(const machine_config &mconfig, const char *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, 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 *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, const char *name, std::string tag, device_t *owner, UINT32 clock, + m68000_device(const machine_config &mconfig, const char *name, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68301_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68008_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68008plcc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68010_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68ec020_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68020_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68020fpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68020pmmu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68020hmmu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68ec030_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68030_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68ec040_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68lc040_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m68040_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + scc68070_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + fscpu32_device(const machine_config &mconfig, 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, + fscpu32_device(const machine_config &mconfig, const char *name, const char *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, std::string tag, device_t *owner, UINT32 clock); + mcf5206e_device(const machine_config &mconfig, const char *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 a28fadc0bfd..dc7e0b14a6f 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; // h6280_device - constructor //------------------------------------------------- -m68000_base_device::m68000_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *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, std::strin -m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, std::string tag, device_t *owner, UINT32 clock, +m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, const char *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, std::string tag, device_t *owner, UINT32 clock, +m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, const char *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; const device_type FSCPU32 = &device_creator; const device_type MCF5206E = &device_creator; -m68000_device::m68000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m68000_device::m68000_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +m68000_device::m68000_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock, +m68000_device::m68000_device(const machine_config &mconfig, const char *name, const char *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, st -m68301_device::m68301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m68301_device::m68301_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68008_device::m68008_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68008plcc_device::m68008plcc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68010_device::m68010_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68020_device::m68020_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68020fpu_device::m68020fpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68020pmmu_device::m68020pmmu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68020hmmu_device::m68020hmmu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68ec020_device::m68ec020_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68030_device::m68030_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68ec030_device::m68ec030_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68040_device::m68040_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68ec040_device::m68ec040_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m68lc040_device::m68lc040_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scc68070_device::scc68070_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock, +fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *name, const char *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, std::string tag, device_t *owner, UINT32 clock) +mcf5206e_device::mcf5206e_device(const machine_config &mconfig, const char *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 82d028b625a..e3884c55195 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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().c_str(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir); + (mc68kcpu)->tag(), 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 ee17d503f8b..0bb5ac3877e 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, std::string 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, const char *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 e811d1b013c..40fd8b3db9b 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) + m6805_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + m68hc05eg_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + m68705_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + hd63705_device(const machine_config &mconfig, const char *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 108d697bea1..712c6bcf45e 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 - constructor //------------------------------------------------- -hd6309_device::hd6309_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +hd6309_device::hd6309_device(const machine_config &mconfig, const char *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 9b45e1f3ce3..3221261660c 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, std::string tag, device_t *owner, UINT32 clock); + hd6309_device(const machine_config &mconfig, const char *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 8406f5d20d9..618b298fcc7 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 - constructor //------------------------------------------------- -konami_cpu_device::konami_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +konami_cpu_device::konami_cpu_device(const machine_config &mconfig, const char *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 d791803ca4e..957a4c4d3e5 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, std::string tag, device_t *owner, UINT32 clock); + konami_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // configuration template static devcb_base &set_line_callback(device_t &device, _Object object) { return downcast(device).m_set_lines.set_callback(object); } diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp index 51917b588a2..61337f180f0 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; // m6809_base_device - constructor //------------------------------------------------- -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +m6809_device::m6809_device(const machine_config &mconfig, const char *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, std::string tag, devic // m6809e_device //------------------------------------------------- -m6809e_device::m6809e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m6809e_device::m6809e_device(const machine_config &mconfig, const char *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 f485c331897..a992be78789 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + m6809_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m6809e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_lic_cb(device_t &device, _Object object) { return downcast(device).m_lic_func.set_callback(object); } diff --git a/src/devices/cpu/mb86233/mb86233.cpp b/src/devices/cpu/mb86233/mb86233.cpp index 815b0e1f1e0..341309d8c12 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mb86233_cpu_device::mb86233_cpu_device(const machine_config &mconfig, const char *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 060add7befb..26fc5b3e9f6 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, std::string tag, device_t *owner, UINT32 clock); + mb86233_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_fifo_read_cb(device_t &device, _Object object) { return downcast(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 535316c28e7..edcc6a0471f 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, std::string tag, device_t *owner, UINT32 clock) +mb86235_cpu_device::mb86235_cpu_device(const machine_config &mconfig, const char *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 2d8d93a390f..35f586c7290 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, std::string _tag, device_t *_owner, UINT32 _clock); + mb86235_cpu_device(const machine_config &mconfig, const char *_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 ea2a6a5d79d..9ab07538e6e 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, std::string tag, device_t *owner, UINT32 clock) +mb88_cpu_device::mb88_cpu_device(const machine_config &mconfig, const char *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, std::string tag, } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +mb88201_cpu_device::mb88201_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mb88202_cpu_device::mb88202_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mb8841_cpu_device::mb8841_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mb8842_cpu_device::mb8842_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mb8843_cpu_device::mb8843_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mb8844_cpu_device::mb8844_cpu_device(const machine_config &mconfig, const char *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 0955093e652..6dc4252f706 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, 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); + 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); // static configuration helpers static void set_pla(device_t &device, UINT8 *pla) { downcast(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, std::string tag, device_t *owner, UINT32 clock); + mb88201_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mb88202_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mb8841_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mb8842_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mb8843_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mb8844_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/mc68hc11/mc68hc11.cpp b/src/devices/cpu/mc68hc11/mc68hc11.cpp index 5377f4d8204..a208a618c4b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc68hc11_cpu_device::mc68hc11_cpu_device(const machine_config &mconfig, const char *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 f5241d69631..047a1f559e2 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, std::string tag, device_t *owner, UINT32 clock); + mc68hc11_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // I/O enable flag static void set_has_extended_io(device_t &device, int has_extended_io) { downcast(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 751682e8a06..b49899ca498 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8021_device::i8021_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8022_device::i8022_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8035_device::i8035_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8048_device::i8048_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8648_device::i8648_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8748_device::i8748_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8039_device::i8039_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8049_device::i8049_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8749_device::i8749_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8040_device::i8040_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8050_device::i8050_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mb8884_device::mb8884_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +n7751_device::n7751_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m58715_device::m58715_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8041_device::i8041_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8741_device::i8741_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8042_device::i8042_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8242_device::i8242_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8742_device::i8742_device(const machine_config &mconfig, const char *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 785a53c1092..a916ccd2016 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + i8021_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + i8022_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + i8035_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8048_device : public mcs48_cpu_device { public: // construction/destruction - i8048_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8048_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8648_device : public mcs48_cpu_device { public: // construction/destruction - i8648_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8648_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8748_device : public mcs48_cpu_device { public: // construction/destruction - i8748_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8748_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8039_device : public mcs48_cpu_device { public: // construction/destruction - i8039_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8039_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8049_device : public mcs48_cpu_device { public: // construction/destruction - i8049_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8049_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8749_device : public mcs48_cpu_device { public: // construction/destruction - i8749_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8749_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8040_device : public mcs48_cpu_device { public: // construction/destruction - i8040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8050_device : public mcs48_cpu_device { public: // construction/destruction - i8050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class mb8884_device : public mcs48_cpu_device { public: // construction/destruction - mb8884_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mb8884_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class n7751_device : public mcs48_cpu_device { public: // construction/destruction - n7751_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + n7751_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class m58715_device : public mcs48_cpu_device { public: // construction/destruction - m58715_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m58715_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + i8041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8741_device : public upi41_cpu_device { public: // construction/destruction - i8741_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8741_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8042_device : public upi41_cpu_device { public: // construction/destruction - i8042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8242_device : public upi41_cpu_device { public: // construction/destruction - i8242_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8742_device : public upi41_cpu_device { public: // construction/destruction - i8742_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8742_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp index 8f31b856ab4..f3d5816d722 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8031_device::i8031_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8051_device::i8051_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8751_device::i8751_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8052_device::i8052_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8032_device::i8032_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8752_device::i8752_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i80c31_device::i80c31_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +i80c51_device::i80c51_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i87c51_device::i87c51_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +i80c52_device::i80c52_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i80c32_device::i80c32_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i87c52_device::i87c52_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +at89c4051_device::at89c4051_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ds5002fp_device::ds5002fp_device(const machine_config &mconfig, const char *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().c_str(), (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(), (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().c_str(), (UINT32)offset,PC)); + LOG(("mcs51 '%s': attemping to read an invalid/non-implemented SFR address: %x at 0x%04x\n", tag(), (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().c_str(), PC, d)) -#define DS5_LOGR(a, d) LOG(("ds5002fp '%s': read from " # a " register at 0x%04x\n", tag().c_str(), PC)) +#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)) 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().c_str(), PC)); + LOG(("ds5002fp '%s': TA window initiated at 0x%04x\n", tag(), 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 6c7a7c9924a..7b769de24ad 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + i8031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8051_device : public mcs51_cpu_device { public: // construction/destruction - i8051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8751_device : public mcs51_cpu_device { public: // construction/destruction - i8751_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8751_device(const machine_config &mconfig, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + i8032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i8752_device : public i8052_device { public: // construction/destruction - i8752_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i8752_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i80c31_device : public i8052_device { public: // construction/destruction - i80c31_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i80c31_device(const machine_config &mconfig, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + i87c51_device(const machine_config &mconfig, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + i80c32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class i87c52_device : public i80c52_device { public: // construction/destruction - i87c52_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i87c52_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class at89c4051_device : public i80c51_device { public: // construction/destruction - at89c4051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + at89c4051_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ds5002fp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_mcon(device_t &device, UINT8 mcon) { downcast(device).m_ds5002fp.mcon = mcon; } static void set_rpctl(device_t &device, UINT8 rpctl) { downcast(device).m_ds5002fp.rpctl = rpctl; } diff --git a/src/devices/cpu/mcs51/mcs51ops.inc b/src/devices/cpu/mcs51/mcs51ops.inc index 1a8612a7684..e60cc3505eb 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().c_str(), PC-1, r)); + LOG(("i8051 '%s': illegal opcode at 0x%03x: %02x\n", tag(), PC-1, r)); } diff --git a/src/devices/cpu/mcs96/i8x9x.cpp b/src/devices/cpu/mcs96/i8x9x.cpp index 894ef99d654..f235cf90c28 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, std::string 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, const char *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().c_str(), hso_command, hso_time, i, PPC); + logerror("%s: hso cam %02x %04x in slot %d (%04x)\n", tag(), 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().c_str(), data, PPC); + logerror("%s: hsi_mode %02x (%04x)\n", tag(), 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().c_str(), data, PPC); + logerror("%s: sbuf %02x (%04x)\n", tag(), 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().c_str(), data, PPC); + logerror("%s: int_pending %02x (%04x)\n", tag(), data, PPC); break; case 0x0a: - logerror("%s: watchdog %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: watchdog %02x (%04x)\n", tag(), data, PPC); break; case 0x0e: - logerror("%s: baud rate %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: baud rate %02x (%04x)\n", tag(), data, PPC); break; case 0x0f: - logerror("%s: io port 1 %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: io port 1 %02x (%04x)\n", tag(), data, PPC); io->write_word(P1*2, data); break; case 0x10: - logerror("%s: io port 2 %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: io port 2 %02x (%04x)\n", tag(), data, PPC); io->write_word(P2*2, data); break; case 0x11: - logerror("%s: sp con %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: sp con %02x (%04x)\n", tag(), data, PPC); break; case 0x15: - logerror("%s: ioc0 %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: ioc0 %02x (%04x)\n", tag(), data, PPC); ioc0 = data; break; case 0x16: - logerror("%s: ioc1 %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: ioc1 %02x (%04x)\n", tag(), data, PPC); ioc1 = data; break; case 0x17: - logerror("%s: pwm control %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: pwm control %02x (%04x)\n", tag(), 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().c_str(), PPC); + logerror("%s: read hsi time l (%04x)\n", tag(), PPC); return 0x00; case 0x05: - logerror("%s: read hsi time h (%04x)\n", tag().c_str(), PPC); + logerror("%s: read hsi time h (%04x)\n", tag(), PPC); return 0x00; case 0x06: - logerror("%s: read hsi status (%04x)\n", tag().c_str(), PPC); + logerror("%s: read hsi status (%04x)\n", tag(), PPC); return 0x00; case 0x07: - logerror("%s: read sbuf %02x (%04x)\n", tag().c_str(), sbuf, PPC); + logerror("%s: read sbuf %02x (%04x)\n", tag(), sbuf, PPC); return sbuf; case 0x08: return PSW; case 0x09: - logerror("%s: read int pending (%04x)\n", tag().c_str(), PPC); + logerror("%s: read int pending (%04x)\n", tag(), PPC); return pending_irq; case 0x0a: - logerror("%s: read timer1 l (%04x)\n", tag().c_str(), PPC); + logerror("%s: read timer1 l (%04x)\n", tag(), PPC); return timer_value(1, total_cycles()); case 0x0b: - logerror("%s: read timer1 h (%04x)\n", tag().c_str(), PPC); + logerror("%s: read timer1 h (%04x)\n", tag(), PPC); return timer_value(1, total_cycles()) >> 8; case 0x0c: - logerror("%s: read timer2 l (%04x)\n", tag().c_str(), PPC); + logerror("%s: read timer2 l (%04x)\n", tag(), PPC); return timer_value(2, total_cycles()); case 0x0d: - logerror("%s: read timer2 h (%04x)\n", tag().c_str(), PPC); + logerror("%s: read timer2 h (%04x)\n", tag(), 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().c_str(), io->read_word(P0*2)); + logerror("%s: read p0 %02x\n", tag(), 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().c_str(), res, PPC); + logerror("%s: read sp stat %02x (%04x)\n", tag(), res, PPC); return res; } case 0x15: - logerror("%s: read ios 0 %02x (%04x)\n", tag().c_str(), ios0, PPC); + logerror("%s: read ios 0 %02x (%04x)\n", tag(), 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().c_str(), adr, PPC); + logerror("%s: io_r8 %02x (%04x)\n", tag(), 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().c_str(), PPC); + logerror("%s: read hsi time (%04x)\n", tag(), PPC); return 0x0000; case 0x0a: return timer_value(1, total_cycles()); case 0x0c: - logerror("%s: read timer2 (%04x)\n", tag().c_str(), PPC); + logerror("%s: read timer2 (%04x)\n", tag(), 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().c_str(), cam.command & 0x0f); + logerror("%s: Action %x unimplemented\n", tag(), 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().c_str(), cmd, t, i); + tag(), 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().c_str(), hso_cam_hold.command, hso_cam_hold.time, i); + logerror("%s: hso cam %02x %04x in slot %d from hold\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) : +c8095_device::c8095_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : i8x9x_device(mconfig, C8095, "C8095", tag, owner, clock, "c8095", __FILE__) { } -p8098_device::p8098_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +p8098_device::p8098_device(const machine_config &mconfig, const char *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 7b0d58f0cd8..f71dc2f6b24 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + i8x9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); void serial_w(UINT8 val); @@ -84,12 +84,12 @@ private: class c8095_device : public i8x9x_device { public: - c8095_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + c8095_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class p8098_device : public i8x9x_device { public: - p8098_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + p8098_device(const machine_config &mconfig, const char *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 151b1f4b871..19553280de2 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, std::string 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, const char *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().c_str(), adr, data, PPC); + logerror("%s: io_w8 %02x, %02x (%04x)\n", tag(), 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().c_str(), adr, data, PPC); + logerror("%s: io_r8 %02x, %02x (%04x)\n", tag(), 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().c_str(), adr, data, PPC); + logerror("%s: io_r16 %02x, %04x (%04x)\n", tag(), adr, data, PPC); return data; } diff --git a/src/devices/cpu/mcs96/i8xc196.h b/src/devices/cpu/mcs96/i8xc196.h index b6584fcd84f..746224a39f7 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + i8xc196_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); static const disasm_entry disasm_entries[0x100]; diff --git a/src/devices/cpu/mcs96/mcs96.cpp b/src/devices/cpu/mcs96/mcs96.cpp index 1452971be5a..3c8284f8555 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, std::string 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, const char *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().c_str(), data, PPC); + logerror("%s: ad_command %02x (%04x)\n", tag(), data, PPC); break; case 0x03: - logerror("%s: hsi_mode %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: hsi_mode %02x (%04x)\n", tag(), data, PPC); break; case 0x04: - logerror("%s: hso_time.l %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: hso_time.l %02x (%04x)\n", tag(), data, PPC); break; case 0x05: - logerror("%s: hso_time.h %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: hso_time.h %02x (%04x)\n", tag(), data, PPC); break; case 0x06: - logerror("%s: hso_command %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: hso_command %02x (%04x)\n", tag(), data, PPC); break; case 0x07: - logerror("%s: sbuf %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: sbuf %02x (%04x)\n", tag(), data, PPC); break; case 0x08: PSW = (PSW & 0xff00) | data; break; case 0x09: - logerror("%s: int_pending %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: int_pending %02x (%04x)\n", tag(), data, PPC); break; case 0x0a: - logerror("%s: watchdog %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: watchdog %02x (%04x)\n", tag(), data, PPC); break; case 0x0e: - logerror("%s: baud rate %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: baud rate %02x (%04x)\n", tag(), data, PPC); break; case 0x0f: - logerror("%s: io port 1 %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: io port 1 %02x (%04x)\n", tag(), data, PPC); break; case 0x10: - logerror("%s: io port 2 %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: io port 2 %02x (%04x)\n", tag(), data, PPC); break; case 0x11: - logerror("%s: sp con %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: sp con %02x (%04x)\n", tag(), data, PPC); break; case 0x15: - logerror("%s: ioc0 %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: ioc0 %02x (%04x)\n", tag(), data, PPC); break; case 0x16: - logerror("%s: ioc1 %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: ioc1 %02x (%04x)\n", tag(), data, PPC); break; case 0x17: - logerror("%s: pwm control %02x (%04x)\n", tag().c_str(), data, PPC); + logerror("%s: pwm control %02x (%04x)\n", tag(), 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().c_str(), data, PPC); + logerror("%s: hso_time %04x (%04x)\n", tag(), 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().c_str(), adr, data, PPC); + logerror("%s: io_r8 %02x, %02x (%04x)\n", tag(), 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().c_str(), adr, data, PPC); + logerror("%s: io_r16 %02x, %04x (%04x)\n", tag(), adr, data, PPC); return data; } diff --git a/src/devices/cpu/mcs96/mcs96.h b/src/devices/cpu/mcs96/mcs96.h index b662fb946e3..0111361899c 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, std::string 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, const char *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 9c4584b429d..c109c28b446 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, std::string tag, device_t *owner, UINT32 clock) +m58846_device::m58846_device(const machine_config &mconfig, const char *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 96d08a54dff..9d56cf9e216 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, std::string tag, device_t *owner, UINT32 clock); + m58846_device(const machine_config &mconfig, const char *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 d00f3651e21..b0aa67fd6d4 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, 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) + 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) : 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 86ef4a57991..4f77764a66b 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().c_str(), m_op, m_prev_pc); + logerror("%s unknown opcode $%03X at $%04X\n", tag(), m_op, m_prev_pc); } diff --git a/src/devices/cpu/minx/minx.cpp b/src/devices/cpu/minx/minx.cpp index ccab75b4dc3..bae0338da76 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +minx_cpu_device::minx_cpu_device(const machine_config &mconfig, const char *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 03a7ebe55e6..a31db6ab7a0 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, std::string tag, device_t *owner, UINT32 clock); + minx_cpu_device(const machine_config &mconfig, const char *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 d25fd2ee019..f4747b7304c 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; const device_type RM7000LE = &device_creator; -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) +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) : 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 ad61d8bce02..9e0de9ed419 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, std::string 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, const char *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(device).c_icache_size = icache_size; } static void set_dcache_size(device_t &device, size_t dcache_size) { downcast(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, std::string tag, device_t *owner, UINT32 clock) + vr4300be_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + vr4300le_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + vr4310be_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + vr4310le_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + r4600be_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + r4600le_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + r4650be_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + r4650le_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + r4700be_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + r4700le_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + r5000be_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + r5000le_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + qed5271be_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + qed5271le_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + rm7000be_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + rm7000le_device(const machine_config &mconfig, const char *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 aa7901a4100..f14c6adc93f 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; // r3000_device - constructor //------------------------------------------------- -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +r3041_device::r3041_device(const machine_config &mconfig, const char *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, std::string tag, devic // r3051_device - constructor //------------------------------------------------- -r3051_device::r3051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +r3051_device::r3051_device(const machine_config &mconfig, const char *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, std::string tag, devic // r3052_device - constructor //------------------------------------------------- -r3052_device::r3052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +r3052_device::r3052_device(const machine_config &mconfig, const char *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, std::string tag, devic // r3071_device - constructor //------------------------------------------------- -r3071_device::r3071_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +r3071_device::r3071_device(const machine_config &mconfig, const char *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, std::string tag, devic // r3081_device - constructor //------------------------------------------------- -r3081_device::r3081_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +r3081_device::r3081_device(const machine_config &mconfig, const char *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 43606614112..a7541eaab85 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + r3041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; @@ -277,7 +277,7 @@ public: class r3051_device : public r3000_device { public: - r3051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + r3051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; @@ -286,7 +286,7 @@ public: class r3052_device : public r3000_device { public: - r3052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + r3052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; @@ -295,7 +295,7 @@ public: class r3071_device : public r3000_device { public: - r3071_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + r3071_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; @@ -304,7 +304,7 @@ public: class r3081_device : public r3000_device { public: - r3081_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + r3081_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/mn10200/mn10200.cpp b/src/devices/cpu/mn10200/mn10200.cpp index c970f1b4cc9..1b4af66e13f 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, std::string tag, device_t *owner, UINT32 clock) +mn1020012a_device::mn1020012a_device(const machine_config &mconfig, const char *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 0d6f0c75f13..38073fb8e27 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + mn1020012a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/nec/nec.cpp b/src/devices/cpu/nec/nec.cpp index f285dc124c5..42ef74df7d5 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; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +v20_device::v20_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +v30_device::v30_device(const machine_config &mconfig, const char *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, std::string 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, std::string tag, device_t *owner, UINT32 clock) +v33_device::v33_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +v33a_device::v33a_device(const machine_config &mconfig, const char *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 ff0021fcc86..c0c1fa82327 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, 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); + 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); protected: // device-level overrides @@ -399,27 +399,27 @@ union necbasicregs class v20_device : public nec_common_device { public: - v20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class v30_device : public nec_common_device { public: - v30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class v33_device : public nec_common_device { public: - v33_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v33_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class v33a_device : public nec_common_device { public: - v33a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v33a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/nec/v25.cpp b/src/devices/cpu/nec/v25.cpp index 1680219979a..c5e62446cb0 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; const device_type V35 = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +v25_device::v25_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +v35_device::v35_device(const machine_config &mconfig, const char *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 4a7129e531a..1cd5ab91012 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, 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); + 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); // static configuration helpers static void set_decryption_table(device_t &device, const UINT8 *decryption_table) { downcast(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, std::string tag, device_t *owner, UINT32 clock); + v25_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class v35_device : public v25_common_device { public: - v35_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v35_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/nec/v53.cpp b/src/devices/cpu/nec/v53.cpp index 2eb90940d99..23e0dec6991 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +v53_device::v53_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +v53a_device::v53a_device(const machine_config &mconfig, const char *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 0a922b20c4b..6afdd1c4f39 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + v53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class v53a_device : public v53_base_device { public: - v53a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v53a_device(const machine_config &mconfig, const char *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 0c1df520890..78fc92a8270 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, std::string tag, device_t *owner, UINT32 clock) +patinho_feio_cpu_device::patinho_feio_cpu_device(const machine_config &mconfig, const char *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 c2b5e1bd7ba..df80799d592 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, std::string _tag, device_t *_owner, UINT32 _clock); + patinho_feio_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); template static devcb_base &set_rc_read_callback(device_t &device, _Object object) { return downcast(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 d27a51fabb5..cbb43535d7f 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pdp1_device::pdp1_device(const machine_config &mconfig, const char *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 6b390ebba0a..2cb01f5c20b 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, std::string tag, device_t *owner, UINT32 clock); + pdp1_device(const machine_config &mconfig, const char *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 4e6c40636d5..3a4fd7f1fb1 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; const device_type TX0_64KW = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +tx0_8kw_device::tx0_8kw_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tx0_64kw_device::tx0_64kw_device(const machine_config &mconfig, const char *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 21b737d9531..73d7d7705f1 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, std::string 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, const char *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 static devcb_base &set_cpy_cb(device_t &device, _Object object) { return downcast(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, std::string _tag, device_t *_owner, UINT32 _clock); + tx0_8kw_device(const machine_config &mconfig, const char *_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, std::string _tag, device_t *_owner, UINT32 _clock); + tx0_64kw_device(const machine_config &mconfig, const char *_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 b8f2a75d4cc..2679c7e9205 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 - constructor //------------------------------------------------- -pdp8_device::pdp8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pdp8_device::pdp8_device(const machine_config &mconfig, const char *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 7a38f0ad9d4..66f04682d7e 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, std::string tag, device_t *owner, UINT32 clock); + pdp8_device(const machine_config &mconfig, const char *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 42e9e6d998b..c568b27b4c7 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +pic16c54_device::pic16c54_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pic16c55_device::pic16c55_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pic16c56_device::pic16c56_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pic16c57_device::pic16c57_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pic16c58_device::pic16c58_device(const machine_config &mconfig, const char *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 c50779b9cc9..c3d2480fd86 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, int picmodel); // static configuration helpers template static devcb_base &set_read_a_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + pic16c54_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pic16c55_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pic16c56_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pic16c57_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pic16c58_device(const machine_config &mconfig, const char *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 7d14c93a289..9fb6e2324ab 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +pic16c620_device::pic16c620_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pic16c620a_device::pic16c620a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pic16c621_device::pic16c621_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pic16c621a_device::pic16c621a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pic16c622_device::pic16c622_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +pic16c622a_device::pic16c622a_device(const machine_config &mconfig, const char *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 b028f80255b..7e8af51ca40 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + pic16c620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class pic16c620a_device : public pic16c62x_device { public: // construction/destruction - pic16c620a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pic16c620a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pic16cr620a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }*/ class pic16c621_device : public pic16c62x_device { public: // construction/destruction - pic16c621_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pic16c621_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class pic16c621a_device : public pic16c62x_device { public: // construction/destruction - pic16c621a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pic16c621a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class pic16c622_device : public pic16c62x_device { public: // construction/destruction - pic16c622_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pic16c622_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class pic16c622a_device : public pic16c62x_device { public: // construction/destruction - pic16c622a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pic16c622a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/powerpc/ppc.h b/src/devices/cpu/powerpc/ppc.h index 87c1bb2e8bc..5e40ee88249 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, 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); + 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); static void set_bus_frequency(device_t &device, UINT32 bus_frequency) { downcast(device).c_bus_frequency = bus_frequency; } @@ -681,7 +681,7 @@ protected: //class ppc403_device : public ppc_device //{ //public: -// ppc403_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); +// ppc403_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); +// ppc405_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ppc603_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppc603e_device : public ppc_device { public: - ppc603e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppc603e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppc603r_device : public ppc_device { public: - ppc603r_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppc603r_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppc602_device : public ppc_device { public: - ppc602_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppc602_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class mpc8240_device : public ppc_device { public: - mpc8240_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mpc8240_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppc601_device : public ppc_device { public: - ppc601_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppc601_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppc604_device : public ppc_device { public: - ppc604_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppc604_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + ppc403ga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppc403gcx_device : public ppc4xx_device { public: - ppc403gcx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppc403gcx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppc405gp_device : public ppc4xx_device { public: - ppc405gp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppc405gp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/powerpc/ppccom.cpp b/src/devices/cpu/powerpc/ppccom.cpp index 3517e3b880f..9036ff2c794 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; const device_type PPC405GP = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +//ppc403_device::ppc403_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +//ppc405_device::ppc405_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ppc603_device::ppc603_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ppc603e_device::ppc603e_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ppc603r_device::ppc603r_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ppc602_device::ppc602_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mpc8240_device::mpc8240_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ppc601_device::ppc601_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ppc604_device::ppc604_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +ppc403ga_device::ppc403ga_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ppc403gcx_device::ppc403gcx_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ppc405gp_device::ppc405gp_device(const machine_config &mconfig, const char *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 2aa7dd02ad0..43c79059d4b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pps4_device::pps4_device(const machine_config &mconfig, const char *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 760df191c53..a2797668751 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, std::string tag, device_t *owner, UINT32 clock); + pps4_device(const machine_config &mconfig, const char *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 948ca96dba2..f2f048c39ff 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +psxdma_device::psxdma_device(const machine_config &mconfig, const char *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 792810f561c..e241dfac9ac 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, std::string tag, device_t *owner, UINT32 clock); + psxdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/cpu/psx/irq.cpp b/src/devices/cpu/psx/irq.cpp index 72c55f2614a..4a2293d758c 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +psxirq_device::psxirq_device(const machine_config &mconfig, const char *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 97ccb96b681..69e95207230 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, std::string tag, device_t *owner, UINT32 clock); + psxirq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/cpu/psx/mdec.cpp b/src/devices/cpu/psx/mdec.cpp index d732719b524..3c0148525d5 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +psxmdec_device::psxmdec_device(const machine_config &mconfig, const char *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 594b9a73a48..e3065bacb95 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, std::string tag, device_t *owner, UINT32 clock); + psxmdec_device(const machine_config &mconfig, const char *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 f0dc65f180b..c3e2e340d24 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock ) +cxd8530aq_device::cxd8530aq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock ) : psxcpu_device( mconfig, CXD8661R, "CXD8530AQ", tag, owner, clock, "cxd8530aq", __FILE__ ) { } -cxd8530bq_device::cxd8530bq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +cxd8530bq_device::cxd8530bq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock ) : psxcpu_device( mconfig, CXD8661R, "CXD8530BQ", tag, owner, clock, "cxd8530bq", __FILE__ ) { } -cxd8530cq_device::cxd8530cq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +cxd8530cq_device::cxd8530cq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock ) : psxcpu_device( mconfig, CXD8661R, "CXD8530CQ", tag, owner, clock, "cxd8530cq", __FILE__ ) { } -cxd8661r_device::cxd8661r_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +cxd8661r_device::cxd8661r_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock ) : psxcpu_device( mconfig, CXD8661R, "CXD8661R", tag, owner, clock, "cxd8661r", __FILE__ ) { } -cxd8606bq_device::cxd8606bq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +cxd8606bq_device::cxd8606bq_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock ) : psxcpu_device( mconfig, CXD8606BQ, "CXD8606BQ", tag, owner, clock, "cxd8606bq", __FILE__ ) { } -cxd8606cq_device::cxd8606cq_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +cxd8606cq_device::cxd8606cq_device( const machine_config &mconfig, const char *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 c80e8d0bcc6..98b15819f32 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + cxd8530aq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class cxd8530bq_device : public psxcpu_device { public: // construction/destruction - cxd8530bq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cxd8530bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class cxd8530cq_device : public psxcpu_device { public: // construction/destruction - cxd8530cq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cxd8530cq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class cxd8661r_device : public psxcpu_device { public: // construction/destruction - cxd8661r_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cxd8661r_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class cxd8606bq_device : public psxcpu_device { public: // construction/destruction - cxd8606bq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cxd8606bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class cxd8606cq_device : public psxcpu_device { public: // construction/destruction - cxd8606cq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cxd8606cq_device(const machine_config &mconfig, const char *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 f19240797aa..f3e34a7cff8 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +psxrcnt_device::psxrcnt_device(const machine_config &mconfig, const char *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 87151834632..b3b610ed8a8 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, std::string tag, device_t *owner, UINT32 clock); + psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq0_handler(device_t &device, _Object object) { return downcast(device).m_irq0_handler.set_callback(object); } diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp index 63b05dca64d..ba057dd01e1 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; const device_type PSX_SIO1 = &device_creator; -psxsio0_device::psxsio0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +psxsio0_device::psxsio0_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +psxsio1_device::psxsio1_device(const machine_config &mconfig, const char *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, std::string 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, 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_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().c_str() ); + verboselog( *this, 1, "sio_interrupt( %s )\n", tag() ); 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().c_str(), n_time.as_string(), 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 ); } else { n_time = attotime::never; - verboselog( *this, 0, "sio_timer_adjust( %s ) invalid baud rate ( %d x %d )\n", tag().c_str(), n_prescaler, m_baud ); + verboselog( *this, 0, "sio_timer_adjust( %s ) invalid baud rate ( %d x %d )\n", tag(), n_prescaler, m_baud ); } } else { n_time = attotime::never; - verboselog( *this, 2, "sio_timer_adjust( %s ) finished\n", tag().c_str() ); + verboselog( *this, 2, "sio_timer_adjust( %s ) finished\n", tag() ); } 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().c_str(), data, mem_mask ); + verboselog( *this, 1, "psx_sio_w %s data %02x (%08x)\n", tag(), 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().c_str(), data & 0xffff ); + verboselog( *this, 1, "psx_sio_w %s mode %04x\n", tag(), data & 0xffff ); } if( ACCESSING_BITS_16_31 ) { - verboselog( *this, 1, "psx_sio_w %s control %04x\n", tag().c_str(), data >> 16 ); + verboselog( *this, 1, "psx_sio_w %s control %04x\n", tag(), 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().c_str(), data >> 16 ); + verboselog( *this, 1, "psx_sio_w %s baud %04x\n", tag(), 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().c_str(), data, mem_mask ); + verboselog( *this, 1, "psx_sio_r %s data %02x (%08x)\n", tag(), 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().c_str(), data & 0xffff ); + verboselog( *this, 1, "psx_sio_r %s status %04x\n", tag(), 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().c_str(), data & 0xffff ); + verboselog( *this, 1, "psx_sio_r %s mode %04x\n", tag(), data & 0xffff ); } if( ACCESSING_BITS_16_31 ) { - verboselog( *this, 1, "psx_sio_r %s control %04x\n", tag().c_str(), data >> 16 ); + verboselog( *this, 1, "psx_sio_r %s control %04x\n", tag(), 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().c_str(), data >> 16 ); + verboselog( *this, 1, "psx_sio_r %s baud %04x\n", tag(), data >> 16 ); } break; default: diff --git a/src/devices/cpu/psx/sio.h b/src/devices/cpu/psx/sio.h index 04c578a50c6..93d8428bc9e 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class psxsio1_device : public psxsio_device { public: - psxsio1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + psxsio1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; #endif diff --git a/src/devices/cpu/rsp/rsp.cpp b/src/devices/cpu/rsp/rsp.cpp index 35e145f854e..1939cb33b5f 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, std::string tag, device_t *owner, UINT32 clock) +rsp_device::rsp_device(const machine_config &mconfig, const char *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 57d04b1a893..93215bd0649 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, std::string _tag, device_t *_owner, UINT32 _clock); + rsp_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); void resolve_cb(); template static devcb_base &static_set_dp_reg_r_callback(device_t &device, _Object object) { return downcast(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 5aa95776e8f..8a257ff5a9e 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s2650_device::s2650_device(const machine_config &mconfig, const char *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 64175dbbbe2..cd5dc1c12f1 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, std::string tag, device_t *owner, UINT32 clock); + s2650_device(const machine_config &mconfig, const char *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 2dd772c5e36..8f7420584e3 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().c_str(), #x, __FILE__, __LINE__, m_pc); } while (0) + do { if (!(x)) logerror("SATURN '%s' assertion failed: %s at %s:%i, pc=%05x\n", tag(), #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().c_str(), m_pc-4 )); + LOG(( "SATURN '%s' at %05x: INTON\n", tag(), m_pc-4 )); m_irq_enable=1; if (m_irq_state) { - LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", tag().c_str())); + LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", tag())); m_pending_irq=1; } } void saturn_device::saturn_interrupt_off() { - LOG(( "SATURN '%s' at %05x: INTOFF\n", tag().c_str(), m_pc-4 )); + LOG(( "SATURN '%s' at %05x: INTOFF\n", tag(), m_pc-4 )); m_irq_enable=0; } void saturn_device::saturn_reset_interrupt() { - LOG(( "SATURN '%s' at %05x: RSI\n", tag().c_str(), m_pc-5 )); + LOG(( "SATURN '%s' at %05x: RSI\n", tag(), 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().c_str(), m_pc-3 )); + LOG(( "SATURN '%s' at %05x: SHUTDN\n", tag(), m_pc-3 )); } void saturn_device::saturn_bus_command_b() { - logerror( "SATURN '%s' at %05x: BUSCB opcode not handled\n", tag().c_str(), m_pc-4 ); + logerror( "SATURN '%s' at %05x: BUSCB opcode not handled\n", tag(), m_pc-4 ); } void saturn_device::saturn_bus_command_c() { - logerror( "SATURN '%s' at %05x: BUSCC opcode not handled\n", tag().c_str(), m_pc-3 ); + logerror( "SATURN '%s' at %05x: BUSCC opcode not handled\n", tag(), m_pc-3 ); } void saturn_device::saturn_bus_command_d() { - logerror( "SATURN '%s' at %05x: BUSCD opcode not handled\n", tag().c_str(), m_pc-4 ); + logerror( "SATURN '%s' at %05x: BUSCD opcode not handled\n", tag(), m_pc-4 ); } void saturn_device::saturn_serial_request() { - logerror( "SATURN '%s' at %05x: SREQ? opcode not handled\n", tag().c_str(), m_pc-3 ); + logerror( "SATURN '%s' at %05x: SREQ? opcode not handled\n", tag(), 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().c_str(), m_pc-3 ); + tag(), 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().c_str(), m_pc-2 )); + LOG(( "SATURN '%s' at %05x: RTI\n", tag(), 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 63fae9ba630..f8b5398973c 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().c_str(), op1, op2, op3, m_pc-3 ); + tag(), 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().c_str(), op1, op2, op3, op4, m_pc-4 ); + tag(), 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().c_str(), op1, op2, op3, op4, op5, m_pc-5 ); + tag(), 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().c_str(), op1, op2, op3, op4, op5, op6, m_pc-6 ); + tag(), 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 12f64f83d59..3e25ae6b76f 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saturn_device::saturn_device(const machine_config &mconfig, const char *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().c_str(), m_pc)); + LOG(("Saturn '%s' takes IRQ ($%04x)\n", tag(), 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().c_str())); + LOG(( "SATURN '%s' set_nmi_line(ASSERT)\n", tag())); 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().c_str())); + LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", tag())); 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().c_str())); + LOG(( "SATURN '%s' set_wakeup_line(ASSERT)\n", tag())); 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 d4e8bec7f0e..28de3e41910 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, std::string tag, device_t *owner, UINT32 clock); + saturn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_out_func(device_t &device, _Object object) { return downcast(device).m_out_func.set_callback(object); } diff --git a/src/devices/cpu/sc61860/sc61860.cpp b/src/devices/cpu/sc61860/sc61860.cpp index fd511b85d07..27251e10e78 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sc61860_device::sc61860_device(const machine_config &mconfig, const char *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 da04f8fbc0b..855d0d91e21 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, std::string tag, device_t *owner, UINT32 clock); + sc61860_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_reset_cb(device_t &device, _Object object) { return downcast(device).m_reset.set_callback(object); } diff --git a/src/devices/cpu/scmp/scmp.cpp b/src/devices/cpu/scmp/scmp.cpp index feffb86fcc4..2e1cf4cd021 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; const device_type INS8060 = &device_creator; -scmp_device::scmp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +scmp_device::scmp_device(const machine_config &mconfig, const char *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, std::string tag, device_ } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +ins8060_device::ins8060_device(const machine_config &mconfig, const char *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 4efb1d531c6..03f284589eb 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, 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); + 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); // static configuration helpers template static devcb_base &set_flag_out_cb(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + ins8060_device(const machine_config &mconfig, const char *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 267eb101535..984f832b464 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, std::string tag, device_t *owner, UINT32 clock) +score7_cpu_device::score7_cpu_device(const machine_config &mconfig, const char *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().c_str(), GET_CR_OP(m_op) & 0x07, m_ppc); + fatalerror("%s: unemulated Coprocessor 0x%x (PC=0x%08x)\n", tag(), 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().c_str(), m_op, m_ppc); + logerror("%s: undefined instruction 0x%x (PC=0x%08x)\n", tag(), 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().c_str(), op, m_ppc); + fatalerror("%s: unemulated %s (PC=0x%08x)\n", tag(), op, m_ppc); } diff --git a/src/devices/cpu/score/score.h b/src/devices/cpu/score/score.h index e99827abc55..ba7058196f8 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, std::string _tag, device_t *_owner, UINT32 _clock); + score7_cpu_device(const machine_config &mconfig, const char *_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 2de41ea4d0b..f0ec1644af5 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, std::string tag, device_t *owner, UINT32 clock) +scudsp_cpu_device::scudsp_cpu_device(const machine_config &mconfig, const char *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 73b7b878743..a5827b05e41 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, std::string _tag, device_t *_owner, UINT32 _clock); + scudsp_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(device).m_out_irq_cb.set_callback(object); } template static devcb_base &set_in_dma_callback(device_t &device, _Object object) { return downcast(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 bff3b50bdee..011cc103909 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +se3208_device::se3208_device(const machine_config &mconfig, const char *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 aee14d8c16a..fbed0d6452b 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, std::string tag, device_t *owner, UINT32 clock); + se3208_device(const machine_config &mconfig, const char *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 a9d76bd2b40..481f2544126 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, std::string tag, device_t *owner, UINT32 clock) +sh2_device::sh2_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +sh2a_device::sh2a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sh1_device::sh1_device(const machine_config &mconfig, const char *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().c_str(), m_sh2_state->pc - 2); + logerror("SH2.%s: Illegal opcode at %08x\n", tag(), 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().c_str())); + LOG(("SH-2 '%s' cleared nmi\n", tag())); } else { - LOG(("SH-2 '%s' assert nmi\n", tag().c_str())); + LOG(("SH-2 '%s' assert nmi\n", tag())); 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().c_str(), irqline)); + LOG(("SH-2 '%s' cleared irq #%d\n", tag(), irqline)); m_sh2_state->pending_irq &= ~(1 << irqline); } else { - LOG(("SH-2 '%s' assert irq #%d\n", tag().c_str(), irqline)); + LOG(("SH-2 '%s' assert irq #%d\n", tag(), 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 bbc1d07aa55..d7fe6c36935 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, 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); + 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); static void set_is_slave(device_t &device, int slave) { downcast(device).m_is_slave = slave; } static void set_dma_kludge_callback(device_t &device, sh2_dma_kludge_delegate callback) { downcast(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, std::string _tag, device_t *_owner, UINT32 _clock); + sh2a_device(const machine_config &mconfig, const char *_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, std::string _tag, device_t *_owner, UINT32 _clock); + sh1_device(const machine_config &mconfig, const char *_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 2dc9d02ca98..687306babb8 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().c_str(), max_delta); + logerror("SH2.%s: Timer event in %d cycles of external clock", tag(), max_delta); } } } @@ -365,7 +365,7 @@ void sh2_device::sh2_do_dma(int dma) } - LOG(("SH2.%s: DMA %d complete\n", tag().c_str(), dma)); + LOG(("SH2.%s: DMA %d complete\n", tag(), 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().c_str(), a, b)); + LOG(("SH2 '%s' div+mod %d/%d\n", tag(), 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().c_str(), a, b)); + LOG(("SH2 '%s' div+mod %" I64FMT "d/%" I64FMT "d\n", tag(), 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().c_str(), m_sh2_state->pc & AM); + //logerror("SH2.%s: ICF activated (%x)\n", tag(), 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().c_str(), irqline, vector, message)); + LOG(("SH-2 '%s' exception #%d (internal vector: $%x) after [%s]\n", tag(), 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().c_str(), irqline, vector, message)); + LOG(("SH-2 '%s' exception #%d (external vector: $%x) after [%s]\n", tag(), irqline, vector, message)); } else { standard_irq_callback(irqline); vector = 64 + irqline/2; - LOG(("SH-2 '%s' exception #%d (autovector: $%x) after [%s]\n", tag().c_str(), irqline, vector, message)); + LOG(("SH-2 '%s' exception #%d (autovector: $%x) after [%s]\n", tag(), irqline, vector, message)); } } } else { vector = 11; - LOG(("SH-2 '%s' nmi exception (autovector: $%x) after [%s]\n", tag().c_str(), vector, message)); + LOG(("SH-2 '%s' nmi exception (autovector: $%x) after [%s]\n", tag(), vector, message)); } if (m_isdrc) diff --git a/src/devices/cpu/sh4/sh3comn.cpp b/src/devices/cpu/sh4/sh3comn.cpp index c11f1b3a160..1fcacaa9165 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (unk)\n",tag(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), m_pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask); + logerror("'%s' (%08x): unmapped internal read from %08x mask %08x\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + // logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (INTEVT2)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (IRR0)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (IRR1)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + fatalerror("'%s' (%08x): unmapped internal read from %08x mask %08x (IRR0/1 unused bits)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PADR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PBDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PCDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PDDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PEDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PFDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PGDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PHDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PJDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PKDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (PLDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,mem_mask); + logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (SCPDR)\n",tag(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), m_pc & AM, + tag(), 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().c_str(), m_pc & AM, + tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (IRR0)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (IRR1)\n",tag(), 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().c_str(), 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(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PINTER)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): INTC internal write to %08x = %08x & %08x (IPRC)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PCCR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PDCR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PECR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PFCR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PGCR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PHCR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PJCR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PKCR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PLCR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (SCPCR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PADR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PBDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PADR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PBDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PEDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PFDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PGDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PHDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + // logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PJDR)\n",tag(), 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().c_str(), m_pc & AM,(offset *4)+0x4000000,data,mem_mask); + //logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PKDR)\n",tag(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), m_pc & AM, + tag(), 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().c_str(), m_pc & AM, + tag(), 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 b88737a4e46..fc67b4d9d86 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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +sh3_device::sh3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sh3be_device::sh3be_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sh4_device::sh4_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sh4be_device::sh4be_device(const machine_config &mconfig, const char *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 b8d6d33a1d7..badaacd4558 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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + sh3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class sh3be_device : public sh3_base_device { public: - sh3be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sh3be_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sh4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class sh4be_device : public sh4_base_device { public: - sh4be_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sh4be_device(const machine_config &mconfig, const char *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 08f8af15b39..5052622e2d4 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().c_str(), message)); + LOG(("SH-4 '%s' nmi exception after [%s]\n", tag(), 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().c_str(), exception, message)); + LOG(("SH-4 '%s' interrupt exception #%d after [%s]\n", tag(), 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().c_str(), exception, message)); + LOG(("SH-3 '%s' interrupt exception #%d after [%s]\n", tag(), 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().c_str(), m_pc & AM); + logerror("SH4 '%s': ICF activated (%x)\n", tag(), 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().c_str(), irqline)); + LOG(("SH-4 '%s' cleared external irq IRL%d\n", tag(), irqline)); sh4_exception_unrequest(SH4_INTC_IRL0+irqline-SH4_IRL0); } else { - LOG(("SH-4 '%s' assert external irq IRL%d\n", tag().c_str(), irqline)); + LOG(("SH-4 '%s' assert external irq IRL%d\n", tag(), 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().c_str())); + LOG(("SH-4 '%s' assert nmi\n", tag())); 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().c_str())); + LOG(("SH-4 '%s' assert nmi\n", tag())); 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().c_str(), irqline)); + LOG(("SH-4 '%s' cleared external irq IRL%d\n", tag(), irqline)); sh4_exception_unrequest(SH4_INTC_IRL0+irqline-SH4_IRL0); } else { - LOG(("SH-4 '%s' assert external irq IRL%d\n", tag().c_str(), irqline)); + LOG(("SH-4 '%s' assert external irq IRL%d\n", tag(), 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().c_str(), m_irln)); + LOG(("SH-4 '%s' IRLn0-IRLn3 level #%d\n", tag(), 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 d3ec5d3b47d..bf4c773b1eb 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().c_str(), channel)); + LOG(("SH4 '%s': DMA %d complete\n", tag(), 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 a20661872f4..bee241441ca 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, std::string tag, device_t *owner, UINT32 clock) +adsp21062_device::adsp21062_device(const machine_config &mconfig, const char *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 82fc2107f04..c658b3a9800 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, std::string _tag, device_t *_owner, UINT32 _clock); + adsp21062_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); // static configuration helpers static void set_boot_mode(device_t &device, const SHARC_BOOT_MODE boot_mode) { downcast(device).m_boot_mode = boot_mode; } diff --git a/src/devices/cpu/sm510/sm510.cpp b/src/devices/cpu/sm510/sm510.cpp index c674749c96b..9f6b7beee30 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().c_str(), data, i); + logerror("%s unknown melody ROM data $%02X at $%02X\n", tag(), data, i); } } diff --git a/src/devices/cpu/sm510/sm510.h b/src/devices/cpu/sm510/sm510.h index 0ab1103a4cf..58094fc11a4 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, 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(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) : 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, std::string tag, device_t *owner, UINT32 clock); + sm510_device(const machine_config &mconfig, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + sm512_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/sm510/sm510core.cpp b/src/devices/cpu/sm510/sm510core.cpp index 3d471319ea0..bf1449804c3 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, std::string tag, device_t *owner, UINT32 clock) +sm510_device::sm510_device(const machine_config &mconfig, const char *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 8340b25457e..cf99cbc5ae4 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().c_str(), m_op, m_prev_pc); + logerror("%s unknown opcode $%02X at $%04X\n", tag(), m_op, m_prev_pc); } diff --git a/src/devices/cpu/sm510/sm511core.cpp b/src/devices/cpu/sm510/sm511core.cpp index 6a9bb3e692f..2347721ff90 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, std::string tag, device_t *owner, UINT32 clock) +sm511_device::sm511_device(const machine_config &mconfig, const char *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, 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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +sm512_device::sm512_device(const machine_config &mconfig, const char *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 9f19eebb867..66c51c61e5b 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, std::string tag, device_t *owner, UINT32 clock) +sm8500_cpu_device::sm8500_cpu_device(const machine_config &mconfig, const char *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 60041230923..ab9f3c9ea65 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, std::string _tag, device_t *_owner, UINT32 _clock); + sm8500_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); // static configuration helpers template static devcb_base &set_dma_cb(device_t &device, _Object object) { return downcast(device).m_dma_func.set_callback(object); } diff --git a/src/devices/cpu/spc700/spc700.cpp b/src/devices/cpu/spc700/spc700.cpp index 4a8e845c329..22969235ae7 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +spc700_device::spc700_device(const machine_config &mconfig, const char *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 437546e5499..30b9b2ccdf3 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, std::string tag, device_t *owner, UINT32 clock); + spc700_device(const machine_config &mconfig, const char *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 6783f66715d..438e36cbd9e 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 - constructor //------------------------------------------------- -ssem_device::ssem_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ssem_device::ssem_device(const machine_config &mconfig, const char *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 83acade94ae..8d2c0c21044 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, std::string tag, device_t *owner, UINT32 clock); + ssem_device(const machine_config &mconfig, const char *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 a4726468174..db50c5e6816 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ssp1601_device::ssp1601_device(const machine_config &mconfig, const char *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 f5af8116748..1917af79adb 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, std::string tag, device_t *owner, UINT32 clock); + ssp1601_device(const machine_config &mconfig, const char *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 1314a6622cc..7601fa9bdc3 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +superfx_device::superfx_device(const machine_config &mconfig, const char *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 69021baf950..1de27856668 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, std::string _tag, device_t *_owner, UINT32 _clock); + superfx_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); // static configuration helpers template static devcb_base &set_out_irq_func(device_t &device, _Object object) { return downcast(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 bf36b91f0fd..72c2e80c91b 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; const device_type K1801VM2 = &device_creator; -k1801vm2_device::k1801vm2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k1801vm2_device::k1801vm2_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +t11_device::t11_device(const machine_config &mconfig, const char *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 4ec83cce3f3..55d11c9666a 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, 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); + 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); // static configuration helpers static void set_initial_mode(device_t &device, const UINT16 mode) { downcast(device).c_initial_mode = mode; } @@ -1138,7 +1138,7 @@ class k1801vm2_device : public t11_device { public: // construction/destruction - k1801vm2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k1801vm2_device(const machine_config &mconfig, const char *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 16cdf435ce4..994d0abb3da 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +tmp90840_device::tmp90840_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tmp90841_device::tmp90841_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tmp91640_device::tmp91640_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tmp91641_device::tmp91641_device(const machine_config &mconfig, const char *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 e72ff60e107..42a7e5f5c08 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + tmp90840_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tmp90841_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tmp91640_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tmp91641_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/tlcs900/tlcs900.cpp b/src/devices/cpu/tlcs900/tlcs900.cpp index a95d9db764d..4ac6f8b07a3 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname) +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) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__), m_am8_16(0) { } -tmp95c061_device::tmp95c061_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tmp95c061_device::tmp95c061_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tmp95c063_device::tmp95c063_device(const machine_config &mconfig, const char *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 6b4714dec77..0dcf3d84994 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + tlcs900h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); // static configuration helpers static void set_am8_16(device_t &device, int am8_16) { downcast(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, std::string tag, device_t *owner, UINT32 clock); + tmp95c061_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_port1_read(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + tmp95c063_device(const machine_config &mconfig, const char *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 a1d36d6af0f..7bc62b5a475 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, std::string tag, device_t *owner, UINT32 clock) +tms1000_cpu_device::tms1000_cpu_device(const machine_config &mconfig, const char *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, 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::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) : 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, std::string tag, device_t *owner, UINT32 clock) +tms1070_cpu_device::tms1070_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms1040_cpu_device::tms1040_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms1200_cpu_device::tms1200_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms1100_cpu_device::tms1100_cpu_device(const machine_config &mconfig, const char *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, 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::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) : 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, std::string tag, device_t *owner, UINT32 clock) +tms1170_cpu_device::tms1170_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms1300_cpu_device::tms1300_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms1370_cpu_device::tms1370_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms1400_cpu_device::tms1400_cpu_device(const machine_config &mconfig, const char *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, 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::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) : 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, std::string tag, device_t *owner, UINT32 clock) +tms1470_cpu_device::tms1470_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms1600_cpu_device::tms1600_cpu_device(const machine_config &mconfig, const char *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, 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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +tms1670_cpu_device::tms1670_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms0970_cpu_device::tms0970_cpu_device(const machine_config &mconfig, const char *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, 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::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) : 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, std::string tag, device_t *owner, UINT32 clock) +tms0950_cpu_device::tms0950_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms1990_cpu_device::tms1990_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms0980_cpu_device::tms0980_cpu_device(const machine_config &mconfig, const char *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, 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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +tms1980_cpu_device::tms1980_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms0270_cpu_device::tms0270_cpu_device(const machine_config &mconfig, const char *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 221beeeb982..2572eb1b1ef 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, 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(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) : 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, 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); + 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); protected: // overrides @@ -265,28 +265,28 @@ protected: class tms1070_cpu_device : public tms1000_cpu_device { public: - tms1070_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms1070_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms1040_cpu_device : public tms1000_cpu_device { public: - tms1040_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms1040_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms1200_cpu_device : public tms1000_cpu_device { public: - tms1200_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms1200_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms1100_cpu_device : public tms1000_cpu_device { public: - 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); + 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); protected: // overrides @@ -301,27 +301,27 @@ protected: class tms1170_cpu_device : public tms1100_cpu_device { public: - tms1170_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms1170_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms1300_cpu_device : public tms1100_cpu_device { public: - tms1300_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms1300_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms1370_cpu_device : public tms1100_cpu_device { public: - tms1370_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms1370_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms1400_cpu_device : public tms1100_cpu_device { public: - 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); + 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); protected: // overrides @@ -339,29 +339,29 @@ protected: class tms1470_cpu_device : public tms1400_cpu_device { public: - tms1470_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms1470_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms1600_cpu_device : public tms1400_cpu_device { public: - 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); + 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); }; class tms1670_cpu_device : public tms1600_cpu_device { public: - tms1670_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms1670_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms0970_cpu_device : public tms1000_cpu_device { public: - 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); + 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); protected: // overrides @@ -377,7 +377,7 @@ protected: class tms0950_cpu_device : public tms0970_cpu_device { public: - tms0950_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms0950_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tms1990_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms0980_cpu_device : public tms0970_cpu_device { public: - 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); + 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); protected: // overrides @@ -423,7 +423,7 @@ protected: class tms1980_cpu_device : public tms0980_cpu_device { public: - tms1980_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms1980_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tms0270_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_read_ctl_callback(device_t &device, _Object object) { return downcast(device).m_read_ctl.set_callback(object); } diff --git a/src/devices/cpu/tms32010/tms32010.cpp b/src/devices/cpu/tms32010/tms32010.cpp index 285d1cf1ade..3a164e8f984 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, std::string tag, device_t *owner, UINT32 clock) +tms32010_device::tms32010_device(const machine_config &mconfig, const char *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, std::string tag, } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +tms32015_device::tms32015_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms32016_device::tms32016_device(const machine_config &mconfig, const char *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 96749cdbef0..a1c0692c566 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, 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); + 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); protected: // device-level overrides @@ -202,7 +202,7 @@ class tms32015_device : public tms32010_device { public: // construction/destruction - tms32015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms32015_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tms32016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/tms32025/tms32025.cpp b/src/devices/cpu/tms32025/tms32025.cpp index ef045083032..2d40b2d3448 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; const device_type TMS32026 = &device_creator; -tms32025_device::tms32025_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms32025_device::tms32025_device(const machine_config &mconfig, const char *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, std::string tag, } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +tms32026_device::tms32026_device(const machine_config &mconfig, const char *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 557e34466ad..daac81c8314 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, 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); + 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); protected: // device-level overrides @@ -353,7 +353,7 @@ class tms32026_device : public tms32025_device { public: // construction/destruction - tms32026_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms32026_device(const machine_config &mconfig, const char *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 6eefe54ff10..cfab62a7929 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, UINT32 chiptype, address_map_constructor internal_map, const char *shortname, const char *source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_LITTLE, 32, 24, -2, internal_map), m_chip_type(chiptype), @@ -280,12 +280,12 @@ tms3203x_device::tms3203x_device(const machine_config &mconfig, device_type type #endif } -tms32031_device::tms32031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms32031_device::tms32031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms3203x_device(mconfig, TMS32031, "TMS32031", tag, owner, clock, CHIP_TYPE_TMS32031, ADDRESS_MAP_NAME(internal_32031), "tms32031", __FILE__) { } -tms32032_device::tms32032_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms32032_device::tms32032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms3203x_device(mconfig, TMS32032, "TMS32032", tag, owner, clock, CHIP_TYPE_TMS32032, ADDRESS_MAP_NAME(internal_32032), "tms32032", __FILE__) { } diff --git a/src/devices/cpu/tms32031/tms32031.h b/src/devices/cpu/tms32031/tms32031.h index d7bce71678a..4ce0decf010 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, UINT32 chiptype, address_map_constructor internal_map, const char *shortname, const char *source); virtual ~tms3203x_device(); public: @@ -793,7 +793,7 @@ class tms32031_device : public tms3203x_device { public: // construction/destruction - tms32031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms32031_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tms32032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp index 7f5593c7dda..5d35b7c025a 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, std::string tag, device_t *owner, UINT32 clock) +tms32051_device::tms32051_device(const machine_config &mconfig, const char *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, std::string tag, { } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +tms32053_device::tms32053_device(const machine_config &mconfig, const char *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 7ab8fa152eb..ee83ed3c2ae 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + tms32053_device(const machine_config &mconfig, const char *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 8148838dadf..8b89bc3ef88 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, std::string tag, device_t *owner, UINT32 clock) +tms32082_mp_device::tms32082_mp_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms32082_pp_device::tms32082_pp_device(const machine_config &mconfig, const char *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 514f2cf088c..80163cc6145 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, std::string tag, device_t *owner, UINT32 clock); + tms32082_mp_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tms32082_pp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); enum { diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp index 8be234dbbdd..1ad1879c3b0 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; GLOBAL VARIABLES ***************************************************************************/ -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +tms34010_device::tms34010_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms34020_device::tms34020_device(const machine_config &mconfig, const char *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().c_str())); + LOG(("TMS34010 '%s' takes NMI\n", tag())); /* 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().c_str())); + LOG(("TMS34010 '%s' takes HI\n", tag())); vector = 0xfffffec0; } /* display interrupt */ else if (irq & TMS34010_DI) { - LOG(("TMS34010 '%s' takes DI\n", tag().c_str())); + LOG(("TMS34010 '%s' takes DI\n", tag())); vector = 0xfffffea0; } /* window violation interrupt */ else if (irq & TMS34010_WV) { - LOG(("TMS34010 '%s' takes WV\n", tag().c_str())); + LOG(("TMS34010 '%s' takes WV\n", tag())); vector = 0xfffffe80; } /* external 1 interrupt */ else if (irq & TMS34010_INT1) { - LOG(("TMS34010 '%s' takes INT1\n", tag().c_str())); + LOG(("TMS34010 '%s' takes INT1\n", tag())); 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().c_str())); + LOG(("TMS34010 '%s' takes INT2\n", tag())); 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().c_str(), inputnum, state)); + LOG(("TMS34010 '%s' set irq line %d state %d\n", tag(), 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().c_str(), type)); + LOG(("TMS34010 '%s' set internal interrupt $%04x\n", tag(), 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 7434259a89a..f87a3df37b1 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + tms340x0_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); static void set_halt_on_reset(device_t &device, bool halt_on_reset) { downcast(device).m_halt_on_reset = halt_on_reset; } static void set_pixel_clock(device_t &device, UINT32 pixclock) { downcast(device).m_pixclock = pixclock; } @@ -1024,7 +1024,7 @@ protected: class tms34010_device : public tms340x0_device { public: - tms34010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms34010_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tms34020_device(const machine_config &mconfig, const char *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 ba027e8aec2..f05b4cad4f1 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, std::string tag, device_t *owner, UINT32 clock) +tms57002_device::tms57002_device(const machine_config &mconfig, const char *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 d520b441f71..6cfcf4b4b51 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, std::string tag, device_t *owner, UINT32 clock); + tms57002_device(const machine_config &mconfig, const char *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 f9d8122fd1c..42e76319855 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, std::string tag, device_t *owner, UINT32 clock) +tms7000_device::tms7000_device(const machine_config &mconfig, const char *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, std::string tag, d { } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +tms7020_device::tms7020_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms7020_exl_device::tms7020_exl_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms7040_device::tms7040_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms70c00_device::tms70c00_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms70c20_device::tms70c20_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms70c40_device::tms70c40_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms7001_device::tms7001_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms7041_device::tms7041_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms7002_device::tms7002_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms7042_device::tms7042_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms70c46_device::tms70c46_device(const machine_config &mconfig, const char *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().c_str(), m_pc, offset); + logerror("'%s' (%04X): tms7000_pf_r @ $%04x\n", tag(), 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().c_str()); + logerror("%s: CMOS low-power halt mode enabled\n", tag()); } 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().c_str(), m_pc, offset, data); + logerror("'%s' (%04X): tms7000_pf_w @ $%04x = $%02x\n", tag(), m_pc, offset, data); break; } } diff --git a/src/devices/cpu/tms7000/tms7000.h b/src/devices/cpu/tms7000/tms7000.h index 52cfe9c65d7..b44ac9324c7 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, 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); + 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); - 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_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_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, std::string tag, device_t *owner, UINT32 clock); + tms7020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms7020_exl_device : public tms7000_device { public: - tms7020_exl_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms7020_exl_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tms7040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms70c00_device : public tms7000_device { public: - tms70c00_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms70c00_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms70c20_device : public tms7000_device { public: - tms70c20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms70c20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms70c40_device : public tms7000_device { public: - tms70c40_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms70c40_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms70c46_device : public tms7000_device { public: - tms70c46_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms70c46_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tms7001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms7041_device : public tms7000_device { public: - tms7041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms7041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms7002_device : public tms7000_device { public: - tms7002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms7002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms7042_device : public tms7000_device { public: - tms7042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms7042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/tms7000/tms70op.inc b/src/devices/cpu/tms7000/tms70op.inc index 28ab0186799..146ca419ff7 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().c_str(), op, m_pc); + logerror("%s: illegal opcode $%02X @ $%04x\n", tag(), op, m_pc); } diff --git a/src/devices/cpu/tms9900/ti990_10.cpp b/src/devices/cpu/tms9900/ti990_10.cpp index 855a10388ec..c336d5e689a 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, std::string tag, device_t *owner, UINT32 clock) +ti990_10_device::ti990_10_device(const machine_config &mconfig, const char *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 a6418ffa9f5..4fa8da2b43f 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, std::string tag, device_t *owner, UINT32 clock); + ti990_10_device(const machine_config &mconfig, const char *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 4f85685fba0..b1fad1bbeeb 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, 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::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) : 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, std::string tag, device_t *owner, UINT32 clock) +tms9900_device::tms9900_device(const machine_config &mconfig, const char *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 1676947c0d4..4669eeb439a 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, - std::string tag, int databus_width, int prg_addr_bits, int cru_addr_bits, + 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(); @@ -393,7 +393,7 @@ private: class tms9900_device : public tms99xx_device { public: - tms9900_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms9900_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/tms9900/tms9980a.cpp b/src/devices/cpu/tms9900/tms9980a.cpp index 1d9a0f5ea0f..054a293a403 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, std::string tag, device_t *owner, UINT32 clock) +tms9980a_device::tms9980a_device(const machine_config &mconfig, const char *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 92e8d6eb92c..d32c79dc9ca 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, std::string tag, device_t *owner, UINT32 clock); + tms9980a_device(const machine_config &mconfig, const char *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 4fd6c909bd3..855f00499a0 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, std::string tag, device_t *owner, UINT32 clock) +tms9995_device::tms9995_device(const machine_config &mconfig, const char *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, std::string tag, d /* Called from subclass. */ -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) +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) : 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().c_str(), 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(), 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().c_str()); + if (TRACE_CONFIG) logerror("%s: Deleting lookup tables\n", tag()); 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 ab5560d133f..e5dc055f36f 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock) + tms9995_mp9537_device(const machine_config &mconfig, const char *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 4a1a6968dbe..69b608a6592 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, std::string tag, device_t *owner, UINT32 clock) +upd553_cpu_device::upd553_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +upd557l_cpu_device::upd557l_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +upd650_cpu_device::upd650_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +upd552_cpu_device::upd552_cpu_device(const machine_config &mconfig, const char *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().c_str(), 'A' + index, m_prev_pc); + logerror("%s read from unknown port %c at $%03X\n", tag(), '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().c_str(), 'A' + index, data, m_prev_pc); + logerror("%s write to unknown port %c = $%X at $%03X\n", tag(), '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().c_str(), 'A' + index, m_prev_pc); + logerror("%s read from unknown port %c at $%03X\n", tag(), '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().c_str(), 'A' + index, data, m_prev_pc); + logerror("%s write to unknown port %c = $%X at $%03X\n", tag(), '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 518603a9aef..01a7f2ecc1c 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, 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) + 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) : 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, std::string tag, device_t *owner, UINT32 clock); + upd553_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class upd557l_cpu_device : public ucom4_cpu_device { public: - upd557l_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + upd557l_cpu_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + upd650_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class upd552_cpu_device : public ucom4_cpu_device { public: - upd552_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + upd552_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/ucom4/ucom4op.cpp b/src/devices/cpu/ucom4/ucom4op.cpp index 91e5db6dccb..a9c5c0fe892 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().c_str(), m_op, m_prev_pc); + logerror("%s unknown opcode $%02X at $%03X\n", tag(), 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().c_str(), m_arg & 0xf0, m_prev_pc); + logerror("%s CI opcode unexpected upper arg $%02X at $%03X\n", tag(), 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().c_str(), m_arg & 0xf0, m_prev_pc); + logerror("%s CLI opcode unexpected upper arg $%02X at $%03X\n", tag(), 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().c_str(), m_op, m_prev_pc); + logerror("%s using uCOM-43 opcode $%02X at $%03X\n", tag(), 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().c_str(), m_arg & 0xc0, m_prev_pc); + logerror("%s STM opcode unexpected upper arg $%02X at $%03X\n", tag(), 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 dd03680a4f6..515e26ad685 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +unsp_device::unsp_device(const machine_config &mconfig, const char *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 52a34caeb4d..6424016cf3b 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, std::string tag, device_t *owner, UINT32 clock); + unsp_device(const machine_config &mconfig, const char *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 346897b1685..ef211dd13c3 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; const device_type UPD96050 = &device_creator; -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) +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) : 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, st } -upd7725_device::upd7725_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd7725_device::upd7725_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +upd96050_device::upd96050_device(const machine_config &mconfig, const char *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 b731a46a756..94a7f85869f 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + upd7725_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class upd96050_device : public necdsp_device { public: // construction/destruction - upd96050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + upd96050_device(const machine_config &mconfig, const char *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 7335e29974d..d0974d00a74 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; const device_type UPD78C06 = &device_creator; -upd7810_device::upd7810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd7810_device::upd7810_device(const machine_config &mconfig, const char *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, std::string tag, d m_op74 = s_op74; } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +upd7807_device::upd7807_device(const machine_config &mconfig, const char *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, std::string tag, d m_op74 = s_op74; } -upd7801_device::upd7801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd7801_device::upd7801_device(const machine_config &mconfig, const char *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, std::string tag, d m_opXX = s_opXX_7801; } -upd78c05_device::upd78c05_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd78c05_device::upd78c05_device(const machine_config &mconfig, const char *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, std::string tag, m_opXX = s_opXX_78c05; } -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) +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) : upd7810_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -upd78c06_device::upd78c06_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd78c06_device::upd78c06_device(const machine_config &mconfig, const char *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 3c555f80a36..d7d96be75d7 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, 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); + 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); // static configuration helpers template static devcb_base &set_to_func(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + upd7807_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + upd7801_device(const machine_config &mconfig, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + upd78c06_device(const machine_config &mconfig, const char *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 9bd2e0a2bd9..ab4589222c1 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().c_str(), OP, PC); + logerror("uPD7810 '%s': illegal opcode %02x at PC:%04x\n", tag(), OP, PC); } void upd7810_device::illegal2() { - logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag().c_str(), OP, OP2, PC); + logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag(), 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().c_str(), OP, imm, PC); + logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag(), 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().c_str(), OP, imm, PC); + logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag(), 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().c_str(), OP, imm, PC); + logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag(), 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().c_str(), OP, imm, PC); + logerror("uPD7810 '%s': illegal opcode %02x %02x at PC:%04x\n", tag(), OP, imm, PC); val = 0; break; } diff --git a/src/devices/cpu/v30mz/v30mz.cpp b/src/devices/cpu/v30mz/v30mz.cpp index 7f3ba910bcc..ec720d59f9a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v30mz_cpu_device::v30mz_cpu_device(const machine_config &mconfig, const char *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().c_str(), pc()); + logerror("%s: %06x: Warning: seg_prefix defined for add4s\n", tag(), pc()); } m_ZeroVal = m_CarryVal = 0; for (int i=0;i0 && !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().c_str(), pc() ); + logerror("%s: %06x: REPNC invalid\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: REPC invalid\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: Mov Sreg - Invalid register\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: Hardware POLL\n", tag(), 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().c_str(), pc()); break; + case 0x30: logerror("%s: %06x: Undefined opcode 0xc0 0x30 (SHLA)\n", tag(), 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().c_str(), pc()); break; + case 0x30: logerror("%s: %06x: Undefined opcode 0xc1 0x30 (SHLA)\n", tag(), 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().c_str(), pc()); break; + case 0x30: logerror("%s: %06x: Undefined opcode 0xd0 0x30 (SHLA)\n", tag(), 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().c_str(), pc()); break; + case 0x30: logerror("%s: %06x: Undefined opcode 0xd1 0x30 (SHLA)\n", tag(), 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().c_str(), pc()); break; + case 0x30: logerror("%s: %06x: Undefined opcode 0xd2 0x30 (SHLA)\n", tag(), 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().c_str(), pc()); break; + case 0x30: logerror("%s: %06x: Undefined opcode 0xd3 0x30 (SHLA)\n", tag(), 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().c_str(), pc() ); + logerror("%s: %06x: Undefined opcode (SETALC)\n", tag(), 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().c_str(), pc(), m_modrm); + logerror("%s: %06x: Unimplemented floating point control %04x\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: Warning - BUSLOCK\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: REPNE invalid\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: REPE invalid\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: HALT\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: Undefined opcode 0xf6 0x08\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: Undefined opcode 0xf7 0x08\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: FE Pre with unimplemented mod\n", tag(), 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().c_str(), pc()); + logerror("%s: %06x: FF Pre with unimplemented mod\n", tag(), pc()); break; } } @@ -3724,7 +3724,7 @@ void v30mz_cpu_device::execute_run() default: m_icount -= 10; - logerror("%s: %06x: Invalid Opcode %02x\n", tag().c_str(), pc(), op); + logerror("%s: %06x: Invalid Opcode %02x\n", tag(), pc(), op); break; } diff --git a/src/devices/cpu/v30mz/v30mz.h b/src/devices/cpu/v30mz/v30mz.h index 4b21269f88f..6ba07800b9e 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, std::string tag, device_t *owner, UINT32 clock); + v30mz_cpu_device(const machine_config &mconfig, const char *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 8e091509beb..61764add79a 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; const device_type V70 = &device_creator; -v60_device::v60_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v60_device::v60_device(const machine_config &mconfig, const char *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, std::string tag, device_t } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +v70_device::v70_device(const machine_config &mconfig, const char *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 ce146922f9b..a7b2c886d5e 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, 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); + 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); void stall(); @@ -774,7 +774,7 @@ class v70_device : public v60_device { public: // construction/destruction - v70_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v70_device(const machine_config &mconfig, const char *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 a4e3f0eda39..958c28edc49 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v810_device::v810_device(const machine_config &mconfig, const char *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 138c7d6cbde..4e85ed7b540 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, std::string tag, device_t *owner, UINT32 clock); + v810_device(const machine_config &mconfig, const char *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 22a0eda5480..c8f3b968468 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +z180_device::z180_device(const machine_config &mconfig, const char *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().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' CNTLA0 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_CNTLA1: data = IO_CNTLA1 & Z180_CNTLA1_RMASK; - LOG(("Z180 '%s' CNTLA1 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' CNTLA1 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_CNTLB0: data = IO_CNTLB0 & Z180_CNTLB0_RMASK; - LOG(("Z180 '%s' CNTLB0 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' CNTLB0 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_CNTLB1: data = IO_CNTLB1 & Z180_CNTLB1_RMASK; - LOG(("Z180 '%s' CNTLB1 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' CNTLB1 rd $%02x ($%02x)\n", tag(), 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().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' STAT0 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_STAT1: data = IO_STAT1 & Z180_STAT1_RMASK; - LOG(("Z180 '%s' STAT1 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' STAT1 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_TDR0: data = IO_TDR0 & Z180_TDR0_RMASK; - LOG(("Z180 '%s' TDR0 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' TDR0 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_TDR1: data = IO_TDR1 & Z180_TDR1_RMASK; - LOG(("Z180 '%s' TDR1 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' TDR1 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_RDR0: data = IO_RDR0 & Z180_RDR0_RMASK; - LOG(("Z180 '%s' RDR0 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' RDR0 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_RDR1: data = IO_RDR1 & Z180_RDR1_RMASK; - LOG(("Z180 '%s' RDR1 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' RDR1 rd $%02x ($%02x)\n", tag(), 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().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' CNTR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_TRDR: data = IO_TRDR & Z180_TRDR_RMASK; - logerror("Z180 '%s' TRDR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f]); + logerror("Z180 '%s' TRDR rd $%02x ($%02x)\n", tag(), 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().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' TMDR0L rd $%02x ($%02x)\n", tag(), 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().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' TMDR0H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_RLDR0L: data = IO_RLDR0L & Z180_RLDR0L_RMASK; - LOG(("Z180 '%s' RLDR0L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' RLDR0L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_RLDR0H: data = IO_RLDR0H & Z180_RLDR0H_RMASK; - LOG(("Z180 '%s' RLDR0H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' RLDR0H rd $%02x ($%02x)\n", tag(), 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().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' TCR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_IO11: data = IO_IO11 & Z180_IO11_RMASK; - LOG(("Z180 '%s' IO11 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' IO11 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_ASEXT0: data = IO_ASEXT0 & Z180_ASEXT0_RMASK; - LOG(("Z180 '%s' ASEXT0 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' ASEXT0 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_ASEXT1: data = IO_ASEXT1 & Z180_ASEXT1_RMASK; - LOG(("Z180 '%s' ASEXT1 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' ASEXT1 rd $%02x ($%02x)\n", tag(), 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().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' TMDR1L rd $%02x ($%02x)\n", tag(), 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().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' TMDR1H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_RLDR1L: data = IO_RLDR1L & Z180_RLDR1L_RMASK; - LOG(("Z180 '%s' RLDR1L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' RLDR1L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_RLDR1H: data = IO_RLDR1H & Z180_RLDR1H_RMASK; - LOG(("Z180 '%s' RLDR1H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' RLDR1H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_FRC: data = IO_FRC & Z180_FRC_RMASK; - LOG(("Z180 '%s' FRC rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' FRC rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_IO19: data = IO_IO19 & Z180_IO19_RMASK; - LOG(("Z180 '%s' IO19 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' IO19 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_ASTC0L: data = IO_ASTC0L & Z180_ASTC0L_RMASK; - LOG(("Z180 '%s' ASTC0L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' ASTC0L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_ASTC0H: data = IO_ASTC0H & Z180_ASTC0H_RMASK; - LOG(("Z180 '%s' ASTC0H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' ASTC0H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_ASTC1L: data = IO_ASTC1L & Z180_ASTC1L_RMASK; - LOG(("Z180 '%s' ASTC1L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' ASTC1L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_ASTC1H: data = IO_ASTC1H & Z180_ASTC1H_RMASK; - LOG(("Z180 '%s' ASTC1H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' ASTC1H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_CMR: data = IO_CMR & Z180_CMR_RMASK; - LOG(("Z180 '%s' CMR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' CMR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_CCR: data = IO_CCR & Z180_CCR_RMASK; - LOG(("Z180 '%s' CCR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' CCR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_SAR0L: data = IO_SAR0L & Z180_SAR0L_RMASK; - LOG(("Z180 '%s' SAR0L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' SAR0L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_SAR0H: data = IO_SAR0H & Z180_SAR0H_RMASK; - LOG(("Z180 '%s' SAR0H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' SAR0H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_SAR0B: data = IO_SAR0B & Z180_SAR0B_RMASK; - LOG(("Z180 '%s' SAR0B rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' SAR0B rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_DAR0L: data = IO_DAR0L & Z180_DAR0L_RMASK; - LOG(("Z180 '%s' DAR0L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' DAR0L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_DAR0H: data = IO_DAR0H & Z180_DAR0H_RMASK; - LOG(("Z180 '%s' DAR0H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' DAR0H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_DAR0B: data = IO_DAR0B & Z180_DAR0B_RMASK; - LOG(("Z180 '%s' DAR0B rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' DAR0B rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_BCR0L: data = IO_BCR0L & Z180_BCR0L_RMASK; - LOG(("Z180 '%s' BCR0L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' BCR0L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_BCR0H: data = IO_BCR0H & Z180_BCR0H_RMASK; - LOG(("Z180 '%s' BCR0H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' BCR0H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_MAR1L: data = IO_MAR1L & Z180_MAR1L_RMASK; - LOG(("Z180 '%s' MAR1L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' MAR1L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_MAR1H: data = IO_MAR1H & Z180_MAR1H_RMASK; - LOG(("Z180 '%s' MAR1H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' MAR1H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_MAR1B: data = IO_MAR1B & Z180_MAR1B_RMASK; - LOG(("Z180 '%s' MAR1B rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' MAR1B rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_IAR1L: data = IO_IAR1L & Z180_IAR1L_RMASK; - LOG(("Z180 '%s' IAR1L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' IAR1L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_IAR1H: data = IO_IAR1H & Z180_IAR1H_RMASK; - LOG(("Z180 '%s' IAR1H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' IAR1H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_IAR1B: data = IO_IAR1B & Z180_IAR1B_RMASK; - LOG(("Z180 '%s' IAR1B rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' IAR1B rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_BCR1L: data = IO_BCR1L & Z180_BCR1L_RMASK; - LOG(("Z180 '%s' BCR1L rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' BCR1L rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_BCR1H: data = IO_BCR1H & Z180_BCR1H_RMASK; - LOG(("Z180 '%s' BCR1H rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' BCR1H rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_DSTAT: data = IO_DSTAT & Z180_DSTAT_RMASK; - LOG(("Z180 '%s' DSTAT rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' DSTAT rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_DMODE: data = IO_DMODE & Z180_DMODE_RMASK; - LOG(("Z180 '%s' DMODE rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' DMODE rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_DCNTL: data = IO_DCNTL & Z180_DCNTL_RMASK; - LOG(("Z180 '%s' DCNTL rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' DCNTL rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_IL: data = IO_IL & Z180_IL_RMASK; - LOG(("Z180 '%s' IL rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' IL rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_ITC: data = IO_ITC & Z180_ITC_RMASK; - LOG(("Z180 '%s' ITC rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' ITC rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_IO35: data = IO_IO35 & Z180_IO35_RMASK; - LOG(("Z180 '%s' IO35 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' IO35 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_RCR: data = IO_RCR & Z180_RCR_RMASK; - LOG(("Z180 '%s' RCR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' RCR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_IO37: data = IO_IO37 & Z180_IO37_RMASK; - LOG(("Z180 '%s' IO37 rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' IO37 rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_CBR: data = IO_CBR & Z180_CBR_RMASK; - LOG(("Z180 '%s' CBR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' CBR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_BBR: data = IO_BBR & Z180_BBR_RMASK; - LOG(("Z180 '%s' BBR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' BBR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_CBAR: data = IO_CBAR & Z180_CBAR_RMASK; - LOG(("Z180 '%s' CBAR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' CBAR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_IO3B: data = IO_IO3B & Z180_IO3B_RMASK; - LOG(("Z180 '%s' IO3B rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' IO3B rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_IO3C: data = IO_IO3C & Z180_IO3C_RMASK; - LOG(("Z180 '%s' IO3C rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' IO3C rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_IO3D: data = IO_IO3D & Z180_IO3D_RMASK; - LOG(("Z180 '%s' IO3D rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' IO3D rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_OMCR: data = IO_OMCR & Z180_OMCR_RMASK; - LOG(("Z180 '%s' OMCR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' OMCR rd $%02x ($%02x)\n", tag(), data, m_io[port & 0x3f])); break; case Z180_IOCR: data = IO_IOCR & Z180_IOCR_RMASK; - LOG(("Z180 '%s' IOCR rd $%02x ($%02x)\n", tag().c_str(), data, m_io[port & 0x3f])); + LOG(("Z180 '%s' IOCR rd $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_CNTLA0_WMASK)); + LOG(("Z180 '%s' CNTLA0 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_CNTLA1_WMASK)); + LOG(("Z180 '%s' CNTLA1 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_CNTLB0_WMASK)); + LOG(("Z180 '%s' CNTLB0 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_CNTLB1_WMASK)); + LOG(("Z180 '%s' CNTLB1 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_STAT0_WMASK)); + LOG(("Z180 '%s' STAT0 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_STAT1_WMASK)); + LOG(("Z180 '%s' STAT1 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_TDR0_WMASK)); + LOG(("Z180 '%s' TDR0 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_TDR1_WMASK)); + LOG(("Z180 '%s' TDR1 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_RDR0_WMASK)); + LOG(("Z180 '%s' RDR0 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_RDR1_WMASK)); + LOG(("Z180 '%s' RDR1 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_CNTR_WMASK)); + LOG(("Z180 '%s' CNTR wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_TRDR_WMASK)); + LOG(("Z180 '%s' TRDR wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_TMDR0L_WMASK)); + LOG(("Z180 '%s' TMDR0L wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_TMDR0H_WMASK)); + LOG(("Z180 '%s' TMDR0H wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_RLDR0L_WMASK)); + LOG(("Z180 '%s' RLDR0L wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_RLDR0H_WMASK)); + LOG(("Z180 '%s' RLDR0H wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_TCR_WMASK)); + LOG(("Z180 '%s' TCR wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_IO11_WMASK)); + LOG(("Z180 '%s' IO11 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_ASEXT0_WMASK)); + LOG(("Z180 '%s' ASEXT0 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_ASEXT1_WMASK)); + LOG(("Z180 '%s' ASEXT1 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_TMDR1L_WMASK)); + LOG(("Z180 '%s' TMDR1L wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_TMDR1H_WMASK)); + LOG(("Z180 '%s' TMDR1H wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_RLDR1L_WMASK)); + LOG(("Z180 '%s' RLDR1L wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_RLDR1H_WMASK)); + LOG(("Z180 '%s' RLDR1H wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_FRC_WMASK)); + LOG(("Z180 '%s' FRC wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_IO19_WMASK)); + LOG(("Z180 '%s' IO19 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_ASTC0L_WMASK)); + LOG(("Z180 '%s' ASTC0L wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_ASTC0H_WMASK)); + LOG(("Z180 '%s' ASTC0H wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_ASTC1L_WMASK)); + LOG(("Z180 '%s' ASTC1L wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_ASTC1H_WMASK)); + LOG(("Z180 '%s' ASTC1H wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_CMR_WMASK)); + LOG(("Z180 '%s' CMR wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_CCR_WMASK)); + LOG(("Z180 '%s' CCR wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_SAR0L_WMASK)); + LOG(("Z180 '%s' SAR0L wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_SAR0H_WMASK)); + LOG(("Z180 '%s' SAR0H wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_SAR0B_WMASK)); + LOG(("Z180 '%s' SAR0B wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_DAR0L_WMASK)); + LOG(("Z180 '%s' DAR0L wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_DAR0H_WMASK)); + LOG(("Z180 '%s' DAR0H wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_DAR0B_WMASK)); + LOG(("Z180 '%s' DAR0B wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_BCR0L_WMASK)); + LOG(("Z180 '%s' BCR0L wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_BCR0H_WMASK)); + LOG(("Z180 '%s' BCR0H wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_MAR1L_WMASK)); + LOG(("Z180 '%s' MAR1L wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_MAR1H_WMASK)); + LOG(("Z180 '%s' MAR1H wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_MAR1B_WMASK)); + LOG(("Z180 '%s' MAR1B wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_IAR1L_WMASK)); + LOG(("Z180 '%s' IAR1L wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_IAR1H_WMASK)); + LOG(("Z180 '%s' IAR1H wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_IAR1B_WMASK)); + LOG(("Z180 '%s' IAR1B wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_BCR1L_WMASK)); + LOG(("Z180 '%s' BCR1L wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_BCR1H_WMASK)); + LOG(("Z180 '%s' BCR1H wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_DSTAT_WMASK)); + LOG(("Z180 '%s' DSTAT wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_DMODE_WMASK)); + LOG(("Z180 '%s' DMODE wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_DCNTL_WMASK)); + LOG(("Z180 '%s' DCNTL wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_IL_WMASK)); + LOG(("Z180 '%s' IL wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_ITC_WMASK)); + LOG(("Z180 '%s' ITC wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_IO35_WMASK)); + LOG(("Z180 '%s' IO35 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_RCR_WMASK)); + LOG(("Z180 '%s' RCR wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_IO37_WMASK)); + LOG(("Z180 '%s' IO37 wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_CBR_WMASK)); + LOG(("Z180 '%s' CBR wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_BBR_WMASK)); + LOG(("Z180 '%s' BBR wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_CBAR_WMASK)); + LOG(("Z180 '%s' CBAR wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_IO3B_WMASK)); + LOG(("Z180 '%s' IO3B wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_IO3C_WMASK)); + LOG(("Z180 '%s' IO3C wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_IO3D_WMASK)); + LOG(("Z180 '%s' IO3D wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_OMCR_WMASK)); + LOG(("Z180 '%s' OMCR wr $%02x ($%02x)\n", tag(), 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().c_str(), data, data & Z180_IOCR_WMASK)); + LOG(("Z180 '%s' IOCR wr $%02x ($%02x)\n", tag(), 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().c_str(), data & Z180_CKA0 ? 1 : 0)); + LOG(("Z180 '%s' CKA0 %d\n", tag(), 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().c_str(), data & Z180_CKA1 ? 1 : 0)); + LOG(("Z180 '%s' CKA1 %d\n", tag(), 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().c_str(), data & Z180_CKS ? 1 : 0)); + LOG(("Z180 '%s' CKS %d\n", tag(), 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().c_str(), data & Z180_CTS0 ? 1 : 0)); + LOG(("Z180 '%s' CTS0 %d\n", tag(), 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().c_str(), data & Z180_CTS1 ? 1 : 0)); + LOG(("Z180 '%s' CTS1 %d\n", tag(), 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().c_str(), data & Z180_DCD0 ? 1 : 0)); + LOG(("Z180 '%s' DCD0 %d\n", tag(), 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().c_str(), data & Z180_DREQ0 ? 1 : 0)); + LOG(("Z180 '%s' DREQ0 %d\n", tag(), 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().c_str(), data & Z180_DREQ1 ? 1 : 0)); + LOG(("Z180 '%s' DREQ1 %d\n", tag(), 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().c_str(), data & Z180_RXA0 ? 1 : 0)); + LOG(("Z180 '%s' RXA0 %d\n", tag(), 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().c_str(), data & Z180_RXA1 ? 1 : 0)); + LOG(("Z180 '%s' RXA1 %d\n", tag(), 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().c_str(), data & Z180_RXS ? 1 : 0)); + LOG(("Z180 '%s' RXS %d\n", tag(), 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().c_str())); + LOG(("Z180 '%s' RTS0 won't change output\n", tag())); } /* O transfer end 0 (active low) or CKA1 (mux) */ if (changes & Z180_TEND0) { - LOG(("Z180 '%s' TEND0 won't change output\n", tag().c_str())); + LOG(("Z180 '%s' TEND0 won't change output\n", tag())); } /* O transfer end 1 (active low) */ if (changes & Z180_TEND1) { - LOG(("Z180 '%s' TEND1 won't change output\n", tag().c_str())); + LOG(("Z180 '%s' TEND1 won't change output\n", tag())); } /* 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().c_str())); + LOG(("Z180 '%s' TOUT won't change output\n", tag())); } /* O asynchronous transmit data 0 (active high) */ if (changes & Z180_TXA0) { - LOG(("Z180 '%s' TXA0 won't change output\n", tag().c_str())); + LOG(("Z180 '%s' TXA0 won't change output\n", tag())); } /* O asynchronous transmit data 1 (active high) */ if (changes & Z180_TXA1) { - LOG(("Z180 '%s' TXA1 won't change output\n", tag().c_str())); + LOG(("Z180 '%s' TXA1 won't change output\n", tag())); } /* O clocked serial transmit data (active high) */ if (changes & Z180_TXS) { - LOG(("Z180 '%s' TXS won't change output\n", tag().c_str())); + LOG(("Z180 '%s' TXS won't change output\n", tag())); } } @@ -2350,7 +2350,7 @@ void z180_device::execute_run() /* to just check here */ if (m_nmi_pending) { - LOG(("Z180 '%s' take NMI\n", tag().c_str())); + LOG(("Z180 '%s' take NMI\n", tag())); _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().c_str() , irqline,state)); + LOG(("Z180 '%s' set_irq_line %d = %d\n",tag() , 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 961250783e5..e76c75501ba 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, std::string _tag, device_t *_owner, UINT32 _clock); + z180_device(const machine_config &mconfig, const char *_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 9c8424dd698..bd2a9fc7137 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().c_str(), m_odirect->read_byte((_PCD-1)&0xffff), m_odirect->read_byte(_PCD)); + tag(), 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 1c44e384b21..91520228f87 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().c_str(), m_odirect->read_byte((_PCD-1)&0xffff)); + tag(), m_odirect->read_byte((_PCD-1)&0xffff)); } /********************************************************** diff --git a/src/devices/cpu/z180/z180op.inc b/src/devices/cpu/z180/z180op.inc index 93742103a7d..b3005629a78 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().c_str(), irq_vector)); + LOG(("Z180 '%s' single int. irq_vector $%02x\n", tag(), 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().c_str() , irq_vector, _PCD)); + LOG(("Z180 '%s' IM2 [$%04x] = $%04x\n",tag() , 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().c_str() )); + LOG(("Z180 '%s' IM1 $0038\n",tag() )); 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().c_str() , irq_vector)); + LOG(("Z180 '%s' IM0 $%04x\n",tag() , 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().c_str(), irq, irq_vector, _PCD)); + LOG(("Z180 '%s' INT%d [$%04x] = $%04x\n", tag(), 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 17a90c42713..36f06a6847f 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().c_str(), m_IFF1, m_IFF2)); \ + LOG(("Z180 '%s' RETN IFF1:%d IFF2:%d\n", tag(), 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 1c9928fbc95..d6c4fe3de77 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, std::string 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, const char *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, std::string _tag, device_t *_owner, UINT32 _clock) +z8601_device::z8601_device(const machine_config &mconfig, const char *_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, std::string _tag, device_t *_owner, UINT32 _clock) +ub8830d_device::ub8830d_device(const machine_config &mconfig, const char *_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, std::string _tag, device_t *_owner, UINT32 _clock) +z8611_device::z8611_device(const machine_config &mconfig, const char *_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 0620b956cd4..6ef667c74cc 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, std::string _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, const char *_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, std::string _tag, device_t *_owner, UINT32 _clock); + z8601_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); }; class ub8830d_device : public z8_device { public: - ub8830d_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock); + ub8830d_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); }; class z8611_device : public z8_device { public: - z8611_device(const machine_config &mconfig, std::string _tag, device_t *_owner, UINT32 _clock); + z8611_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); }; diff --git a/src/devices/cpu/z80/kl5c80a12.cpp b/src/devices/cpu/z80/kl5c80a12.cpp index 85128508900..7d6cdf70538 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kl5c80a12_device::kl5c80a12_device(const machine_config &mconfig, const char *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 0948b1cc5ac..7ad3e16ca85 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, std::string tag, device_t *owner, UINT32); + kl5c80a12_device(const machine_config &mconfig, const char *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 e41e12e726f..428dd924c71 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, std::string tag, device_t *owner, UINT32 clock) +tmpz84c011_device::tmpz84c011_device(const machine_config &mconfig, const char *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 f44f7cf0119..ffb5cdbd96f 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, std::string tag, device_t *owner, UINT32); + tmpz84c011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32); // static configuration helpers template static devcb_base &set_zc0_callback(device_t &device, _Object object) { return downcast(device).m_zc0_cb.set_callback(object); } diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp index 4db320d8e5d..d61ae4ef4c5 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, std::string tag, device_t *owner, UINT32 clock) +tmpz84c015_device::tmpz84c015_device(const machine_config &mconfig, const char *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 6b0ffedb7c7..559d7350602 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, std::string tag, device_t *owner, UINT32); + tmpz84c015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32); // static configuration helpers template static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast(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 77095d869b1..345ea4334bf 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().c_str(), m_iff1, m_iff2)); + tag(), 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().c_str(), m_decrypted_opcodes_direct->read_byte((PCD-1)&0xffff), m_decrypted_opcodes_direct->read_byte(PCD)); + tag(), 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().c_str(), m_decrypted_opcodes_direct->read_byte((PCD-1)&0xffff)); + tag(), 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().c_str(), irq_vector)); + LOG(("Z80 '%s' single int. irq_vector $%02x\n", tag(), 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().c_str(), irq_vector, PCD)); + LOG(("Z80 '%s' IM2 [$%04x] = $%04x\n", tag(), 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().c_str())); + LOG(("Z80 '%s' IM1 $0038\n", tag())); 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().c_str(), irq_vector)); + LOG(("Z80 '%s' IM0 $%04x\n", tag(), 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().c_str())); + LOG(("Z80 '%s' take NMI\n", tag())); 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().c_str())); + LOG(("Z80 '%s' take NMI\n", tag())); 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, std::string tag, device_t *owner, UINT32 clock) : +z80_device::z80_device(const machine_config &mconfig, const char *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, std::string tag, device_t { } -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) : +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) : 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; -nsc800_device::nsc800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nsc800_device::nsc800_device(const machine_config &mconfig, const char *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 1137955dd0d..c523f101a24 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, std::string tag, device_t *owner, UINT32 clock); + z80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER( irq_line ); @@ -48,7 +48,7 @@ public: template static devcb_base &set_refresh_cb(device_t &device, _Object object) { return downcast(device).m_refresh_cb.set_callback(object); } protected: - 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + nsc800_device(const machine_config &mconfig, const char *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 ee56855815d..dcc52f92fb0 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; const device_type Z8002 = &device_creator; -z8002_device::z8002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +z8002_device::z8002_device(const machine_config &mconfig, const char *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, std::string tag, devic } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +z8001_device::z8001_device(const machine_config &mconfig, const char *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().c_str(), type & 0xff)); + LOG(("Z8K '%s' SYSCALL $%02x\n", tag(), 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().c_str(), m_pc)); + LOG(("Z8K '%s' ext instr trap $%04x\n", tag(), 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().c_str(), m_pc)); + LOG(("Z8K '%s' priv instr trap $%04x\n", tag(), 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().c_str(), m_pc)); + LOG(("Z8K '%s' syscall $%04x\n", tag(), 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().c_str(), m_pc)); + LOG(("Z8K '%s' segtrap $%04x\n", tag(), 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().c_str(), m_pc)); + LOG(("Z8K '%s' NMI $%04x\n", tag(), 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().c_str(), m_pc)); + LOG(("Z8K '%s' NVI $%04x\n", tag(), 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().c_str(), 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(), 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 59ae874e349..98ccc6ddea4 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, 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(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(); template static devcb_base &set_mo_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + z8001_device(const machine_config &mconfig, const char *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 afce5003dbb..c9d0b365783 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().c_str(), m_pc, imm8)); + LOG(("Z8K '%s' %04x: ext0e $%02x\n", tag(), 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().c_str(), m_pc, imm8)); + LOG(("Z8K '%s' %04x: ext0f $%02x\n", tag(), 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().c_str(), m_pc, imm8)); + LOG(("Z8K '%s' %04x: rsvd36 $%02x\n", tag(), 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().c_str(), m_pc, imm8)); + LOG(("Z8K '%s' %04x: rsvd38 $%02x\n", tag(), 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().c_str(), m_pc, imm8)); + LOG(("Z8K '%s' %04x: rsvd78 $%02x\n", tag(), 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().c_str(), tag, fcw, m_pc)); + LOG(("Z8K '%s' IRET tag $%04x, fcw $%04x, pc $%04x\n", this->tag(), 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().c_str(), dst, imm3)); + LOG(("Z8K '%s' LDCTL R%d,%d\n", tag(), 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().c_str(), imm3, src)); + LOG(("Z8K '%s' LDCTL %d,R%d\n", tag(), 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().c_str(), m_pc, imm8)); + LOG(("Z8K '%s' %04x: rsvd7e $%02x\n", tag(), 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().c_str(), m_pc, imm8)); + LOG(("Z8K '%s' %04x: ext8e $%02x\n", tag(), 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().c_str(), m_pc, imm8)); + LOG(("Z8K '%s' %04x: ext8f $%02x\n", tag(), 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().c_str(), m_pc, imm8)); + LOG(("Z8K '%s' %04x: rsvd9d $%02x\n", tag(), 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().c_str(), m_pc, imm8)); + LOG(("Z8K '%s' %04x: rsvd9f $%02x\n", tag(), 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().c_str(), m_pc, imm8)); + LOG(("Z8K '%s' %04x: rsvdb9 $%02x\n", tag(), 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().c_str(), m_pc, imm8)); + LOG(("Z8K '%s' %04x: rsvdbf $%02x\n", tag(), 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 6f87fa9932e..9577d9e1efd 100644 --- a/src/devices/imagedev/bitbngr.cpp +++ b/src/devices/imagedev/bitbngr.cpp @@ -21,7 +21,7 @@ const device_type BITBANGER = &device_creator; ctor -------------------------------------------------*/ -bitbanger_device::bitbanger_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +bitbanger_device::bitbanger_device(const machine_config &mconfig, const char *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 6974687ae60..cd0f38df516 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, std::string tag, device_t *owner, UINT32 clock); + bitbanger_device(const machine_config &mconfig, const char *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 6ab29e997da..aedc6509d42 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 - constructor //------------------------------------------------- -cassette_image_device::cassette_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cassette_image_device::cassette_image_device(const machine_config &mconfig, const char *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 && dev->tag()!=device().tag(); dev = iter.next()) + for (dev = iter.first(); dev != nullptr && strcmp( 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 432305001fb..e7edd0acef2 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, std::string tag, device_t *owner, UINT32 clock); + cassette_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~cassette_image_device(); static void static_set_formats(device_t &device, const struct CassetteFormat* const *formats) { downcast(device).m_formats = formats; } diff --git a/src/devices/imagedev/chd_cd.cpp b/src/devices/imagedev/chd_cd.cpp index 8be7c2aefaa..d9ab295dfad 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 - constructor //------------------------------------------------- -cdrom_image_device::cdrom_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cdrom_image_device::cdrom_image_device(const machine_config &mconfig, const char *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, std::strin { } -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) +cdrom_image_device::cdrom_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, 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().c_str()); + chd_file *chd = machine().rom_load().get_disk_handle(owner()->tag() ); 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 f9d03528ba1..5d229a471b4 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, 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); + 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); virtual ~cdrom_image_device(); static void static_set_interface(device_t &device, const char *_interface) { downcast(device).m_interface = _interface; } diff --git a/src/devices/imagedev/diablo.cpp b/src/devices/imagedev/diablo.cpp index 3debbccce2c..be8b3e500f2 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 - constructor //------------------------------------------------- -diablo_image_device::diablo_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +diablo_image_device::diablo_image_device(const machine_config &mconfig, const char *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().c_str()); + chd_file *handle = machine().rom_load().get_disk_handle(tag()); 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 be44e8baf08..00df1345bbd 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, std::string tag, device_t *owner, UINT32 clock); + diablo_image_device(const machine_config &mconfig, const char *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(device).m_device_image_load = callback; } diff --git a/src/devices/imagedev/flopdrv.cpp b/src/devices/imagedev/flopdrv.cpp index 09b99bfe315..71bfd2c7158 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().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; + 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; return drive; } @@ -694,7 +694,7 @@ const device_type LEGACY_FLOPPY = &device_creator; // legacy_floppy_image_device - constructor //------------------------------------------------- -legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), m_out_idx_func(*this), diff --git a/src/devices/imagedev/flopdrv.h b/src/devices/imagedev/flopdrv.h index 02b4f80aa8c..9d4333cfae2 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, 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(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(); template static devcb_base &set_out_idx_func(device_t &device, _Object object) { return downcast(device).m_out_idx_func.set_callback(object); } diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index 066866c843f..2d6eb4d5460 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, std::string tag, device_t *owner, UINT32 clock) : +floppy_connector::floppy_connector(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_card_interface(mconfig, *this), @@ -625,7 +625,7 @@ void floppy_image_device::stp_w(int state) } if(ocyl != cyl) { - if (TRACE_STEP) logerror("%s: track %d\n", tag().c_str(), cyl); + if (TRACE_STEP) logerror("%s: track %d\n", tag(), 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().c_str(), cyl, subcyl); + logerror("%s: track %d.%d\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) +floppy_sound_device::floppy_sound_device(const machine_config &mconfig, const char *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().c_str(), "525") != nullptr; + m_is525 = strstr(tag(), "525") != nullptr; if (m_is525) { m_sampleindex_motor_start = 2; @@ -1337,7 +1337,7 @@ const device_type FLOPPYSOUND = &device_creator; // 3" single-sided double density //------------------------------------------------- -floppy_3_ssdd::floppy_3_ssdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +floppy_3_ssdd::floppy_3_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_3_SSDD, "3\" single sided floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_3_dsdd::floppy_3_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_3_DSDD, "3\" double sided floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_35_ssdd::floppy_35_ssdd(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +floppy_35_dd::floppy_35_dd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_35_DD, "3.5\" double density floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_35_hd::floppy_35_hd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_35_HD, "3.5\" high density floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_35_ed::floppy_35_ed(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_35_ED, "3.5\" extended density floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_525_sssd_35t::floppy_525_sssd_35t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_SSSD_35T, "5.25\" single-sided single density 35-track floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_525_sd_35t::floppy_525_sd_35t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_SD_35T, "5.25\" single density 35-track floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_525_sssd::floppy_525_sssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_SSSD, "5.25\" single-sided single density floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_525_sd::floppy_525_sd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_SD, "5.25\" single density floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_525_ssdd::floppy_525_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_SSDD, "5.25\" single-sided double density floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_525_dd::floppy_525_dd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_DD, "5.25\" double density floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_525_ssqd::floppy_525_ssqd(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +floppy_525_qd::floppy_525_qd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_QD, "5.25\" quad density floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_525_hd::floppy_525_hd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_HD, "5.25\" high density floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_8_sssd::floppy_8_sssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_8_SSSD, "8\" single density single sided floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_8_dssd::floppy_8_dssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_8_DSSD, "8\" single density double sided floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_8_ssdd::floppy_8_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_8_DSDD, "8\" double density single sided floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +floppy_8_dsdd::floppy_8_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_8_DSDD, "8\" double density double sided floppy drive", tag, owner, clock, "floppy_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, std::string tag, device_t *owner, UINT32 clock) : +epson_smd_165::epson_smd_165(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +epson_sd_320::epson_sd_320(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +epson_sd_321::epson_sd_321(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +sony_oa_d31v::sony_oa_d31v(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +sony_oa_d32w::sony_oa_d32w(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +sony_oa_d32v::sony_oa_d32v(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +teac_fd_55e::teac_fd_55e(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +teac_fd_55f::teac_fd_55f(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +teac_fd_55g::teac_fd_55g(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +alps_3255190x::alps_3255190x(const machine_config &mconfig, const char *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 25a60219095..4d50d74234d 100644 --- a/src/devices/imagedev/floppy.h +++ b/src/devices/imagedev/floppy.h @@ -67,7 +67,7 @@ public: typedef delegate wpt_cb; // construction/destruction - 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); + floppy_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual ~floppy_image_device(); virtual void handled_variants(UINT32 *variants, int &var_count) const = 0; @@ -226,7 +226,7 @@ protected: #define DECLARE_FLOPPY_IMAGE_DEVICE(_name, _interface) \ class _name : public floppy_image_device { \ public: \ - _name(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); \ + _name(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + floppy_sound_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + floppy_connector(const machine_config &mconfig, const char *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 dafb63f55a6..b5fd6ca87dc 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 - constructor //------------------------------------------------- -harddisk_image_device::harddisk_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +harddisk_image_device::harddisk_image_device(const machine_config &mconfig, const char *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, std: //------------------------------------------------- // harddisk_image_device - constructor for subclasses //------------------------------------------------- -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) +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) : 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().c_str()); + chd_file *handle = machine().rom_load().get_disk_handle(tag()); 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 b72f7e4ee10..b85418e8c33 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, std::string tag, device_t *owner, UINT32 clock); + harddisk_image_device(const machine_config &mconfig, const char *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(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, std::string 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, const char *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 802194feba6..bc8987d7b0f 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, std::string 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, const char *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().c_str()); + logerror("%s: chdfile is null\n", tag()); 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().c_str()); + logerror("%s: Failed to read CHD metadata\n", tag()); return IMAGE_INIT_FAIL; } - if (TRACE_CONFIG) logerror("%s: CHD metadata: %s\n", tag().c_str(), metadata.c_str()); + if (TRACE_CONFIG) logerror("%s: CHD metadata: %s\n", tag(), 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().c_str(), m_encoding); + if (TRACE_CONFIG) logerror("%s: Set encoding to %d\n", tag(), m_encoding); if (sscanf(metadata.c_str(), HARD_DISK_METADATA_FORMAT, ¶m.cylinders, ¶m.heads, ¶m.sectors_per_track, ¶m.sector_size) != 4) { - logerror("%s: Invalid CHD metadata\n", tag().c_str()); + logerror("%s: Invalid CHD metadata\n", tag()); return IMAGE_INIT_FAIL; } - 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 (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 (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().c_str()); + logerror("%s: Failed to read CHD sector arrangement/recording specs, applying defaults\n", tag()); } 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().c_str()); + if (TRACE_CONFIG) logerror("%s: Sector arrangement/recording specs have invalid values, applying defaults\n", tag()); 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().c_str(), param.interleave, param.cylskew, param.headskew, param.write_precomp_cylinder, param.reduced_wcurr_cylinder); + tag(), 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().c_str()); + logerror("%s: Failed to read CHD track gap specs, applying defaults\n", tag()); } 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().c_str()); + if (TRACE_CONFIG) logerror("%s: MFM HD gap specs have invalid values, applying defaults\n", tag()); 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().c_str(), param.gap1, param.gap2, param.gap3, param.sync, param.headerlen, param.ecctype); + tag(), 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().c_str(), settle_us/1000, (int)step_us); + if (TRACE_CONFIG) logerror("%s: Calculated settle time: %0.2f ms, step: %d us\n", tag(), 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().c_str()); + logerror("%s: Could not load CHD\n", tag()); } 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().c_str()); + logerror("%s: MFM HD sector arrangement and recording specs have changed; updating CHD metadata\n", tag()); 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().c_str()); + logerror("%s: Failed to save MFM HD sector arrangement/recording specs to CHD\n", tag()); } } 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().c_str()); + logerror("%s: MFM HD track gap specs have changed; updating CHD metadata\n", tag()); 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().c_str()); + logerror("%s: Failed to save MFM HD track gap specs to CHD\n", tag()); } } } @@ -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().c_str(), 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(), 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().c_str(), m_current_cylinder); + if (TRACE_STEPS && TRACE_DETAIL) logerror("%s: Arrived at target cylinder %d, settling ...\n", tag(), 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().c_str(), m_current_cylinder); + if (TRACE_STATE) logerror("%s: Spinup complete, drive recalibrated and positioned at cylinder %d; drive is READY\n", tag(), 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().c_str(), m_current_cylinder); + if (TRACE_SIGNALS) logerror("%s: Settling done at cylinder %d, seek complete\n", tag(), 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().c_str()); + if (TRACE_STEPS) logerror("%s: Recalibrate to track 0\n", tag()); 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().c_str(), steps, (m_track_delta<0)? "outward" : "inward"); + if (TRACE_STEPS) logerror("%s: Moving head by %d step(s) %s\n", tag(), 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().c_str(), tts(m_step_time * steps).c_str()); + if (TRACE_TIMING) logerror("%s: Head movement takes %s time\n", tag(), 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().c_str(), m_seek_inward? "inward" : "outward"); + if (TRACE_STEPS && TRACE_DETAIL) logerror("%s: Setting seek direction %s\n", tag(), 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().c_str(), m_track_delta); + if (TRACE_STEPS && TRACE_DETAIL) logerror("%s: Got seek pulse; track delta %d\n", tag(), 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().c_str()); + if (TRACE_STEPS) logerror("%s: Excessive step pulses - doing auto-truncation\n", tag()); 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), m_current_cylinder, m_current_head, bytepos); + if (TRACE_READ) logerror("%s: Reading (c=%d,h=%d) at position %d\n", tag(), 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().c_str(), 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(), 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, std::string tag, device_t *owner, UINT32 clock) +mfm_hd_generic_device::mfm_hd_generic_device(const machine_config &mconfig, const char *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; /* Various models. */ -mfm_hd_st213_device::mfm_hd_st213_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mfm_hd_st213_device::mfm_hd_st213_device(const machine_config &mconfig, const char *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, std::str const device_type MFMHD_ST213 = &device_creator; -mfm_hd_st225_device::mfm_hd_st225_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mfm_hd_st225_device::mfm_hd_st225_device(const machine_config &mconfig, const char *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, std::str const device_type MFMHD_ST225 = &device_creator; -mfm_hd_st251_device::mfm_hd_st251_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mfm_hd_st251_device::mfm_hd_st251_device(const machine_config &mconfig, const char *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().c_str()); + if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache destroy\n", m_mfmhd->tag()); 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().c_str()); + if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache cleanup\n", m_mfmhd->tag()); // 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().c_str(), current->cylinder, current->head); + 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 (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().c_str(), trackslots); + if (TRACE_CACHE) m_machine.logerror("%s: MFM HD cache init; cache size is %d tracks\n", mfmhd->tag(), 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().c_str()); + if (TRACE_CACHE && TRACE_DETAIL) m_machine.logerror("%s: MFM HD allocate cache slot\n", mfmhd->tag()); 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().c_str(), current->cylinder, current->head); + 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 (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, std::string tag, device_t *owner, UINT32 clock): +mfm_harddisk_connector::mfm_harddisk_connector(const machine_config &mconfig, const char *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 4360658f6f3..fe55ad12989 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~mfm_harddisk_device(); typedef delegate 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, std::string tag, device_t *owner, UINT32 clock); + mfm_hd_generic_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mfm_hd_st213_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mfm_hd_st225_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mfm_hd_st251_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mfm_harddisk_connector(const machine_config &mconfig, const char *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 f8771ea8e11..ae5bdb81eb8 100644 --- a/src/devices/imagedev/midiin.cpp +++ b/src/devices/imagedev/midiin.cpp @@ -22,7 +22,7 @@ const device_type MIDIIN = &device_creator; ctor -------------------------------------------------*/ -midiin_device::midiin_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +midiin_device::midiin_device(const machine_config &mconfig, const char *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 350d91a105b..b4c04d1e549 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, std::string tag, device_t *owner, UINT32 clock); + midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_input_callback(device_t &device, _Object object) { return downcast(device).m_input_cb.set_callback(object); } diff --git a/src/devices/imagedev/midiout.cpp b/src/devices/imagedev/midiout.cpp index c770ec10ba7..a8651c40b49 100644 --- a/src/devices/imagedev/midiout.cpp +++ b/src/devices/imagedev/midiout.cpp @@ -22,7 +22,7 @@ const device_type MIDIOUT = &device_creator; ctor -------------------------------------------------*/ -midiout_device::midiout_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +midiout_device::midiout_device(const machine_config &mconfig, const char *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 9281fe6f5a6..b154773ddea 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, std::string tag, device_t *owner, UINT32 clock); + midiout_device(const machine_config &mconfig, const char *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 4b3f95ec705..aedfecbeddd 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 - constructor //------------------------------------------------- -printer_image_device::printer_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +printer_image_device::printer_image_device(const machine_config &mconfig, const char *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 475a974d708..8db31298bf7 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, std::string tag, device_t *owner, UINT32 clock); + printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_online_callback(device_t &device, _Object object) { return downcast(device).m_online_cb.set_callback(object); } diff --git a/src/devices/imagedev/snapquik.cpp b/src/devices/imagedev/snapquik.cpp index 84160a92537..a3c55ff4064 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 - constructor //------------------------------------------------- -snapshot_image_device::snapshot_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +snapshot_image_device::snapshot_image_device(const machine_config &mconfig, const char *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, std: { } -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) : +snapshot_image_device::snapshot_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), m_file_extensions(nullptr), @@ -96,7 +96,7 @@ const device_type QUICKLOAD = &device_creator; // quickload_image_device - constructor //------------------------------------------------- -quickload_image_device::quickload_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +quickload_image_device::quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : snapshot_image_device(mconfig, QUICKLOAD, "Quickload", tag, owner, clock, "quickload", __FILE__) { } diff --git a/src/devices/imagedev/snapquik.h b/src/devices/imagedev/snapquik.h index 04bb2de4800..3b88319a121 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, 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); + 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); virtual ~snapshot_image_device(); static void static_set_interface(device_t &device, const char *_interface) { downcast(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, std::string tag, device_t *owner, UINT32 clock); + quickload_image_device(const machine_config &mconfig, const char *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 8364f5dbf5d..c220f9eb18c 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 - constructor //------------------------------------------------- -cmos_40105_device::cmos_40105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cmos_40105_device::cmos_40105_device(const machine_config &mconfig, const char *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 ea85a3af005..09411a0d3e3 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, std::string tag, device_t *owner, UINT32 clock); + cmos_40105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template void set_dir_callback(_dir dir) { m_write_dir.set_callback(dir); } template 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 b77ba37a72a..c77baa6a8dc 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 - constructor/destructor //------------------------------------------------- -ncr53c7xx_device::ncr53c7xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ncr53c7xx_device::ncr53c7xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nscsi_device(mconfig, NCR53C7XX, "53C7xx SCSI", tag, owner, clock, "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 3167e45114d..00d87c6337d 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, std::string tag, device_t *owner, UINT32 clock); + ncr53c7xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/machine/53c810.cpp b/src/devices/machine/53c810.cpp index db88b7130db..2d6b7049016 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, std::string tag, device_t *owner, UINT32 clock) +lsi53c810_device::lsi53c810_device(const machine_config &mconfig, const char *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 51958111d2f..49ac2281e2f 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, std::string tag, device_t *owner, UINT32 clock); + lsi53c810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_irq_callback(device_t &device, lsi53c810_irq_delegate callback) { downcast(device).m_irq_cb = callback; } static void set_dma_callback(device_t &device, lsi53c810_dma_delegate callback) { downcast(device).m_dma_cb = callback; } diff --git a/src/devices/machine/64h156.cpp b/src/devices/machine/64h156.cpp index d60d7de86a4..fbbe84d7383 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 - constructor //------------------------------------------------- -c64h156_device::c64h156_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +c64h156_device::c64h156_device(const machine_config &mconfig, const char *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 055239af5dc..6cab8bb369d 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, std::string tag, device_t *owner, UINT32 clock); + c64h156_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_atn_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_atn.set_callback(object); } template static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_sync.set_callback(object); } diff --git a/src/devices/machine/6522via.cpp b/src/devices/machine/6522via.cpp index fe4b7d8f37f..56a35e19040 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, std::string tag, device_t *owner, UINT32 clock) +via6522_device::via6522_device(const machine_config &mconfig, const char *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().c_str(), m_ifr); + logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag(), 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().c_str(), m_ifr); + logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag(), 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().c_str(), data); + logerror("%s:6522VIA chip %s: PCR = %02X\n", machine().describe_context(), tag(), 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().c_str(), m_in_ca1); + logerror("%s:6522VIA chip %s: CA1 = %02X\n", machine().describe_context(), tag(), 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 b0f34e14d4a..467ff0885fb 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, std::string tag, device_t *owner, UINT32 clock); + via6522_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // TODO: REMOVE THESE template static devcb_base &set_readpa_handler(device_t &device, _Object object) { return downcast(device).m_in_a_handler.set_callback(object); } diff --git a/src/devices/machine/6525tpi.cpp b/src/devices/machine/6525tpi.cpp index cb5d6b40f08..8d5a43a2b35 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tpi6525_device::tpi6525_device(const machine_config &mconfig, const char *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().c_str())); + DBG_LOG(machine(), 3, "tpi6525", ("%s set interrupt\n", tag())); 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().c_str())); + DBG_LOG(machine(), 3, "tpi6525", ("%s clear interrupt\n", tag())); 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().c_str(), offset, data)); + DBG_LOG(machine(), 2, "tpi6525", ("%s read %.2x %.2x\n", tag(), 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().c_str(), offset, data)); + DBG_LOG(machine(), 3, "tpi6525", ("%s read %.2x %.2x\n", tag(), 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().c_str(), offset, data)); + DBG_LOG(machine(), 2, "tpi6525", ("%s write %.2x %.2x\n", tag(), offset, data)); switch (offset & 7) { diff --git a/src/devices/machine/6525tpi.h b/src/devices/machine/6525tpi.h index bb84b924d73..a1699ea213b 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, std::string tag, device_t *owner, UINT32 clock); + tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tpi6525_device() {} template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(device).m_out_irq_cb.set_callback(object); } diff --git a/src/devices/machine/6532riot.cpp b/src/devices/machine/6532riot.cpp index 40cc3f83d9d..8ef5566fbde 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, std::string tag, device_t *owner, UINT32 clock) +riot6532_device::riot6532_device(const machine_config &mconfig, const char *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 596dd65eebe..dd1699c6c48 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, std::string tag, device_t *owner, UINT32 clock); + riot6532_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast(device).m_in_pa_cb.set_callback(object); } template static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast(device).m_out_pa_cb.set_callback(object); } diff --git a/src/devices/machine/6821pia.cpp b/src/devices/machine/6821pia.cpp index 085ec25515f..a2a08180086 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 - constructor //------------------------------------------------- -pia6821_device::pia6821_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pia6821_device::pia6821_device(const machine_config &mconfig, const char *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().c_str(), 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); 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().c_str(), 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); 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().c_str()); + logerror("PIA #%s: Warning! No port CA2 write handler. Previous value has been lost!\n", tag()); } 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().c_str()); + logerror("PIA #%s: Warning! No port CB2 write handler. Previous value has been lost!\n", tag()); } 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().c_str(), ret)); + LOG(("PIA #%s: port A read = %02X\n", tag(), 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().c_str(), ret)); + LOG(("PIA #%s: DDR A read = %02X\n", tag(), 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().c_str(), ret)); + LOG(("PIA #%s: port B read = %02X\n", tag(), 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().c_str(), ret)); + LOG(("PIA #%s: DDR B read = %02X\n", tag(), 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().c_str()); + logerror("PIA #%s: Warning! No CA1 read handler. Assuming pin not connected\n", tag()); 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().c_str()); + logerror("PIA #%s: Warning! No CA2 read handler. Assuming pin not connected\n", tag()); 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().c_str(), ret)); + LOG(("PIA #%s: control A read = %02X\n", tag(), 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().c_str()); + logerror("PIA #%s: Error! no CB1 read handler. Three-state pin is undefined\n", tag()); 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().c_str()); + logerror("PIA #%s: Error! Three-state pin is undefined\n", tag()); 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().c_str(), ret)); + LOG(("PIA #%s: control B read = %02X\n", tag(), 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().c_str(), message, data)); + LOG(("PIA #%s: %s = %02X\n", tag(), 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().c_str()); + logerror("PIA #%s: Warning! No port A write handler. Previous value has been lost!\n", tag()); } 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().c_str(), message, data)); + LOG(("PIA #%s: %s = %02X\n", tag(), 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().c_str()); + logerror("PIA #%s: Warning! No port B write handler. Previous value has been lost!\n", tag()); } 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().c_str(), data)); + LOG(("PIA #%s: DDR A write = %02X (input mode)\n", tag(), data)); } else if(data == 0xff) { - LOG(("PIA #%s: DDR A write = %02X (output mode)\n", tag().c_str(), data)); + LOG(("PIA #%s: DDR A write = %02X (output mode)\n", tag(), data)); } else { - LOG(("PIA #%s: DDR A write = %02X (mixed mode)\n", tag().c_str(), data)); + LOG(("PIA #%s: DDR A write = %02X (mixed mode)\n", tag(), 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().c_str(), data)); + LOG(("PIA #%s: DDR B write = %02X (input mode)\n", tag(), data)); } else if (data == 0xff) { - LOG(("PIA #%s: DDR B write = %02X (output mode)\n", tag().c_str(), data)); + LOG(("PIA #%s: DDR B write = %02X (output mode)\n", tag(), data)); } else { - LOG(("PIA #%s: DDR B write = %02X (mixed mode)\n", tag().c_str(), data)); + LOG(("PIA #%s: DDR B write = %02X (mixed mode)\n", tag(), 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().c_str(), data)); + LOG(("PIA #%s: control A write = %02X\n", tag(), 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().c_str(), data)); + LOG(("PIA #%s: control B write = %02X\n", tag(), 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().c_str(), data)); + LOG(("PIA #%s: set input port A = %02X\n", tag(), 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().c_str(), state)); + LOG(("PIA #%s: set input CA1 = %d\n", tag(), 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().c_str())); + LOG(("PIA #%s: CA1 triggering\n", tag())); // 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().c_str(), state)); + LOG(("PIA #%s: set input CA2 = %d\n", tag(), 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().c_str())); + LOG(("PIA #%s: CA2 triggering\n", tag())); // 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().c_str(), data)); + LOG(("PIA #%s: set input port B = %02X\n", tag(), 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().c_str(), state)); + LOG(("PIA #%s: set input CB1 = %d\n", tag(), 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().c_str())); + LOG(("PIA #%s: CB1 triggering\n", tag())); // 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().c_str(), state)); + LOG(("PIA #%s: set input CB2 = %d\n", tag(), 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().c_str())); + LOG(("PIA #%s: CB2 triggering\n", tag())); // mark the IRQ m_irq_b2 = 1; diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h index 946fa4ab514..64631184d29 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, std::string tag, device_t *owner, UINT32 clock); + pia6821_device(const machine_config &mconfig, const char *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 c30494f2a1d..927ece2cb75 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 - constructors //------------------------------------------------- -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +pit68230_device::pit68230_device(const machine_config &mconfig, const char *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 8d4a9ea892f..2a2f2c6824c 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, 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); +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); template static devcb_base &set_pa_wr_callback (device_t &device, _Object object) { return downcast(device).m_write_pa.set_callback (object); diff --git a/src/devices/machine/68307.cpp b/src/devices/machine/68307.cpp index 29cf2b2eee7..cbdd2c1eed8 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, std::string tag, device_t *owner, UINT32 clock) +m68307cpu_device::m68307cpu_device(const machine_config &mconfig, const char *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 29583445d5e..60ae61db49a 100644 --- a/src/devices/machine/68307.h +++ b/src/devices/machine/68307.h @@ -39,7 +39,7 @@ typedef device_delegate static devcb_base &set_irq_cb(device_t &device, _Object object) { return downcast(device).write_irq.set_callback(object); } diff --git a/src/devices/machine/68340.cpp b/src/devices/machine/68340.cpp index 67731a5027e..b9ddd9c4b16 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, std::string tag, device_t *owner, UINT32 clock) +m68340cpu_device::m68340cpu_device(const machine_config &mconfig, const char *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 4ffb3b9cc91..4dd93bb6e51 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, std::string tag, device_t *owner, UINT32 clock); + m68340cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); int m68340_currentcs; diff --git a/src/devices/machine/6840ptm.cpp b/src/devices/machine/6840ptm.cpp index ab664982ac0..bbf9a57ce18 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 - constructor //------------------------------------------------- -ptm6840_device::ptm6840_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ptm6840_device::ptm6840_device(const machine_config &mconfig, const char *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().c_str(), counter, m_counter[counter])); + PLOG(("MC6840 #%s: read counter(%d): %d\n", tag(), 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().c_str(), counter, clock)); + PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag(), counter, clock)); } else { clock = m_external_clock[counter]; - PLOG(("MC6840 #%s: %d external clock freq %f \n", tag().c_str(), counter, clock)); + PLOG(("MC6840 #%s: %d external clock freq %f \n", tag(), 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().c_str(), counter, remaining)); + PLOG(("MC6840 #%s: read counter(%d): %d\n", tag(), 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().c_str(), idx, clock)); + PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag(), idx, clock)); } else { clock = m_external_clock[idx]; - PLOG(("MC6840 #%s: %d external clock freq %f \n", tag().c_str(), idx, clock)); + PLOG(("MC6840 #%s: %d external clock freq %f \n", tag(), 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().c_str(), idx, clock, count)); + PLOG(("MC6840 #%s: reload_count(%d): clock = %f count = %d\n", tag(), 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().c_str(), idx, duration.as_double())); + PLOG(("MC6840 #%s: reload_count(%d): output = %f\n", tag(), 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().c_str(), m_status_reg)); + PLOG(("%s: MC6840 #%s: Status read = %04X\n", machine().describe_context(), tag(), 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().c_str(), idx, result >> 8)); + PLOG(("%s: MC6840 #%s: Counter %d read = %04X\n", machine().describe_context(), tag(), 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().c_str(), idx)); + PLOG(("MC6840 #%s : Control register %d selected\n", tag(), 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().c_str())); + PLOG(("MC6840 #%s : Timer reset\n", tag())); 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().c_str(), offset / 2, data)); + PLOG(("MC6840 #%s msbbuf%d = %02X\n", tag(), 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().c_str(), idx, m_latch[idx])); + PLOG(("%s:MC6840 #%s: Counter %d latch = %04X\n", machine().describe_context(), tag(), 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().c_str(), idx)); + PLOG(("**ptm6840 %s t%d timeout**\n", tag(), 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().c_str(), idx, m_output[idx])); + PLOG(("**ptm6840 %s t%d output %d **\n", tag(), 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().c_str(), idx, m_output[idx])); + PLOG(("**ptm6840 %s t%d output %d **\n", tag(), idx, m_output[idx])); switch (idx) { diff --git a/src/devices/machine/6840ptm.h b/src/devices/machine/6840ptm.h index 36ac531cb24..5eb1cdd211c 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, std::string tag, device_t *owner, UINT32 clock); + ptm6840_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_internal_clock(device_t &device, double clock) { downcast(device).m_internal_clock = clock; } static void set_external_clocks(device_t &device, double clock0, double clock1, double clock2) { downcast(device).m_external_clock[0] = clock0; downcast(device).m_external_clock[1] = clock1; downcast(device).m_external_clock[2] = clock2; } diff --git a/src/devices/machine/6850acia.cpp b/src/devices/machine/6850acia.cpp index 7a70b05e300..7c1fcc85178 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 - constructor //------------------------------------------------- -acia6850_device::acia6850_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +acia6850_device::acia6850_device(const machine_config &mconfig, const char *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, std::string tag, { } -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) +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) : 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().c_str(), data); + if (LOG) logerror("MC6850 '%s' Control: %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC6850 '%s' Data: %02x\n", tag(), 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().c_str()); + if (LOG) logerror("MC6850 '%s': RX START BIT\n", tag()); } 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().c_str()); + if (LOG) logerror("MC6850 '%s': RX FALSE START BIT\n", tag()); } 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().c_str(), m_rx_bits, m_rxd); + if (LOG) logerror("MC6850 '%s': RX DATA BIT %d %d\n", tag(), m_rx_bits, m_rxd); } else { - if (LOG) logerror("MC6850 '%s': RX PARITY BIT %x\n", tag().c_str(), m_rxd); + if (LOG) logerror("MC6850 '%s': RX PARITY BIT %x\n", tag(), 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().c_str()); + if (LOG) logerror("MC6850 '%s': RX STOP BIT\n", tag()); 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().c_str(), m_tdr); + if (LOG) logerror("MC6850 '%s': TX DATA %x\n", tag(), 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().c_str()); + if (LOG) logerror("MC6850 '%s': TX START BIT\n", tag()); 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().c_str(), m_tx_bits, m_txd); + if (LOG) logerror("MC6850 '%s': TX DATA BIT %d %d\n", tag(), 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().c_str(), m_txd); + if (LOG) logerror("MC6850 '%s': TX PARITY BIT %d\n", tag(), 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().c_str(), m_tx_bits); + if (LOG) logerror("MC6850 '%s': TX STOP BIT %d\n", tag(), m_tx_bits); if (m_tx_bits == m_stopbits) { diff --git a/src/devices/machine/6850acia.h b/src/devices/machine/6850acia.h index 6712a07d7a5..efaf153bc0c 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, std::string tag, device_t *owner, UINT32 clock); + acia6850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); // device-level overrides virtual void device_start() override; diff --git a/src/devices/machine/68561mpcc.cpp b/src/devices/machine/68561mpcc.cpp index 3b5c8904a06..29c5673a052 100644 --- a/src/devices/machine/68561mpcc.cpp +++ b/src/devices/machine/68561mpcc.cpp @@ -27,7 +27,7 @@ const device_type MPCC68561 = &device_creator; IMPLEMENTATION ***************************************************************************/ -mpcc68561_t::mpcc68561_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +mpcc68561_t::mpcc68561_t(const machine_config &mconfig, const char *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 683a17bc6ff..bb0bb4c2c6d 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, std::string tag, device_t *owner, UINT32 clock); + mpcc68561_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast(device).intrq_cb.set_callback(object); } diff --git a/src/devices/machine/7200fifo.cpp b/src/devices/machine/7200fifo.cpp index 1b790ff93d1..59e659ae9b5 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 - constructor //------------------------------------------------- -fifo7200_device::fifo7200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +fifo7200_device::fifo7200_device(const machine_config &mconfig, const char *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().c_str()); + logerror("IDT7200 %s fifo_write overflow!\n", tag()); return; } @@ -108,7 +108,7 @@ UINT16 fifo7200_device::fifo_read() { if (m_ef) { - logerror("IDT7200 %s fifo_read underflow!\n", tag().c_str()); + logerror("IDT7200 %s fifo_read underflow!\n", tag()); return 0x1ff; } diff --git a/src/devices/machine/7200fifo.h b/src/devices/machine/7200fifo.h index 4e848231f32..044484de076 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, std::string tag, device_t *owner, UINT32 clock); + fifo7200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_ef_handler(device_t &device, _Object object) { return downcast(device).m_ef_handler.set_callback(object); } diff --git a/src/devices/machine/74123.cpp b/src/devices/machine/74123.cpp index 551bdbe0a68..d5eddbe91a3 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 - constructor //------------------------------------------------- -ttl74123_device::ttl74123_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ttl74123_device::ttl74123_device(const machine_config &mconfig, const char *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().c_str(), output); + if (LOG) logerror("74123 %s: Output: %d\n", tag(), 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().c_str(), duration.as_double()); + if (LOG) logerror("74123 %s: Retriggering pulse. Duration: %f\n", tag(), duration.as_double()); } else { - if (LOG) logerror("74123 %s: Retriggering failed.\n", tag().c_str()); + if (LOG) logerror("74123 %s: Retriggering failed.\n", tag()); } } else @@ -181,7 +181,7 @@ void ttl74123_device::start_pulse() set_output(); - if (LOG) logerror("74123 %s: Starting pulse. Duration: %f\n", tag().c_str(), duration.as_double()); + if (LOG) logerror("74123 %s: Starting pulse. Duration: %f\n", tag(), 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().c_str() ); + if (LOG) logerror("74123 #%s: Cleared\n", tag() ); } m_clear = data; } diff --git a/src/devices/machine/74123.h b/src/devices/machine/74123.h index bebc42580a4..898dd48e6ea 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, std::string tag, device_t *owner, UINT32 clock); + ttl74123_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_connection_type(device_t &device, int type) { downcast(device).m_connection_type = type; } static void set_resistor_value(device_t &device, double value) { downcast(device).m_res = value; } diff --git a/src/devices/machine/74145.cpp b/src/devices/machine/74145.cpp index 52f4ac8503d..f85439398de 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 - constructor //------------------------------------------------- -ttl74145_device::ttl74145_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ttl74145_device::ttl74145_device(const machine_config &mconfig, const char *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 adbb48a1834..a6472f69291 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, std::string tag, device_t *owner, UINT32 clock); + ttl74145_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_output_line_0_callback(device_t &device, _Object object) { return downcast(device).m_output_line_0_cb.set_callback(object); } template static devcb_base &set_output_line_1_callback(device_t &device, _Object object) { return downcast(device).m_output_line_1_cb.set_callback(object); } diff --git a/src/devices/machine/74148.cpp b/src/devices/machine/74148.cpp index d6065ebb4e1..71520535f63 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ttl74148_device::ttl74148_device(const machine_config &mconfig, const char *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 8efedd3ec42..37ca98cf0ec 100644 --- a/src/devices/machine/74148.h +++ b/src/devices/machine/74148.h @@ -52,13 +52,10 @@ typedef device_delegate ttl74148_output_delegate; class ttl74148_device : public device_t { public: - ttl74148_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~ttl74148_device() {} - static void set_output_callback(device_t &device, ttl74148_output_delegate callback) - { - downcast(device).m_output_cb = callback; - } + static void set_output_callback(device_t &device, ttl74148_output_delegate callback) { downcast(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 c9f4ff0ab4a..d5b8ad37634 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ttl74153_device::ttl74153_device(const machine_config &mconfig, const char *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 d285c9bb2b0..491fce01565 100644 --- a/src/devices/machine/74153.h +++ b/src/devices/machine/74153.h @@ -47,7 +47,7 @@ typedef device_delegate ttl74153_output_delegate; class ttl74153_device : public device_t { public: - ttl74153_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ttl74153_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~ttl74153_device() {} static void set_output_callback(device_t &device, ttl74153_output_delegate callback) { downcast(device).m_output_cb = callback; } diff --git a/src/devices/machine/74181.cpp b/src/devices/machine/74181.cpp index b8eaa70cbdf..a58b2cd190c 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 - constructor //------------------------------------------------- -ttl74181_device::ttl74181_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +ttl74181_device::ttl74181_device(const machine_config &mconfig, const char *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 0a521db590e..563acb3943e 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, std::string tag, device_t *owner, UINT32 clock); + ttl74181_device(const machine_config &mconfig, const char *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 dcf3dae2e3d..1b6ce95033d 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 - constructor //------------------------------------------------- -ttl7474_device::ttl7474_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ttl7474_device::ttl7474_device(const machine_config &mconfig, const char *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 d029aec0752..15ece073ad1 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, std::string tag, device_t *owner, UINT32 clock); + ttl7474_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_output_cb(device_t &device, _Object object) { return downcast(device).m_output_func.set_callback(object); } diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp index 98901cc280a..a1d36a41b43 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 - constructor //------------------------------------------------- -kbdc8042_device::kbdc8042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kbdc8042_device::kbdc8042_device(const machine_config &mconfig, const char *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 4f5fe666f03..169c2f9cb12 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, std::string tag, device_t *owner, UINT32 clock); + kbdc8042_device(const machine_config &mconfig, const char *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 7f344047b01..c618fd57004 100644 --- a/src/devices/machine/8530scc.cpp +++ b/src/devices/machine/8530scc.cpp @@ -25,7 +25,7 @@ const device_type SCC8530 = &device_creator; IMPLEMENTATION ***************************************************************************/ -scc8530_t::scc8530_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +scc8530_t::scc8530_t(const machine_config &mconfig, const char *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 2032c89ad34..2e6e703ceb8 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, std::string tag, device_t *owner, UINT32 clock); + scc8530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast(device).intrq_cb.set_callback(object); } diff --git a/src/devices/machine/aakart.cpp b/src/devices/machine/aakart.cpp index 0701542c640..7931f1c019d 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 - constructor //------------------------------------------------- -aakart_device::aakart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +aakart_device::aakart_device(const machine_config &mconfig, const char *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 1e209211676..15eefd6bf92 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, std::string tag, device_t *owner, UINT32 clock); + aakart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast(device).m_out_tx_cb.set_callback(object); } template static devcb_base &set_out_rx_callback(device_t &device, _Object object) { return downcast(device).m_out_rx_cb.set_callback(object); } diff --git a/src/devices/machine/adc0808.cpp b/src/devices/machine/adc0808.cpp index 6336fdd6869..da7b21f883e 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 - constructor //------------------------------------------------- -adc0808_device::adc0808_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +adc0808_device::adc0808_device(const machine_config &mconfig, const char *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 08596cf1136..9a863e4ef81 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, std::string tag, device_t *owner, UINT32 clock); + adc0808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_eoc_callback(device_t &device, _Object object) { return downcast(device).m_out_eoc_cb.set_callback(object); } static void set_in_vref_pos_callback(device_t &device, adc0808_analog_read_delegate callback) { downcast(device).m_in_vref_pos_cb = callback; } diff --git a/src/devices/machine/adc083x.cpp b/src/devices/machine/adc083x.cpp index 620bec89f4a..690c2d0e1fd 100644 --- a/src/devices/machine/adc083x.cpp +++ b/src/devices/machine/adc083x.cpp @@ -51,7 +51,7 @@ const device_type ADC0832 = &device_creator; const device_type ADC0834 = &device_creator; const device_type ADC0838 = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +adc0831_device::adc0831_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +adc0832_device::adc0832_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +adc0834_device::adc0834_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +adc0838_device::adc0838_device(const machine_config &mconfig, const char *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().c_str(), state ); + verboselog( 2, *this, "adc083x_cs_write( %s, %d )\n", tag(), 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().c_str(), state ); + verboselog( 2, *this, "adc083x_clk_write( %s, %d )\n", tag(), 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().c_str() ); + verboselog( 1, *this, "adc083x %s got start bit\n", tag() ); 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().c_str() ); + verboselog( 1, *this, "adc083x %s not start bit\n", tag() ); } break; @@ -294,7 +294,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write ) { m_sgl = 1; } - verboselog( 1, *this, "adc083x %s sgl <- %d\n", tag().c_str(), m_sgl ); + verboselog( 1, *this, "adc083x %s sgl <- %d\n", tag(), 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().c_str(), m_odd ); + verboselog( 1, *this, "adc083x %s odd <- %d\n", tag(), 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().c_str(), m_sel1 ); + verboselog( 1, *this, "adc083x %s sel1 <- %d\n", tag(), 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().c_str(), m_sel0 ); + verboselog( 1, *this, "adc083x %s sel0 <- %d\n", tag(), 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().c_str() ); + verboselog( 1, *this, "adc083x %s not se\n", tag() ); } else { - verboselog( 1, *this, "adc083x %s got se\n", tag().c_str() ); + verboselog( 1, *this, "adc083x %s got se\n", tag() ); 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().c_str() ); + verboselog( 1, *this, "adc083x %s mux settle\n", tag() ); 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().c_str(), m_bit, m_do ); + verboselog( 1, *this, "adc083x %s msb %d -> %d\n", tag(), 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().c_str(), m_bit, m_do ); + verboselog( 1, *this, "adc083x %s lsb %d -> %d\n", tag(), 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().c_str(), state ); + verboselog( 2, *this, "adc083x_di_write( %s, %d )\n", tag(), 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().c_str(), state ); + verboselog( 2, *this, "adc083x_se_write( %s, %d )\n", tag(), 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().c_str(), m_sars ); + verboselog( 1, *this, "adc083x_sars_read( %s ) %d\n", tag(), 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().c_str(), m_do ); + verboselog( 1, *this, "adc083x_do_read( %s ) %d\n", tag(), m_do ); return m_do; } diff --git a/src/devices/machine/adc083x.h b/src/devices/machine/adc083x.h index 78be305986f..6a97973acca 100644 --- a/src/devices/machine/adc083x.h +++ b/src/devices/machine/adc083x.h @@ -46,7 +46,7 @@ typedef device_delegate adc083x_input_delegate; class adc083x_device : public device_t { public: - 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); + 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); // static configuration helpers static void set_input_callback(device_t &device, adc083x_input_delegate input_callback) { downcast(device).m_input_callback = input_callback; } @@ -90,7 +90,7 @@ private: class adc0831_device : public adc083x_device { public: - adc0831_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + adc0831_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + adc0832_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + adc0834_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + adc0838_device(const machine_config &mconfig, const char *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 16bd8a72012..1f1e2fb3180 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +adc1038_device::adc1038_device(const machine_config &mconfig, const char *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 c8642b172ac..84e6ecf2f29 100644 --- a/src/devices/machine/adc1038.h +++ b/src/devices/machine/adc1038.h @@ -26,7 +26,7 @@ typedef device_delegate adc1038_input_delegate; class adc1038_device : public device_t { public: - adc1038_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + adc1038_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~adc1038_device() {} static void set_input_callback(device_t &device, adc1038_input_delegate callback) { downcast(device).m_input_cb = callback; } diff --git a/src/devices/machine/adc1213x.cpp b/src/devices/machine/adc1213x.cpp index a75aaa3f14c..b3aec60a8e7 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +adc12130_device::adc12130_device(const machine_config &mconfig, const char *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, std::string tag, const device_type ADC12132 = &device_creator; -adc12132_device::adc12132_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +adc12132_device::adc12132_device(const machine_config &mconfig, const char *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, std::string tag, const device_type ADC12138 = &device_creator; -adc12138_device::adc12138_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +adc12138_device::adc12138_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/machine/adc1213x.h b/src/devices/machine/adc1213x.h index bca6a5856b3..361cd3dede8 100644 --- a/src/devices/machine/adc1213x.h +++ b/src/devices/machine/adc1213x.h @@ -27,8 +27,8 @@ typedef device_delegate adc1213x_ipt_convert_delegate; class adc12138_device : public device_t { public: - 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(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() {} static void set_ipt_convert_callback(device_t &device, adc1213x_ipt_convert_delegate callback) { downcast(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, std::string tag, device_t *owner, UINT32 clock); + adc12130_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + adc12132_device(const machine_config &mconfig, const char *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 3a0ab6ed308..b4ebca893eb 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 - constructor //------------------------------------------------- -aicartc_device::aicartc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +aicartc_device::aicartc_device(const machine_config &mconfig, const char *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 9bec6405cf6..6e1d9e2183e 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, std::string tag, device_t *owner, UINT32 clock); + aicartc_device(const machine_config &mconfig, const char *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 9179b166371..6a2772187f8 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, std::string tag, device_t *owner, UINT32 clock) +akiko_device::akiko_device(const machine_config &mconfig, const char *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, std::string tag, devic // set_cputag - set cpu tag for cpu we working on //------------------------------------------------- -void akiko_device::set_cputag(device_t &device, std::string tag) +void akiko_device::set_cputag(device_t &device, const char *tag) { akiko_device &akiko = downcast(device); akiko.m_cputag = tag; diff --git a/src/devices/machine/akiko.h b/src/devices/machine/akiko.h index 81b69d7aa1c..3fd1b586fb6 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, std::string tag, device_t *owner, UINT32 clock); + akiko_device(const machine_config &mconfig, const char *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, std::string tag); + static void set_cputag(device_t &device, const char *tag); protected: // device-level overrides @@ -146,7 +146,7 @@ private: devcb_read_line m_sda_r; devcb_write_line m_sda_w; - std::string m_cputag; + const char *m_cputag; }; // device type definition diff --git a/src/devices/machine/am53cf96.cpp b/src/devices/machine/am53cf96.cpp index 794cf3f5c34..595a38f985b 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, std::string tag, device_t *owner, UINT32 clock) : +am53cf96_device::am53cf96_device(const machine_config &mconfig, const char *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 f00c8d6b030..1c078d6e3f6 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, std::string tag, device_t *owner, UINT32 clock); + am53cf96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/machine/am9517a.cpp b/src/devices/machine/am9517a.cpp index 3879d8906f9..7f2ecb7e37f 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().c_str(), channel, state); + if (LOG) logerror("AM9517A '%s' Channel %u DMA Request: %u\n", tag(), 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().c_str(), m_temp, v1); + logerror("%s: verify error %02x vs. %02x\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +am9517a_device::am9517a_device(const machine_config &mconfig, const char *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, std::string tag, d { } -upd71071_v53_device::upd71071_v53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd71071_v53_device::upd71071_v53_device(const machine_config &mconfig, const char *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().c_str(), channel, m_channel[channel].m_base_address); + if (LOG) logerror("AM9517A '%s' Channel %u Base Address: %04x\n", tag(), 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().c_str(), channel, m_channel[channel].m_base_count); + if (LOG) logerror("AM9517A '%s' Channel %u Base Word Count: %04x\n", tag(), 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().c_str(), m_command); + if (LOG) logerror("AM9517A '%s' Command Register: %02x\n", tag(), 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().c_str(), m_request); + if (LOG) logerror("AM9517A '%s' Request Register: %01x\n", tag(), 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().c_str(), m_mask); + if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag(), 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().c_str(), channel, data & 0xfc); + if (LOG) logerror("AM9517A '%s' Channel %u Mode: %02x\n", tag(), channel, data & 0xfc); } break; case REGISTER_BYTE_POINTER: - if (LOG) logerror("AM9517A '%s' Clear Byte Pointer Flip-Flop\n", tag().c_str()); + if (LOG) logerror("AM9517A '%s' Clear Byte Pointer Flip-Flop\n", tag()); m_msb = 0; break; case REGISTER_MASTER_CLEAR: - if (LOG) logerror("AM9517A '%s' Master Clear\n", tag().c_str()); + if (LOG) logerror("AM9517A '%s' Master Clear\n", tag()); device_reset(); break; case REGISTER_CLEAR_MASK: - if (LOG) logerror("AM9517A '%s' Clear Mask Register\n", tag().c_str()); + if (LOG) logerror("AM9517A '%s' Clear Mask Register\n", tag()); 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().c_str(), m_mask); + if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag(), 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().c_str(), state); + if (LOG) logerror("AM9517A '%s' Hold Acknowledge: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("AM9517A '%s' Ready: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("AM9517A '%s' End of Process: %u\n", tag(), state); } diff --git a/src/devices/machine/am9517a.h b/src/devices/machine/am9517a.h index dc48331e970..7d5bd2601f4 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, 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); + 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); template static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast(device).m_out_hreq_cb.set_callback(object); } template static devcb_base &set_out_eop_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + upd71071_v53_device(const machine_config &mconfig, const char *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 050e9315c9e..d71b4f458dc 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, std::string tag, device_t *owner, UINT32 clock) : +amiga_fdc::amiga_fdc(const machine_config &mconfig, const char *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 1376db45d04..2cef736e6cf 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, std::string tag, device_t *owner, UINT32 clock); + amiga_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_index_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_index.set_callback(object); } diff --git a/src/devices/machine/at28c16.cpp b/src/devices/machine/at28c16.cpp index 9beb82cbcc1..9461850043d 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 - constructor //------------------------------------------------- -at28c16_device::at28c16_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +at28c16_device::at28c16_device( const machine_config &mconfig, const char *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().c_str(), AT28C16_DATA_BYTES ); + fatalerror( "at28c16 region '%s' wrong size (expected size = 0x%X)\n", tag(), AT28C16_DATA_BYTES ); } if( m_region->bytewidth() != 1 ) { - fatalerror( "at28c16 region '%s' needs to be an 8-bit region\n", tag().c_str() ); + fatalerror( "at28c16 region '%s' needs to be an 8-bit region\n", tag() ); } UINT8 *default_data = m_region->base(); diff --git a/src/devices/machine/at28c16.h b/src/devices/machine/at28c16.h index 162f552dd62..5cc51cf9078 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, std::string tag, device_t *owner, UINT32 clock ); + at28c16_device( const machine_config &mconfig, const char *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 097ab676fc7..bb2bdd8b8b9 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +at29c020_device::at29c020_device(const machine_config &mconfig, const char *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, std::string tag, /* Constructor for AT29C040 */ -at29c040_device::at29c040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +at29c040_device::at29c040_device(const machine_config &mconfig, const char *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, std::string tag, /* Constructor for AT29C040A */ -at29c040a_device::at29c040a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +at29c040a_device::at29c040a_device(const machine_config &mconfig, const char *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().c_str()); + if (TRACE_PRG) logerror("%s: Write to NVRAM file\n", tag()); 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().c_str()); + logerror("%s: Programming cycle timeout\n", tag()); m_pgm = PGM_0; break; case PGM_2: // Programming cycle start - if (TRACE_PRG) logerror("%s: Sector write start\n", tag().c_str()); + if (TRACE_PRG) logerror("%s: Sector write start\n", tag()); 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().c_str(), m_programming_last_offset); + if (TRACE_PRG) logerror("%s: Sector write completed at location %04x\n", tag(), 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().c_str(), m_sdp); + if (TRACE_PRG) logerror("%s: Software data protection = %d\n", tag(), 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().c_str(), m_pgm); + logerror("%s: Invalid state %d during programming\n", tag(), 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().c_str()); + if (TRACE_READ) logerror("%s: DATA poll; toggle bit 1\n", tag()); 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().c_str(), offset, reply, m_pgm); + if (TRACE_READ) logerror("%s: %05x -> %02x (PGM=%d)\n", tag(), 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().c_str(), offset, data); + if (TRACE_WRITE) logerror("%s: %05x <- %02x\n", tag(), 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().c_str()); + if (TRACE_STATE) logerror("%s: Enabling boot block lockout\n", tag()); m_enabling_bbl = false; if ((offset == 0x00000) && (data == 0x00)) { - if (TRACE_STATE) logerror("%s: Enabling lower boot block lockout\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: Enabling lower boot block lockout\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: Enabling higher boot block lockout\n", tag()); m_higher_bbl = true; sync_flags(); return; } else { - logerror("%s: Invalid boot block specification: %05x/%02x\n", tag().c_str(), offset, data); + logerror("%s: Invalid boot block specification: %05x/%02x\n", tag(), 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().c_str()); + if (TRACE_STATE) logerror("%s: Command sequence started (aa)\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: Command sequence continued (55)\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: Command sequence aborted\n", tag()); } 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().c_str(), data); + if (TRACE_STATE) logerror("%s: Command sequence continued (%2x)\n", tag(), 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().c_str()); + logerror("%s: Boot block lockout active; chip cannot be erased.\n", tag()); else { - if (TRACE_STATE) logerror("%s: Erase chip\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: Erase chip\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: Software data protection disable\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: Boot block lockout enable\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: Entering Identification mode\n", tag()); m_id_mode = true; break; case 0xa0: // Software data protection enable - if (TRACE_STATE) logerror("%s: Software data protection enable\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: Software data protection enable\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: Exiting Identification mode\n", tag()); 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), m_pgm, m_sdp); + if (TRACE_STATE) logerror("%s: Enter programming mode (m_pgm=%d, m_sdp=%d)\n", tag(), 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().c_str(), offset & m_sector_mask, data); + if (TRACE_PRG) logerror("%s: Write data to programming buffer: buf[%x] = %02x\n", tag(), 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().c_str(), m_version, m_eememory[0]); + logerror("%s: Warning: Version mismatch; expected %d but found %d in file. Resetting.\n", tag(), 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().c_str(), m_lower_bbl, m_higher_bbl, m_sdp); + if (TRACE_CONFIG) logerror("%s: LowerBBL = %d, HigherBBL = %d, SoftDataProt = %d\n", tag(), 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 02f68d5b0c7..924a17e0f70 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + at29c020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class at29c040_device : public at29x_device { public: - at29c040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + at29c040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class at29c040a_device : public at29x_device { public: - at29c040a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + at29c040a_device(const machine_config &mconfig, const char *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 3a7a6efb105..e61fcca498a 100644 --- a/src/devices/machine/at45dbxx.cpp +++ b/src/devices/machine/at45dbxx.cpp @@ -45,7 +45,7 @@ const device_type AT45DB161 = &device_creator; // at45db041_device - constructor //------------------------------------------------- -at45db041_device::at45db041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +at45db041_device::at45db041_device(const machine_config &mconfig, const char *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, std::string ta } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +at45db081_device::at45db081_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : at45db041_device(mconfig, AT45DB081, "AT45DB081", tag, owner, clock, "at45db081", __FILE__) { } -at45db161_device::at45db161_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +at45db161_device::at45db161_device(const machine_config &mconfig, const char *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 a7defed9e1f..40688fd786e 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + at45db081_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + at45db161_device(const machine_config &mconfig, const char *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 5756ed8f9e2..c77e6c8eed2 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, std::string tag, device_t *owner, UINT32 clock) +at_keyboard_controller_device::at_keyboard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, AT_KEYBOARD_CONTROLLER, "AT Keyboard Controller", tag, owner, clock, "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 1774efe74cb..d6ff52d6975 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, std::string tag, device_t *owner, UINT32 clock); + at_keyboard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_system_reset_callback(device_t &device, _Object object) { return downcast(device).m_system_reset_cb.set_callback(object); } template static devcb_base &set_gate_a20_callback(device_t &device, _Object object) { return downcast(device).m_gate_a20_cb.set_callback(object); } diff --git a/src/devices/machine/ataflash.cpp b/src/devices/machine/ataflash.cpp index 87f614d4c36..a7491f1eb1e 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +ata_flash_pccard_device::ata_flash_pccard_device(const machine_config &mconfig, const char *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 3ef8eefef09..e0504b2f180 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, std::string tag, device_t *owner, UINT32 clock); + ata_flash_pccard_device(const machine_config &mconfig, const char *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 08bf542136a..6bd963f946c 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, std::string 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, const char *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().c_str(), dev() ); + logerror( "%s: %s dev %d read_dma ignored (!DMACK)\n", machine().describe_context(), tag(), dev() ); } else if (m_dmarq && single_word_dma_mode() >= 0) { - logerror( "%s: %s dev %d read_dma ignored (DMARQ)\n", machine().describe_context(), tag().c_str(), dev() ); + logerror( "%s: %s dev %d read_dma ignored (DMARQ)\n", machine().describe_context(), tag(), dev() ); } else if (!m_dmarq && multi_word_dma_mode() >= 0) { - logerror( "%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev() ); + logerror( "%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag(), dev() ); } else if (!m_dmarq && ultra_dma_mode() >= 0) { - logerror("%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev()); + logerror("%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag(), dev()); } else if (m_status & IDE_STATUS_BSY) { - logerror( "%s: %s dev %d read_dma ignored (BSY)\n", machine().describe_context(), tag().c_str(), dev() ); + logerror( "%s: %s dev %d read_dma ignored (BSY)\n", machine().describe_context(), tag(), dev() ); } else if (!(m_status & IDE_STATUS_DRQ)) { - logerror( "%s: %s dev %d read_dma ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev() ); + logerror( "%s: %s dev %d read_dma ignored (!DRQ)\n", machine().describe_context(), tag(), 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().c_str(), dev(), offset, mem_mask ); + logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), 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().c_str(), dev(), offset, mem_mask ); + logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (BSY)\n", machine().describe_context(), tag(), 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().c_str(), dev() ); + logerror( "%s: %s dev %d read_cs0 ignored (!DRQ)\n", machine().describe_context(), tag(), 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().c_str(), dev(), offset, mem_mask ); + logerror( "%s: %s dev %d read_cs1 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), 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().c_str(), dev(), data ); + logerror( "%s: %s dev %d write_dma %04x ignored (!DMACK)\n", machine().describe_context(), tag(), 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().c_str(), dev(), data ); + logerror( "%s: %s dev %d write_dma %04x ignored (DMARQ)\n", machine().describe_context(), tag(), 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().c_str(), dev(), data ); + logerror( "%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag(), 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().c_str(), dev(), data); + logerror("%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag(), dev(), data); } else if (m_status & IDE_STATUS_BSY) { - logerror( "%s: %s dev %d write_dma %04x ignored (BSY)\n", machine().describe_context(), tag().c_str(), dev(), data ); + logerror( "%s: %s dev %d write_dma %04x ignored (BSY)\n", machine().describe_context(), tag(), dev(), data ); } else if (!(m_status & IDE_STATUS_DRQ)) { - logerror( "%s: %s dev %d write_dma %04x ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev(), data ); + logerror( "%s: %s dev %d write_dma %04x ignored (!DRQ)\n", machine().describe_context(), tag(), 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().c_str(), dev(), offset, data, mem_mask ); + logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), dev(), offset, data, mem_mask ); + logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (!DRQ)\n", machine().describe_context(), tag(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), dev(), offset, data, mem_mask ); + logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), 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().c_str(), dev(), offset, data, mem_mask ); + logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (RESET)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask ); } else { diff --git a/src/devices/machine/atahle.h b/src/devices/machine/atahle.h index b329b7dc10d..e26ad86b92c 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, std::string 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, const char *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 f8e4669b577..b9c51351e71 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, std::string 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, 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_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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +ata_interface_device::ata_interface_device(const machine_config &mconfig, const char *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 - constructor //------------------------------------------------- -ata_slot_device::ata_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ata_slot_device::ata_slot_device(const machine_config &mconfig, const char *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 d7006701188..d1752d5923b 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, std::string tag, device_t *owner, UINT32 clock); + ata_slot_device(const machine_config &mconfig, const char *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, 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); + 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); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/machine/atapicdr.cpp b/src/devices/machine/atapicdr.cpp index 540aa493b66..1588f6d17cd 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, const char *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, std::string 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, const char *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 99b2651c1a7..b18999839c7 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, 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); + 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); UINT16 *identify_device_buffer() { return m_identify_buffer; } diff --git a/src/devices/machine/atapihle.cpp b/src/devices/machine/atapihle.cpp index 1c503304663..1216e7a91ad 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, std::string 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, const char *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 97cd3f50398..d124259e577 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, std::string 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, const char *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 0effc877efd..f1db92a19d8 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; const device_type AY51013 = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +ay31015_device::ay31015_device(const machine_config &mconfig, const char *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, std::string tag, d elem = 0; } -ay51013_device::ay51013_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ay51013_device::ay51013_device(const machine_config &mconfig, const char *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 a28595d723b..acdf3a01536 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, 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(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() {} static void set_tx_clock(device_t &device, double tx_clock) { downcast(device).m_tx_clock = tx_clock; } @@ -147,7 +147,7 @@ protected: class ay51013_device : public ay31015_device { public: - ay51013_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ay51013_device(const machine_config &mconfig, const char *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 757190247fa..65d56a39819 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( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +address_map_bank_device::address_map_bank_device( const machine_config &mconfig, const char *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 1f26eb8eee9..946faef53f0 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, std::string tag, device_t *owner, UINT32 clock ); + address_map_bank_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock ); // static configuration helpers static void set_endianness(device_t &device, endianness_t endianness) { downcast(device).m_endianness = endianness; } diff --git a/src/devices/machine/bcreader.cpp b/src/devices/machine/bcreader.cpp index 42d5528ec67..5a5df7fb452 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 - constructor //------------------------------------------------- -barcode_reader_device::barcode_reader_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +barcode_reader_device::barcode_reader_device(const machine_config &mconfig, const char *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 95e49c4715b..ecb6908e0ae 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, std::string tag, device_t *owner, UINT32 clock); + barcode_reader_device(const machine_config &mconfig, const char *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 91b7ef62a07..6b2058c6937 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +input_buffer_device::input_buffer_device(const machine_config &mconfig, const char *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 e9dcd539ab4..7c719c918af 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, std::string tag, device_t *owner, UINT32 clock); + input_buffer_device(const machine_config &mconfig, const char *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 90572f4dc87..52fe18eb82b 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, std::string tag, device_t *owner, UINT32 clock) : +cdp1852_device::cdp1852_device(const machine_config &mconfig, const char *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 ed8d9baa017..eb8cef75dd4 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, std::string tag, device_t *owner, UINT32 clock); + cdp1852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_mode_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_mode.set_callback(object); } template static devcb_base &set_sr_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_sr.set_callback(object); } diff --git a/src/devices/machine/cdp1871.cpp b/src/devices/machine/cdp1871.cpp index e7a19c97d49..e685f8c43ad 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, std::string tag, device_t *owner, UINT32 clock) : +cdp1871_device::cdp1871_device(const machine_config &mconfig, const char *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 4fb1aa652db..02238822057 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, std::string tag, device_t *owner, UINT32 clock); + cdp1871_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_d1_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_d1.set_callback(object); } template static devcb_base &set_d2_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_d2.set_callback(object); } diff --git a/src/devices/machine/clock.cpp b/src/devices/machine/clock.cpp index 15b8320e23d..70d3bd4fade 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +clock_device::clock_device(const machine_config &mconfig, const char *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 8a673443a1a..4be97128bfe 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, std::string tag, device_t *owner, UINT32 clock); + clock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_signal_handler(device_t &device, _Object object) { return downcast(device).m_signal_handler.set_callback(object); } diff --git a/src/devices/machine/com8116.cpp b/src/devices/machine/com8116.cpp index 10efcdf7a58..46a0ce83986 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, std::string tag, device_t *owner, UINT32 clock) : +com8116_device::com8116_device(const machine_config &mconfig, const char *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().c_str(), data & 0x0f, m_fr_divisors[fr_divider], fr_clock); + if (LOG) logerror("COM8116 '%s' Receiver Divisor Select %01x: %u (%u Hz)\n", tag(), 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().c_str(), data & 0x0f, m_ft_divisors[ft_divider], ft_clock); + if (LOG) logerror("COM8116 '%s' Transmitter Divisor Select %01x: %u (%u Hz)\n", tag(), 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 96020f08931..119f40d4b3d 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, std::string tag, device_t *owner, UINT32 clock); + com8116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_fx4_handler(device_t &device, _Object object) { return downcast(device).m_fx4_handler.set_callback(object); } template static devcb_base &set_fr_handler(device_t &device, _Object object) { return downcast(device).m_fr_handler.set_callback(object); } diff --git a/src/devices/machine/corvushd.cpp b/src/devices/machine/corvushd.cpp index 491ea9c0118..558851c0b7a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +corvus_hdc_t::corvus_hdc_t(const machine_config &mconfig, const char *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 64d7d636b1a..cb3bee03594 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, std::string tag, device_t *owner, UINT32 clock); + corvus_hdc_t(const machine_config &mconfig, const char *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 9d579df4ac6..debd3906fbc 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, std::string tag, device_t *owner, UINT32 clock) : +cr511b_device::cr511b_device(const machine_config &mconfig, const char *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 05053525812..b4b3529f061 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, std::string tag, device_t *owner, UINT32 clock); + cr511b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // callbacks template 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 31bc4f3d077..8c0ae34f6c9 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +matsushita_cr589_device::matsushita_cr589_device(const machine_config &mconfig, const char *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 6f485a243ed..e74e2612663 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, std::string tag, device_t *owner, UINT32 clock); + matsushita_cr589_device(const machine_config &mconfig, const char *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 3f81bced150..b6d8de1acd8 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, std::string tag, device_t *owner, UINT32 clock) : +cs4031_device::cs4031_device(const machine_config &mconfig, const char *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, std::string tag, dev { } -void cs4031_device::static_set_cputag(device_t &device, std::string tag) +void cs4031_device::static_set_cputag(device_t &device, const char *tag) { cs4031_device &cs4031 = downcast(device); cs4031.m_cputag = tag; } -void cs4031_device::static_set_isatag(device_t &device, std::string tag) +void cs4031_device::static_set_isatag(device_t &device, const char *tag) { cs4031_device &cs4031 = downcast(device); cs4031.m_isatag = tag; } -void cs4031_device::static_set_biostag(device_t &device, std::string tag) +void cs4031_device::static_set_biostag(device_t &device, const char *tag) { cs4031_device &cs4031 = downcast(device); cs4031.m_biostag = tag; } -void cs4031_device::static_set_keybctag(device_t &device, std::string tag) +void cs4031_device::static_set_keybctag(device_t &device, const char *tag) { cs4031_device &cs4031 = downcast(device); cs4031.m_keybctag = tag; diff --git a/src/devices/machine/cs4031.h b/src/devices/machine/cs4031.h index 2880d330cf8..9a194a8699b 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, std::string tag, device_t *owner, UINT32 clock); + cs4031_device(const machine_config &mconfig, const char *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, 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); + 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); protected: // device-level overrides @@ -221,10 +221,10 @@ private: void update_write_regions(); // internal state - std::string m_cputag; - std::string m_isatag; - std::string m_biostag; - std::string m_keybctag; + const char *m_cputag; + const char *m_isatag; + const char *m_biostag; + const char *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 118c9b08c3d..95a890d7bba 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, std::string tag, device_t *owner, UINT32 clock) +cs8221_device::cs8221_device(const machine_config &mconfig, const char *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, std::string tag) +void cs8221_device::static_set_cputag(device_t &device, const char *tag) { cs8221_device &cs8221 = downcast(device); cs8221.m_cputag = tag; } -void cs8221_device::static_set_isatag(device_t &device, std::string tag) +void cs8221_device::static_set_isatag(device_t &device, const char *tag) { cs8221_device &cs8221 = downcast(device); cs8221.m_isatag = tag; } -void cs8221_device::static_set_biostag(device_t &device, std::string tag) +void cs8221_device::static_set_biostag(device_t &device, const char *tag) { cs8221_device &cs8221 = downcast(device); cs8221.m_biostag = tag; diff --git a/src/devices/machine/cs8221.h b/src/devices/machine/cs8221.h index b53d63a76b5..ea7cc4a99b4 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, std::string tag, device_t *owner, UINT32 clock); + cs8221_device(const machine_config &mconfig, const char *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, 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_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); protected: // device-level overrides @@ -72,9 +72,9 @@ private: UINT8 m_address; bool m_address_valid; - std::string m_cputag; - std::string m_isatag; - std::string m_biostag; + const char *m_cputag; + const char *m_isatag; + const char *m_biostag; UINT8 m_registers[0x10]; diff --git a/src/devices/machine/diablo_hd.cpp b/src/devices/machine/diablo_hd.cpp index 8cc89ca66f1..f833cf54504 100644 --- a/src/devices/machine/diablo_hd.cpp +++ b/src/devices/machine/diablo_hd.cpp @@ -57,7 +57,7 @@ * */ -diablo_hd_device::diablo_hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +diablo_hd_device::diablo_hd_device(const machine_config &mconfig, const char *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(subdevice("drive")); m_packs = 1; // FIXME: get from configuration? - m_unit = strstr(m_image->tag().c_str(), "diablo0") ? 0 : 1; + m_unit = strstr(m_image->tag(), "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 a391e352199..c3fadd2a073 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, std::string tag, device_t *owner, UINT32 clock); + diablo_hd_device(const machine_config &mconfig, const char *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 ea1c16fa61c..34992fc4f5c 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 - constructor //------------------------------------------------- -dmac_device::dmac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dmac_device::dmac_device(const machine_config &mconfig, const char *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 494888cecf1..2d86c427013 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, std::string tag, device_t *owner, UINT32 clock); + dmac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // callbacks template 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 87c9725ee9f..52e66168322 100644 --- a/src/devices/machine/dp8390.cpp +++ b/src/devices/machine/dp8390.cpp @@ -9,17 +9,17 @@ const device_type DP8390D = &device_creator; const device_type RTL8019A = &device_creator; -dp8390d_device::dp8390d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dp8390d_device::dp8390d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : dp8390_device(mconfig, DP8390D, "DP8390D", tag, owner, clock, 10.0f, "dp8390d", __FILE__) { m_type = TYPE_DP8390D; } -rtl8019a_device::rtl8019a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rtl8019a_device::rtl8019a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : dp8390_device(mconfig, RTL8019A, "RTL8019A", tag, owner, clock, 10.0f, "rtl8019a", __FILE__) { m_type = TYPE_RTL8019A; } -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) +dp8390_device::dp8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_network_interface(mconfig, *this, bandwidth), m_type(0), m_irq_cb(*this), diff --git a/src/devices/machine/dp8390.h b/src/devices/machine/dp8390.h index bb3f39bc314..49341e30e49 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source); template static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } template static devcb_base &set_breq_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + rtl8019a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class dp8390d_device : public dp8390_device { public: - dp8390d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dp8390d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // device type definition diff --git a/src/devices/machine/ds1204.cpp b/src/devices/machine/ds1204.cpp index b882022d306..72029b2aecc 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().c_str(), buf ); + logerror( "%s: ds1204(%s) %s", machine().describe_context(), tag(), buf ); } } // device type definition const device_type DS1204 = &device_creator; -ds1204_device::ds1204_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +ds1204_device::ds1204_device( const machine_config &mconfig, const char *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().c_str() ); + logerror( "ds1204(%s) region not found\n", tag() ); } else if( m_region->bytes() != expected_bytes ) { - logerror( "ds1204(%s) region length 0x%x expected 0x%x\n", tag().c_str(), m_region->bytes(), expected_bytes ); + logerror( "ds1204(%s) region length 0x%x expected 0x%x\n", tag(), m_region->bytes(), expected_bytes ); } else { diff --git a/src/devices/machine/ds1204.h b/src/devices/machine/ds1204.h index 61e317126c6..42b68de7538 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, std::string tag, device_t *owner, UINT32 clock ); + ds1204_device( const machine_config &mconfig, const char *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 6c0e9a2696b..5b7fa8e0663 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 - constructor //------------------------------------------------- -ds12885_device::ds12885_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ds12885_device::ds12885_device(const machine_config &mconfig, const char *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 e61bad76964..7dbd2deb92c 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, std::string tag, device_t *owner, UINT32 clock); + ds12885_device(const machine_config &mconfig, const char *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 108d4740c0c..c2cd23b560f 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 - constructor //------------------------------------------------- -ds1302_device::ds1302_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ds1302_device::ds1302_device(const machine_config &mconfig, const char *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().c_str(), state); + if (LOG) logerror("DS1302 '%s' CE: %u\n", tag(), 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().c_str(), m_addr, m_data); + if (LOG) logerror("DS1302 '%s' Read RAM %u:%02x\n", tag(), m_addr, m_data); } else { m_data = m_user[m_addr]; - if (LOG) logerror("DS1302 '%s' Read Clock %u:%02x\n", tag().c_str(), m_addr, m_data); + if (LOG) logerror("DS1302 '%s' Read Clock %u:%02x\n", tag(), m_addr, m_data); } } else { if (COMMAND_RAM) { - if (LOG) logerror("DS1302 '%s' Write RAM %u:%02x\n", tag().c_str(), m_addr, m_data); + if (LOG) logerror("DS1302 '%s' Write RAM %u:%02x\n", tag(), 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().c_str(), m_addr, m_data); + if (LOG) logerror("DS1302 '%s' Write Clock %u:%02x\n", tag(), 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().c_str(), m_cmd); + if (LOG) logerror("DS1302 '%s' Command: %02x\n", tag(), 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().c_str(), m_data); + if (LOG) logerror("DS1302 '%s' Data: %02x\n", tag(), 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().c_str(), state); + if (LOG) logerror("DS1302 '%s' CLK: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("DS1302 '%s' I/O: %u\n", tag(), state); m_io = state; } diff --git a/src/devices/machine/ds1302.h b/src/devices/machine/ds1302.h index 5f0784519b7..515613579b2 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, std::string tag, device_t *owner, UINT32 clock); + ds1302_device(const machine_config &mconfig, const char *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 239f2ca866a..e9c984e4716 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ds1315_device::ds1315_device(const machine_config &mconfig, const char *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 ae51a2a753d..1894a05aac7 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, std::string tag, device_t *owner, UINT32 clock); + ds1315_device(const machine_config &mconfig, const char *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 889baf7ebaa..7298fa888ee 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().c_str(), machine().describe_context(), buf); + logerror("ds2401 %s %s: %s", tag(), machine().describe_context(), buf); } } // device type definition const device_type DS2401 = &device_creator; -ds2401_device::ds2401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ds2401_device::ds2401_device(const machine_config &mconfig, const char *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().c_str(), SIZE_DATA, m_region->bytes()); + logerror("ds2401 %s: Wrong region length for id data, expected 0x%x, got 0x%x\n", tag(), SIZE_DATA, m_region->bytes()); } else { - logerror("ds2401 %s: Warning, no id provided, answer will be all zeroes.\n", tag().c_str()); + logerror("ds2401 %s: Warning, no id provided, answer will be all zeroes.\n", tag()); } memset(m_data, 0, SIZE_DATA); diff --git a/src/devices/machine/ds2401.h b/src/devices/machine/ds2401.h index 7bef492f499..11c05f27a02 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, std::string tag, device_t *owner, UINT32 clock); + ds2401_device(const machine_config &mconfig, const char *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 7a437332620..68082389cee 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 - constructor //------------------------------------------------- -ds2404_device::ds2404_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ds2404_device::ds2404_device(const machine_config &mconfig, const char *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 5510afc9006..86b9c7be05d 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, std::string tag, device_t *owner, UINT32 clock); + ds2404_device(const machine_config &mconfig, const char *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 56a602fd607..1560fa4f0b2 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 - constructor //------------------------------------------------- -ds75160a_device::ds75160a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ds75160a_device::ds75160a_device(const machine_config &mconfig, const char *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 0ac0f1c4d4d..5cb4898322d 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, std::string tag, device_t *owner, UINT32 clock); + ds75160a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template 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 6280661e6aa..5ec21a0e003 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 - constructor //------------------------------------------------- -ds75161a_device::ds75161a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ds75161a_device::ds75161a_device(const machine_config &mconfig, const char *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 9ff55d436e7..33c244f6528 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, std::string tag, device_t *owner, UINT32 clock); + ds75161a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_in_ren_callback(device_t &device, _Object object) { return downcast(device).m_in_ren_cb.set_callback(object); } template static devcb_base &set_in_ifc_callback(device_t &device, _Object object) { return downcast(device).m_in_ifc_cb.set_callback(object); } diff --git a/src/devices/machine/e0516.cpp b/src/devices/machine/e0516.cpp index fd09cf68137..f80cad5bdb5 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 - constructor //------------------------------------------------- -e0516_device::e0516_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e0516_device::e0516_device(const machine_config &mconfig, const char *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().c_str(), state); + if (LOG) logerror("E05-16 '%s' CS %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("E05-16 '%s' CLK %u\n", tag(), 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().c_str(), m_dio); + if (LOG) logerror("E05-16 '%s' Command Bit %u\n", tag(), 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().c_str(), m_dio); + if (LOG) logerror("E05-16 '%s' Data Bit OUT %u\n", tag(), 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().c_str(), m_dio); + if (LOG) logerror("E05-16 '%s' Data Bit IN %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("E05-16 '%s' DIO %u\n", tag(), state); m_dio = state; } diff --git a/src/devices/machine/e0516.h b/src/devices/machine/e0516.h index edecd2d613d..7e95be0dfc1 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, std::string tag, device_t *owner, UINT32 clock); + e0516_device(const machine_config &mconfig, const char *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 71b985967de..b0389abb6df 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e05a03_device::e05a03_device(const machine_config &mconfig, const char *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 ab768434d68..86b36b673b0 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, std::string tag, device_t *owner, UINT32 clock); + e05a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~e05a03_device() {} template static devcb_base &set_nlq_lp_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_nlq_lp.set_callback(object); } diff --git a/src/devices/machine/e05a30.cpp b/src/devices/machine/e05a30.cpp index 331584e57b8..8bb802f9265 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +e05a30_device::e05a30_device(const machine_config &mconfig, const char *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 b3b90086860..f05b3fd35c9 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, std::string tag, device_t *owner, UINT32 clock); + e05a30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~e05a30_device() {} template static devcb_base &set_printhead_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_printhead.set_callback(object); } diff --git a/src/devices/machine/eeprom.cpp b/src/devices/machine/eeprom.cpp index 5909d6781a1..53b92a0ee0d 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, std::string 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, const char *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().c_str(), eeprom_bytes); + fatalerror("eeprom region '%s' wrong size (expected size = 0x%X)\n", tag(), eeprom_bytes); if (m_data_bits == 8 && m_region->bytewidth() != 1) - fatalerror("eeprom region '%s' needs to be an 8-bit region\n", tag().c_str()); + fatalerror("eeprom region '%s' needs to be an 8-bit region\n", tag()); 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().c_str()); - osd_printf_verbose("Loading data from EEPROM region '%s'\n", tag().c_str()); + 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()); if (m_data_bits == 8) { diff --git a/src/devices/machine/eeprom.h b/src/devices/machine/eeprom.h index 605ff258a07..23ba81cf42f 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, std::string tag, device_t *owner, const char *shortname, const char *file); + 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); public: // timing constants diff --git a/src/devices/machine/eeprompar.cpp b/src/devices/machine/eeprompar.cpp index df360f69b09..af575ec1419 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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) \ +eeprom_parallel_##_lowercase##_device::eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, const char *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 814a1e5d674..e8ed153dd97 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, std::string tag, device_t *owner, const char *shortname, const char *file); + 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); 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, std::string tag, device_t *owner, const char *shortname, const char *file); + 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); 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, std::string tag, device_t *owner, UINT32 clock); \ + eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, const char *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 9419993bc29..347accae06f 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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) \ +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_##_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 84c20239572..cbba81bfbbe 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, std::string tag, device_t *owner, const char *shortname, const char *file); + 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); 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, std::string tag, device_t *owner, const char *shortname, const char *file); + 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); 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, std::string tag, device_t *owner, const char *shortname, const char *file); + 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); 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, std::string tag, device_t *owner, const char *shortname, const char *file); + 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); 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, std::string tag, device_t *owner, UINT32 clock); \ + eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, const char *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 f6f5e891320..7c395a83b62 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, std::string tag, device_t *owner, UINT32 clock) +er2055_device::er2055_device(const machine_config &mconfig, const char *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().c_str()); + fatalerror("er2055 region '%s' wrong size (expected size = 0x40)\n", tag()); if (m_region->bytewidth() != 1) - fatalerror("er2055 region '%s' needs to be an 8-bit region\n", tag().c_str()); + fatalerror("er2055 region '%s' needs to be an 8-bit region\n", tag()); 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 39a7767adee..900cac15b06 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, std::string tag, device_t *owner, UINT32 clock); + er2055_device(const machine_config &mconfig, const char *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 adc0aa82ea5..a37e1b7e59b 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 - constructor //------------------------------------------------- -f3853_device::f3853_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +f3853_device::f3853_device(const machine_config &mconfig, const char *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 61a1e0dd131..82e9610c174 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, std::string tag, device_t *owner, UINT32 clock); + f3853_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_interrupt_req_callback(device_t &device, f3853_interrupt_req_delegate callback) { downcast(device).m_interrupt_req_cb = callback; } diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp index 21429d640b8..671d0314560 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, std::string tag, device_t *owner, UINT32 clock) : +fdc37c665gt_device::fdc37c665gt_device(const machine_config &mconfig, const char *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 822bb3cb80e..569bf8ed0e8 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, std::string tag, device_t *owner, UINT32 clock); + fdc37c665gt_device(const machine_config &mconfig, const char *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 03f96ac1517..93ea9034eb0 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 - constructor //------------------------------------------------- -gayle_device::gayle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +gayle_device::gayle_device(const machine_config &mconfig, const char *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 92d7d95b3c7..6ea542dd392 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, std::string tag, device_t *owner, UINT32 clock); + gayle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // callbacks template 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 99460c3e16b..e15039fbb38 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +hd63450_device::hd63450_device(const machine_config &mconfig, const char *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,6 +22,7 @@ hd63450_device::hd63450_device(const machine_config &mconfig, std::string 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 86e5f6d2ee3..e303a0d28b2 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, std::string tag, device_t *owner, UINT32 clock); + hd63450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~hd63450_device() {} template static devcb_base &set_dma_end_callback(device_t &device, _Object object) { return downcast(device).m_dma_end.set_callback(object); } @@ -85,7 +85,7 @@ public: template static devcb_base &set_dma_write_2_callback(device_t &device, _Object object) { return downcast(device).m_dma_write_2.set_callback(object); } template static devcb_base &set_dma_write_3_callback(device_t &device, _Object object) { return downcast(device).m_dma_write_3.set_callback(object); } - static void set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu_tag = tag; } + static void set_cpu_tag(device_t &device, const char *tag) { downcast(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(device); @@ -132,7 +132,7 @@ private: devcb_write8 m_dma_write_2; devcb_write8 m_dma_write_3; - std::string m_cpu_tag; + const char *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 95b6a556e99..d4639892e17 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().c_str(), irq_out); + if (LOG) logerror("HD64610 '%s' IRQ %u\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) +hd64610_device::hd64610_device(const machine_config &mconfig, const char *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().c_str(), offset, data); + if (LOG) logerror("HD64610 '%s' Register %u Read %02x\n", tag(), 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().c_str()); + logerror("HD64610 '%s' Writing to read-only register 64Hz Counter\n", tag()); 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().c_str()); + if (LOG) logerror("HD64610 '%s' clear carry flag\n", tag()); m_regs[REG_CRA] &= 0x7f; } if ((data & CRA_AF) == 0) { - if (LOG) logerror("HD64610 '%s' clear alarm flag\n", tag().c_str()); + if (LOG) logerror("HD64610 '%s' clear alarm flag\n", tag()); m_regs[REG_CRA] &= 0xfe; } - 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)); + 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)); 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().c_str()); + if (LOG) logerror("HD64610 '%s' 30-sec adjustament\n", tag()); 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().c_str()); + if (LOG) logerror("HD64610 '%s' CRB reset\n", tag()); m_regs[REG_64HZ] = 0; m_regs[REG_CRB] &= ~CRB_RESET; } - if (LOG) logerror("HD64610 '%s' set timer %d\n", tag().c_str(), BIT(data, 0)); + if (LOG) logerror("HD64610 '%s' set timer %d\n", tag(), 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().c_str(), offset & 0x0f, data); + if (LOG) logerror("HD64610 '%s' Register %u Write %02x\n", tag(), offset & 0x0f, data); break; } } diff --git a/src/devices/machine/hd64610.h b/src/devices/machine/hd64610.h index 001d9e67b18..021cf181c27 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, std::string tag, device_t *owner, UINT32 clock); + hd64610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(device).m_out_irq_cb.set_callback(object); } template static devcb_base &set_out_1hz_callback(device_t &device, _Object object) { return downcast(device).m_out_1hz_cb.set_callback(object); } diff --git a/src/devices/machine/hdc92x4.cpp b/src/devices/machine/hdc92x4.cpp index c2659edcfd0..54a8f802b99 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, std::string 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, 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_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, std::string tag, device_t *owner, UINT32 clock) +hdc9224_device::hdc9224_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hdc9234_device::hdc9234_device(const machine_config &mconfig, const char *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().c_str(), ttsn().c_str(), delay.as_double()*1000000); + if (TRACE_DELAY) logerror("%s: [%s] Delaying by %4.2f microsecs\n", tag(), 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().c_str(), level); + if (TRACE_LINES) logerror("%s: SEEK_COMPLETE line is already %d\n", tag(), level); } else { if (line == INDEX_LINE && (index_hole() == (level==ASSERT_LINE))) { - if (TRACE_LINES) logerror("%s: INDEX line is already %d\n", tag().c_str(), level); + if (TRACE_LINES) logerror("%s: INDEX line is already %d\n", tag(), level); } else { if (line == READY_LINE && (drive_ready() == (level==ASSERT_LINE))) { - if (TRACE_LINES) logerror("%s: READY line is already %d\n", tag().c_str(), level); + if (TRACE_LINES) logerror("%s: READY line is already %d\n", tag(), 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().c_str()); + if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate READ_ID\n", tag()); // 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().c_str()); + if (TRACE_FAIL) logerror("%s: READ_ID failed to find any IDAM\n", tag()); cont = ERROR; break; } if (TRACE_READID) { - 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()); + if (TRACE_SUBSTATES) logerror("%s: substate READ_ID1\n", tag()); + logerror("%s: DESIRED_CYL = %d; CURRENT_CYL = %d\n", tag(), 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().c_str()); + if (TRACE_FAIL) logerror("%s: CRC error in sector header\n", tag()); 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().c_str()); + if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: Waiting for SEEK COMPLETE\n", tag()); 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().c_str()); + if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag()); // 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().c_str()); + if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag()); 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().c_str(), m_substate); + logerror("%s: BUG: Unknown substate %02x in read_id, aborting command\n", tag(), 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().c_str()); - if (TRACE_VERIFY) logerror("%s: VERIFY: Find sector CHS=(%d,%d,%d)\n", tag().c_str(), + 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(), 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().c_str()); + if (TRACE_FAIL) logerror("%s: VERIFY failed to find any IDAM\n", tag()); 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().c_str(), + if (TRACE_VERIFY) logerror("%s: Found the desired sector CHS=(%d,%d,%d)\n", tag(), 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().c_str(), + if (TRACE_VERIFY && TRACE_DETAIL) logerror("%s: Current CHS=(%d,%d,%d), desired CHS=(%d,%d,%d).\n", tag(), 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().c_str(), m_live_state.bit_count_total / 16); + if (TRACE_VERIFY) logerror("%s: Next IDAM found; total bytes read: %d\n", tag(), 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().c_str(), desired_cylinder(), desired_head(), desired_sector()); + if (TRACE_FAIL) logerror("%s: VERIFY failed to find sector CHS=(%d,%d,%d)\n", tag(), 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().c_str(), m_substate); + logerror("%s: BUG: Unknown substate %02x in verify, aborting command\n", tag(), 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().c_str(), m_write? "write" : "read"); + if (TRACE_TRANSFER && TRACE_SUBSTATES) logerror("%s: substate DATA_TRANSFER (%s)\n", tag(), 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().c_str(), m_write? "Write" : "Read", + logerror("%s: %s sector CHS=(%d,%d,%d)\n", tag(), m_write? "Write" : "Read", desired_cylinder(), desired_head(), desired_sector()); else - logerror("%s: %s next sector on track\n", tag().c_str(), m_write? "Write" : "Read"); + logerror("%s: %s next sector on track\n", tag(), 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().c_str(), retry); + if (TRACE_FAIL) logerror("%s: DATA TRANSFER got CRC error in sector data, retries = %d\n", tag(), 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().c_str()); + if (TRACE_FAIL) logerror("%s: CRC error; no retries left\n", tag()); 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().c_str(), m_register_w[SECTOR_COUNT]-1); + if (TRACE_TRANSFER) logerror("%s: Sector successfully read (count=%d)\n", tag(), 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().c_str(), dma_address); + if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag(), 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().c_str(), m_register_w[SECTOR_COUNT]-1); + if (TRACE_TRANSFER) logerror("%s: Sector successfully written (count=%d)\n", tag(), 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().c_str(), dma_address); + if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag(), 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().c_str(), m_substate); + logerror("%s: BUG: Unknown substate %02x in data_transfer, aborting command\n", tag(), 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().c_str()); + logerror("%s: RESET command\n", tag()); 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().c_str()); + if (TRACE_SELECT) logerror("%s: DESELECT command\n", tag()); 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().c_str(), current_command()); + if (TRACE_RESTORE) logerror("%s: RESTORE command %02x\n", tag(), 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().c_str()); + if (TRACE_RESTORE) logerror("%s: restore command: Drive not ready\n", tag()); // 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().c_str()); + if (TRACE_RESTORE) logerror("%s: restore using buffered steps\n", tag()); 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().c_str(), ttsn().c_str()); + if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_ON\n", tag(), 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().c_str(), ttsn().c_str()); + if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_OFF\n", tag(), 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().c_str()); + if (TRACE_FAIL) logerror("%s: restore command: failed to reach track 00\n", tag()); 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().c_str(), current_command()); + if (TRACE_STEP) logerror("%s: STEP IN/OUT command %02x\n", tag(), 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().c_str()); + if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag()); // 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().c_str()); + if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag()); 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().c_str(), current_command()); + logerror("%s: TAPE BACKUP command %02x not implemented\n", tag(), 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().c_str(), current_command()); + logerror("%s: POLL DRIVES command %02x\n", tag(), 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().c_str(), m_output1); + if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag(), 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().c_str(), 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(), 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().c_str(), m_output1); + if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag(), 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().c_str(), m_register_pointer); + if (TRACE_SETPTR) logerror("%s: SET REGISTER POINTER command; start reg=%d\n", tag(), 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().c_str(), m_register_pointer); + logerror("%s: set register pointer: Invalid register number: %d. Setting to 10.\n", tag(), 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().c_str(), current_command(), desired_cylinder(), desired_head(), desired_sector()); + if (TRACE_READ) logerror("%s: SEEK / READ ID command %02x, CHS=(%d,%d,%d)\n", tag(), 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().c_str(), m_substate); + logerror("%s: BUG: Unknown substate %02x in seek_read_id, aborting command\n", tag(), 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().c_str(), 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(), 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().c_str(), m_substate); + logerror("%s: BUG: Unknown substate %02x in read_sectors, aborting command\n", tag(), 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().c_str(), current_command(), desired_head()); + if (TRACE_READTRACK) logerror("%s: READ TRACK command %02x, head = %d\n", tag(), 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().c_str()); + if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - waiting for index hole\n", tag()); 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().c_str()); + if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Index hole just passing by ... waiting for next\n", tag()); 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().c_str()); + if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - index hole arrived\n", tag()); live_start(READ_TRACK); cont = WAIT; break; case TRACKDONE: - if (TRACE_READTRACK && TRACE_SUBSTATES) logerror("%s: Track reading done\n", tag().c_str()); + if (TRACE_READTRACK && TRACE_SUBSTATES) logerror("%s: Track reading done\n", tag()); 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().c_str(), current_command(), desired_head()); + if (TRACE_FORMAT) logerror("%s: FORMAT TRACK command %02x, head = %d\n", tag(), 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().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); + 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); } 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().c_str()); + if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track; looking for track start\n", tag()); 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().c_str()); + if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Index hole just passing by ... \n", tag()); 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().c_str()); + if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Waiting for next index hole\n", tag()); 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().c_str()); + if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track - index hole arrived\n", tag()); live_start(FORMAT_TRACK); cont = WAIT; break; case TRACKDONE: - if (FORMAT_TRACK && TRACE_SUBSTATES) logerror("%s: Track writing done\n", tag().c_str()); + if (FORMAT_TRACK && TRACE_SUBSTATES) logerror("%s: Track writing done\n", tag()); 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().c_str(), 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(), 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().c_str(), m_substate); + logerror("%s: BUG: Unknown substate %02x in write_sectors, aborting command\n", tag(), 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().c_str(), ttsn().c_str(), state); + if (TRACE_LIVE) logerror("%s: [%s] Live start substate=%02x\n", tag(), 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().c_str(), ttsn().c_str()); // delete + if (TRACE_LIVE) logerror("%s: [%s] Live start end\n", tag(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(),tts(m_live_state.time).c_str(), tts(limit).c_str()); + logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag(),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().c_str(), tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag(), 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().c_str(), 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(), 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().c_str(),tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),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().c_str()); + if (TRACE_LIVE) logerror("%s: SEARCH_IDAM: IDAM found\n", tag()); 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().c_str(),tts(m_live_state.time).c_str()); + logerror("%s: [%s live] READ_TWO_MORE_A1\n", tag(),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().c_str(), 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(), 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().c_str(),tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str()); // Continue break; } - 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 (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag(),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().c_str(), tts(m_live_state.time).c_str()); + logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag(), 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().c_str(), 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(), 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().c_str(),tts(m_live_state.time).c_str()); + logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag(),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().c_str(), slot, m_live_state.data_reg, m_live_state.crc); + if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag(), 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().c_str(),tts(m_live_state.time).c_str()); + logerror("%s: [%s live] SEARCH_DAM\n", tag(),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().c_str(), 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(), 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().c_str()); + if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag()); 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().c_str(),tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),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().c_str()); + if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag()); 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().c_str(), m_live_state.shift_reg); + if (TRACE_LIVE) logerror("%s: SEARCH_DAM: found DAM = %04x\n", tag(), 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().c_str(),tts(m_live_state.time).c_str()); + logerror("%s: [%s live] READ_TWO_MORE_A1_DAM\n", tag(),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().c_str(), 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(), 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().c_str(),tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str()); // Continue break; } - 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 (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 ((m_live_state.data_reg & 0xff) == 0xf8) { - if (TRACE_LIVE) logerror("%s: Found deleted data mark F8 after DAM sync\n", tag().c_str()); + if (TRACE_LIVE) logerror("%s: Found deleted data mark F8 after DAM sync\n", tag()); 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().c_str()); + if (TRACE_FAIL) logerror("%s: Missing FB/F8 data mark after DAM sync\n", tag()); 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().c_str()); + if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag()); 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().c_str(),tts(m_live_state.time).c_str()); + logerror("%s: [%s live] READ_SECTOR_DATA\n", tag(),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().c_str(),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(),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().c_str(),tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag(),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().c_str(),tts(m_live_state.time).c_str()); + logerror("%s: [%s live] READ_SECTOR_DATA_CONT\n", tag(),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().c_str()); + if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag()); 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().c_str(), tts(m_live_state.time).c_str()); + logerror("%s: [%s live] WRITE_DAM_AND_SECTOR\n", tag(), 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag()); // 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write three A1\n", tag()); 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark and sector contents\n", tag()); 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag()); 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag()); 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().c_str()); + if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag()); 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP0\n", tag()); 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM sync\n", tag()); 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM\n", tag()); 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP1\n", tag()); 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM sync\n", tag()); 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM and header\n", tag()); 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().c_str(), crct); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC byte %02x\n", tag(), 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP2\n", tag()); 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP3\n", tag()); 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().c_str()); + logerror("%s: Writing GAP4\n", tag()); 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().c_str()); + if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag()); 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().c_str()); + if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag()); 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().c_str()); + if (TRACE_LIVE) logerror("%s: READ_TRACK1\n", tag()); 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().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag(), 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().c_str(), 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(), 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().c_str()); + if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer underrun\n", tag()); 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().c_str(), m_live_state.state); + logerror("%s: Unknown live state: %02x\n", tag(), 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().c_str()); + if (TRACE_LIVE) logerror("%s: live_run_hd\n", tag()); 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(),tts(m_live_state.time).c_str(), tts(limit).c_str()); + logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag(),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().c_str(), tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag(), 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().c_str(), 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(), 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().c_str(), tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(), 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().c_str(), tts(m_live_state.time).c_str()); + logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag(), 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().c_str(), 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(), 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().c_str(),tts(m_live_state.time).c_str()); + logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag(),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().c_str(), slot, m_live_state.data_reg, m_live_state.crc); + if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag(), 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().c_str(),tts(m_live_state.time).c_str()); + logerror("%s: [%s live] SEARCH_DAM\n", tag(),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().c_str(), 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(), 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().c_str()); + if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag()); 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().c_str(),tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),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().c_str(), tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] Found deleted data mark F8 after DAM sync\n", tag(), 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().c_str(), 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(), 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().c_str()); + if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag()); 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().c_str(),tts(m_live_state.time).c_str()); + logerror("%s: [%s live] READ_SECTOR_DATA\n", tag(),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().c_str(),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(),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().c_str(),tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag(),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().c_str()); + if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag()); 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().c_str(),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(),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().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag(), 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().c_str(), 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(), 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().c_str(), tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] write limit reached\n", tag(), 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().c_str(), tts(m_live_state.time).c_str()); + if (TRACE_LIVE) logerror("%s: [%s live] Skipping GAP2\n", tag(), 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag()); // 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write one A1\n", tag()); 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark\n", tag()); // 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().c_str(), m_live_state.byte_counter); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector byte, %d to go\n", tag(), 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag()); 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().c_str()); + if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag()); 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().c_str()); + if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag()); 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().c_str()); + if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag()); 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().c_str()); + if (TRACE_LIVE) logerror("%s: READ_TRACK_ID_DONE\n", tag()); 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().c_str()); + if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag()); 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().c_str(), m_gap1_size); + if (TRACE_GAPS) logerror("%s: Writing GAP1; size=%d\n", tag(), 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().c_str(), m_sync_size); + if (TRACE_GAPS) logerror("%s: Writing IDAM sync, size=%d\n", tag(), 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().c_str()); + if (TRACE_HEADER) logerror("%s: Writing IDAM and header: ", tag()); 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().c_str(), m_gap2_size); + if (TRACE_GAPS) logerror("%s: Writing GAP2, size=%d\n", tag(), 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().c_str(), m_gap3_size); + if (TRACE_GAPS) logerror("%s: Writing GAP3, size=%d\n", tag(), 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().c_str()); + logerror("%s: Writing GAP4\n", tag()); 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().c_str(), m_live_state.state); + if (TRACE_LIVE) logerror("%s: Unknown state: %02x\n", tag(), 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().c_str(), ttsn().c_str(), tts(m_live_state.time).c_str()); + if (TRACE_SYNC) logerror("%s: [%s] Rolling back and replaying [%s live]\n", tag(), 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().c_str(), ttsn().c_str(), tts(m_live_state.time).c_str()); + if (TRACE_SYNC) logerror("%s: [%s] Committing [%s live]\n", tag(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), m_register_pointer, reply); + if (TRACE_READREG) logerror("%s: Read register[%d] -> %02x\n", tag(), 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().c_str(), reply); + if (TRACE_READREG) logerror("%s: Read interrupt status register -> %02x\n", tag(), 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().c_str(), data & 0xff); - if (m_executing) logerror("%s: Error - previous command %02x not completed; register access ignored\n", tag().c_str(), current_command()); + 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()); 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().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); + 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); 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().c_str(), (m_regvalue & TC_INTDONE)? 1:0, (m_regvalue & TC_INTRDCH)? 1:0); + logerror("%s: Setting interrupt trigger DONE=%d READY=%d\n", tag(), (m_regvalue & TC_INTDONE)? 1:0, (m_regvalue & TC_INTRDCH)? 1:0); else - logerror("%s: register[%d] <- %02x\n", tag().c_str(), m_register_pointer, m_regvalue); + logerror("%s: register[%d] <- %02x\n", tag(), 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().c_str(), m_register_w[COMMAND]); + logerror("%s: Command %02x not defined\n", tag(), 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().c_str(), m_live_state.state); + if (TRACE_DELAY) logerror("%s: Re-enter command processing; live state = %02x\n", tag(), 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().c_str(), m_substate); + if (TRACE_DELAY) logerror("%s: Continue with substate %02x\n", tag(), 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().c_str(), current_command(), flags); + if (TRACE_DONE) logerror("%s: command %02x done, flags=%02x\n", tag(), current_command(), flags); } else { - if (TRACE_DONE) logerror("%s: command %02x done\n", tag().c_str(), current_command()); + if (TRACE_DONE) logerror("%s: command %02x done\n", tag(), current_command()); } // [1], p. 6 - if (TRACE_INT) logerror("%s: Raise interrupt DONE\n", tag().c_str()); + if (TRACE_INT) logerror("%s: Raise interrupt DONE\n", tag()); 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().c_str(), data, + tag(), 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().c_str(), ttsn().c_str(), level); + if (TRACE_LINES) logerror("%s: [%s] Index handler; level=%d\n", tag(), 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().c_str()); + if (TRACE_INDEX) logerror("%s: Index pulse\n", tag()); 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().c_str(), ttsn().c_str(), level); + if (TRACE_LINES) logerror("%s: [%s] Index pulse level=%d triggers event\n", tag(), 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().c_str(), ttsn().c_str(), level); + if (TRACE_LINES) logerror("%s: [%s] Ready handler; level=%d\n", tag(), 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().c_str()); + if (TRACE_INT) logerror("%s: Raise interrupt READY change\n", tag()); 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().c_str(), ttsn().c_str(), level); + if (TRACE_LINES) logerror("%s: [%s] Seek complete handler; level=%d\n", tag(), 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().c_str(), ttsn().c_str(), m_output1, m_output2); + if (TRACE_AUXBUS) logerror("%s: [%s] Setting OUTPUT1=%02x, OUTPUT2=%02x\n", tag(), 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().c_str(), (addrub<<16 | addrhb<<8 | addrlb)&0xffffff); + if (TRACE_DMA) logerror("%s: Setting DMA address %06x\n", tag(), (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().c_str(), ttsn().c_str()); + if (TRACE_DMA) logerror("%s: [%s] DMA acknowledged\n", tag(), 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().c_str(), m_hd_encoding); + if (TRACE_SELECT && TRACE_DETAIL) logerror("%s: HD encoding = %d\n", tag(), 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().c_str()); + if (TRACE_LINES) logerror("%s: Reset via RST line\n", tag()); device_reset(); } } diff --git a/src/devices/machine/hdc92x4.h b/src/devices/machine/hdc92x4.h index e15fc72230e..fccf23666d7 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + hdc9224_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class hdc9234_device : public hdc92x4_device { public: - hdc9234_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hdc9234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; #endif diff --git a/src/devices/machine/i2cmem.cpp b/src/devices/machine/i2cmem.cpp index b345dd3817b..d77e12ef4be 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().c_str(), buf ); + device->logerror( "%s: I2CMEM(%s) %s", device->machine().describe_context( ), device->tag(), buf ); } } @@ -74,7 +74,7 @@ ADDRESS_MAP_END // i2cmem_device - constructor //------------------------------------------------- -i2cmem_device::i2cmem_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +i2cmem_device::i2cmem_device( const machine_config &mconfig, const char *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().c_str(), i2cmem_bytes ); + fatalerror( "i2cmem region '%s' wrong size (expected size = 0x%X)\n", tag(), i2cmem_bytes ); } if( m_region->bytewidth() != 1 ) { - fatalerror( "i2cmem region '%s' needs to be an 8-bit region\n", tag().c_str() ); + fatalerror( "i2cmem region '%s' needs to be an 8-bit region\n", tag() ); } UINT8 *default_data = m_region->base(); diff --git a/src/devices/machine/i2cmem.h b/src/devices/machine/i2cmem.h index 167ea117348..d17d6f2f277 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, std::string tag, device_t *owner, UINT32 clock ); + i2cmem_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock ); static void set_address(device_t &device, int address) { downcast(device).m_slave_address = address; } static void set_page_size(device_t &device, int page_size) { downcast(device).m_page_size = page_size; } diff --git a/src/devices/machine/i6300esb.cpp b/src/devices/machine/i6300esb.cpp index 538a36340d6..ec7ca934d31 100644 --- a/src/devices/machine/i6300esb.cpp +++ b/src/devices/machine/i6300esb.cpp @@ -8,7 +8,7 @@ const device_type I6300ESB_LPC = &device_creator; DEVICE_ADDRESS_MAP_START(map, 32, i6300esb_watchdog_device) ADDRESS_MAP_END -i6300esb_watchdog_device::i6300esb_watchdog_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i6300esb_watchdog_device::i6300esb_watchdog_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i6300esb_lpc_device::i6300esb_lpc_device(const machine_config &mconfig, const char *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().c_str(), pmbase); + logerror("%s: pmbase = %08x\n", tag(), 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().c_str(), acpi_cntl); + logerror("%s: acpi_cntl = %08x\n", tag(), 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().c_str(), bios_cntl); + logerror("%s: bios_cntl = %08x\n", tag(), 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().c_str(), tco_cntl); + logerror("%s: tco_cntl = %02x\n", tag(), 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().c_str(), gpio_base); + logerror("%s: gpio_base = %08x\n", tag(), 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().c_str(), gpio_cntl); + logerror("%s: gpio_cntl = %02x\n", tag(), 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().c_str(), offset, pirq_rout[offset]); + logerror("%s: pirq_rout[%d] = %02x\n", tag(), 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().c_str(), serirq_cntl); + logerror("%s: serirq_cntl = %02x\n", tag(), 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().c_str(), d31_err_cfg); + logerror("%s: d31_err_cfg = %02x\n", tag(), 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().c_str(), d31_err_sts); + logerror("%s: d31_err_sts = %02x\n", tag(), 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().c_str(), pci_dma_cfg); + logerror("%s: pci_dma_cfg = %04x\n", tag(), 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().c_str(), gen_pmcon_1); + logerror("%s: gen_pmcon_1 = %04x\n", tag(), 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().c_str(), gen_pmcon_2); + logerror("%s: gen_pmcon_2 = %02x\n", tag(), 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().c_str(), gen_pmcon_3); + logerror("%s: gen_pmcon_3 = %02x\n", tag(), 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().c_str(), rst_cnt2); + logerror("%s: rst_cnt2 = %08x\n", tag(), 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().c_str(), apm_cnt); + logerror("%s: apm_cnt = %02x\n", tag(), 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().c_str(), apm_sts); + logerror("%s: apm_sts = %02x\n", tag(), 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().c_str(), gpi_rout); + logerror("%s: gpi_rout = %08x\n", tag(), 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().c_str(), mon_fwd_en); + logerror("%s: mon_fwd_en = %02x\n", tag(), 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().c_str(), 4+offset, mon_trp_rng[offset]); + logerror("%s: mon_trp_rng[%d] = %04x\n", tag(), 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().c_str(), mon_trp_msk); + logerror("%s: mon_trp_msk = %04x\n", tag(), 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().c_str(), gen_cntl); + logerror("%s: gen_cntl = %08x\n", tag(), 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().c_str(), gen_sta); + logerror("%s: gen_sta = %02x\n", tag(), 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().c_str(), back_cntl); + logerror("%s: back_cntl = %02x\n", tag(), 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().c_str(), rtc_conf); + logerror("%s: rtc_conf = %02x\n", tag(), 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().c_str(), lpc_if_com_range); + logerror("%s: lpc_if_com_range = %02x\n", tag(), 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().c_str(), lpc_if_fdd_lpt_range); + logerror("%s: lpc_if_fdd_lpt_range = %02x\n", tag(), 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().c_str(), lpc_if_sound_range); + logerror("%s: lpc_if_sound_range = %02x\n", tag(), 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().c_str(), fwh_dec_en1); + logerror("%s: fwh_dec_en1 = %02x\n", tag(), 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().c_str(), gen1_dec); + logerror("%s: gen1_dec = %04x\n", tag(), 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().c_str(), lpc_en); + logerror("%s: lpc_en = %04x\n", tag(), 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().c_str(), fwh_sel1); + logerror("%s: fwh_sel1 = %08x\n", tag(), 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().c_str(), gen2_dec); + logerror("%s: gen2_dec = %04x\n", tag(), 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().c_str(), fwh_sel2); + logerror("%s: fwh_sel2 = %04x\n", tag(), 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().c_str(), fwh_dec_en2); + logerror("%s: fwh_dec_en2 = %02x\n", tag(), 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().c_str(), func_dis); + logerror("%s: func_dis = %04x\n", tag(), 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().c_str(), etr1); + logerror("%s: etr1 = %08x\n", tag(), 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().c_str()); + logerror("%s: read undocumented config reg fc\n", tag()); return 0; } WRITE32_MEMBER(i6300esb_lpc_device::unk_fc_w) { - logerror("%s: write undocumented config reg fc (%08x)\n", tag().c_str(), data); + logerror("%s: write undocumented config reg fc (%08x)\n", tag(), 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().c_str()); + logerror("%s: siu configuration active\n", tag()); 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().c_str()); + logerror("%s: siu configuration disabled\n", tag()); break; } } READ8_MEMBER (i6300esb_lpc_device::siu_data_port_r) { - logerror("%s: siu config read port %02x\n", tag().c_str(), siu_config_port); + logerror("%s: siu config read port %02x\n", tag(), 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().c_str(), siu_config_port, data); + logerror("%s: siu config write port with config disabled (port=%02x, data=%02x)\n", tag(), siu_config_port, data); return; } - logerror("%s: siu config write port %02x, %02x\n", tag().c_str(), siu_config_port, data); + logerror("%s: siu config write port %02x, %02x\n", tag(), 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().c_str(), nmi_sc); + logerror("%s: nmi_sc = %02x\n", tag(), 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().c_str(), gpio_base, gpio_base+63); + logerror("%s: Warning: gpio range enabled at %04x-%04x\n", tag(), gpio_base, gpio_base+63); UINT32 hpet = 0xfed00000 + ((gen_cntl & 0x00018000) >> 3); - logerror("%s: Warning: hpet at %08x-%08x\n", tag().c_str(), hpet, hpet+0x3ff); + logerror("%s: Warning: hpet at %08x-%08x\n", tag(), hpet, hpet+0x3ff); if(lpc_en & 0x1000) - logerror("%s: Warning: superio at 2e-2f\n", tag().c_str()); + logerror("%s: Warning: superio at 2e-2f\n", tag()); if(lpc_en & 0x0800) - logerror("%s: Warning: mcu at 62/66\n", tag().c_str()); + logerror("%s: Warning: mcu at 62/66\n", tag()); if(lpc_en & 0x0400) - logerror("%s: Warning: mcu at 60/64\n", tag().c_str()); + logerror("%s: Warning: mcu at 60/64\n", tag()); if(lpc_en & 0x0200) - logerror("%s: Warning: gameport at 208-20f\n", tag().c_str()); + logerror("%s: Warning: gameport at 208-20f\n", tag()); if(lpc_en & 0x0100) - logerror("%s: Warning: gameport at 200-207\n", tag().c_str()); + logerror("%s: Warning: gameport at 200-207\n", tag()); if(lpc_en & 0x0008) { UINT16 fdc = lpc_if_fdd_lpt_range & 0x10 ? 0x370 : 0x3f0; - logerror("%s: Warning: floppy at %04x-%04x\n", tag().c_str(), fdc, fdc+7); + logerror("%s: Warning: floppy at %04x-%04x\n", tag(), 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().c_str(), lpt, lpt+7, lpt+0x400, lpt+0x407); + logerror("%s: Warning: lpt at %04x-%04x %04x-%04x\n", tag(), 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().c_str(), comb, comb+7); + logerror("%s: Warning: comb at %04x-%04x\n", tag(), 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().c_str(), coma, coma+7); + logerror("%s: Warning: coma at %04x-%04x\n", tag(), 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 e82a16bbfc7..325e768dbba 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, std::string tag, device_t *owner, UINT32 clock); + i6300esb_lpc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + i6300esb_watchdog_device(const machine_config &mconfig, const char *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 186551710fb..fb419a06090 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, std::string tag, device_t *owner, UINT32 clock) +i80130_device::i80130_device(const machine_config &mconfig, const char *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 0002e8e3201..1625fd8fc45 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, std::string tag, device_t *owner, UINT32 clock); + i80130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_ack_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_ack.set_callback(object); } diff --git a/src/devices/machine/i8155.cpp b/src/devices/machine/i8155.cpp index 1b0edf51f93..b3d4098398a 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().c_str(), m_to); + if (LOG) logerror("8155 '%s' Timer Output: %u\n", tag(), 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().c_str()); + logerror("8155 '%s' Unsupported Port C mode!\n", tag()); 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, std::string tag, device_t *owner, UINT32 clock) +i8155_device::i8155_device(const machine_config &mconfig, const char *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().c_str()); + if (LOG) logerror("8155 '%s' Timer Count Reached\n", tag()); 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().c_str()); + if (LOG) logerror("8155 '%s' Timer Stopped\n", tag()); 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().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 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 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"); + 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"); switch (data & COMMAND_PC_MASK) { case COMMAND_PC_ALT_1: - if (LOG) logerror("8155 '%s' Port C Mode: Alt 1\n", tag().c_str()); + if (LOG) logerror("8155 '%s' Port C Mode: Alt 1\n", tag()); break; case COMMAND_PC_ALT_2: - if (LOG) logerror("8155 '%s' Port C Mode: Alt 2\n", tag().c_str()); + if (LOG) logerror("8155 '%s' Port C Mode: Alt 2\n", tag()); break; case COMMAND_PC_ALT_3: - if (LOG) logerror("8155 '%s' Port C Mode: Alt 3\n", tag().c_str()); + if (LOG) logerror("8155 '%s' Port C Mode: Alt 3\n", tag()); break; case COMMAND_PC_ALT_4: - if (LOG) logerror("8155 '%s' Port C Mode: Alt 4\n", tag().c_str()); + if (LOG) logerror("8155 '%s' Port C Mode: Alt 4\n", tag()); 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().c_str()); + if (LOG) logerror("8155 '%s' Timer Command: Stop\n", tag()); 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().c_str()); + if (LOG) logerror("8155 '%s' Timer Command: Stop after TC\n", tag()); break; case COMMAND_TM_START: - if (LOG) logerror("8155 '%s' Timer Command: Start\n", tag().c_str()); + if (LOG) logerror("8155 '%s' Timer Command: Start\n", tag()); 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().c_str(), m_count_length); + if (LOG) logerror("8155 '%s' Count Length Low: %04x\n", tag(), 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().c_str(), m_count_length); + if (LOG) logerror("8155 '%s' Count Length High: %04x\n", tag(), 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().c_str()); + if (LOG) logerror("8155 '%s' Timer Mode: LOW\n", tag()); 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().c_str()); + if (LOG) logerror("8155 '%s' Timer Mode: Square wave\n", tag()); break; case TIMER_MODE_SINGLE_PULSE: // single pulse upon TC being reached - if (LOG) logerror("8155 '%s' Timer Mode: Single pulse\n", tag().c_str()); + if (LOG) logerror("8155 '%s' Timer Mode: Single pulse\n", tag()); 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().c_str()); + if (LOG) logerror("8155 '%s' Timer Mode: Automatic reload\n", tag()); break; } break; diff --git a/src/devices/machine/i8155.h b/src/devices/machine/i8155.h index aaab2e0d067..085ffe15196 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, std::string tag, device_t *owner, UINT32 clock); + i8155_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast(device).m_in_pa_cb.set_callback(object); } template static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast(device).m_in_pb_cb.set_callback(object); } diff --git a/src/devices/machine/i8212.cpp b/src/devices/machine/i8212.cpp index 14c1f28483d..0ece5f05c1c 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 - constructor //------------------------------------------------- -i8212_device::i8212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +i8212_device::i8212_device(const machine_config &mconfig, const char *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().c_str(), CLEAR_LINE); + if (LOG) logerror("I8212 '%s' INT: %u\n", tag(), 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().c_str(), state ? "output" : "input"); + if (LOG) logerror("I8212 '%s' Mode: %s\n", tag(), 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().c_str(), state); + if (LOG) logerror("I8212 '%s' STB: %u\n", tag(), 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().c_str(), ASSERT_LINE); + if (LOG) logerror("I8212 '%s' INT: %u\n", tag(), ASSERT_LINE); } } diff --git a/src/devices/machine/i8212.h b/src/devices/machine/i8212.h index 110c6adfd40..ea62ce9eefb 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, std::string tag, device_t *owner, UINT32 clock); + i8212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_di_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_di.set_callback(object); } diff --git a/src/devices/machine/i8214.cpp b/src/devices/machine/i8214.cpp index a786728e2f4..9a7cf9ecd1c 100644 --- a/src/devices/machine/i8214.cpp +++ b/src/devices/machine/i8214.cpp @@ -33,7 +33,7 @@ const device_type I8214 = &device_creator; inline void i8214_device::trigger_interrupt(int level) { - if (LOG) logerror("I8214 '%s' Interrupt Level %u\n", tag().c_str(), level); + if (LOG) logerror("I8214 '%s' Interrupt Level %u\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) : +i8214_device::i8214_device(const machine_config &mconfig, const char *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().c_str(), a); + if (LOG) logerror("I8214 '%s' A: %01x\n", tag(), 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().c_str(), m_b); + if (LOG) logerror("I8214 '%s' B: %01x\n", tag(), 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().c_str(), data); + if (LOG) logerror("I8214 '%s' R: %02x\n", tag(), 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().c_str(), state); + if (LOG) logerror("I8214 '%s' SGS: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("I8214 '%s' ETLG: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("I8214 '%s' INTE: %u\n", tag(), state); m_inte = state; } diff --git a/src/devices/machine/i8214.h b/src/devices/machine/i8214.h index d54726b83c9..8a9c631bc76 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, std::string tag, device_t *owner, UINT32 clock); + i8214_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_enlg_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_enlg.set_callback(object); } diff --git a/src/devices/machine/i8243.cpp b/src/devices/machine/i8243.cpp index 72288c4d673..f63159b5739 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 - constructor //------------------------------------------------- -i8243_device::i8243_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i8243_device::i8243_device(const machine_config &mconfig, const char *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 169564f1d27..5157056491d 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, std::string tag, device_t *owner, UINT32 clock); + i8243_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_read_handler(device_t &device, _Object object) { return downcast(device).m_readhandler.set_callback(object); } diff --git a/src/devices/machine/i8251.cpp b/src/devices/machine/i8251.cpp index f43c5fb2cab..8baf4bc57ec 100644 --- a/src/devices/machine/i8251.cpp +++ b/src/devices/machine/i8251.cpp @@ -37,7 +37,7 @@ const device_type V53_SCU = &device_creator; // i8251_device - constructor //------------------------------------------------- -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +i8251_device::i8251_device(const machine_config &mconfig, const char *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, std::string tag, devic { } -v53_scu_device::v53_scu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v53_scu_device::v53_scu_device(const machine_config &mconfig, const char *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 c1f650a9db6..7a2f7ec55fd 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, 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); + 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); // static configuration helpers template static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + v53_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/machine/i82541.cpp b/src/devices/machine/i82541.cpp index eb114c170db..8e5a1467183 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, std::string tag, device_t *owner, UINT32 clock) +i82541_device::i82541_device(const machine_config &mconfig, const char *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 02bc66fc459..475a94dc2be 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, std::string tag, device_t *owner, UINT32 clock); + i82541_device(const machine_config &mconfig, const char *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 df807a54a98..7e6a769f904 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().c_str(), 'A' + port, state); + if (LOG) logerror("I8255 '%s' Port %c IBF: %u\n", tag(), '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().c_str(), 'A' + port, state); + if (LOG) logerror("I8255 '%s' Port %c OBF: %u\n", tag(), '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().c_str(), 'A' + port, state); + if (LOG) logerror("I8255 '%s' Port %c INTE: %u\n", tag(), '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().c_str(), state); + if (LOG) logerror("I8255 '%s' Port A INTE1: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("I8255 '%s' Port A INTE2: %u\n", tag(), 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().c_str(), 'A' + port, state); + if (LOG) logerror("I8255 '%s' Port %c INTR: %u\n", tag(), '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, std::string tag, device_t *owner, UINT32 clock) +i8255_device::i8255_device(const machine_config &mconfig, const char *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().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"); + 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"); } // 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().c_str(), data); + if (LOG) logerror("I8255 '%s' Port A Read: %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("I8255 '%s' Port B Read: %02x\n", tag(), data); break; case PORT_C: data = read_pc(); - if (LOG) logerror("I8255 '%s' Port C Read: %02x\n", tag().c_str(), data); + if (LOG) logerror("I8255 '%s' Port C Read: %02x\n", tag(), data); break; case CONTROL: data = m_control; - if (LOG) logerror("I8255 '%s' Mode Control Word Read: %02x\n", tag().c_str(), data); + if (LOG) logerror("I8255 '%s' Mode Control Word Read: %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("I8255 '%s' Port A Write: %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("I8255 '%s' Port B Write: %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("I8255 '%s' Port C Write: %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("I8255 '%s' Mode Control Word: %02x\n", tag(), 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().c_str(), state ? "Set" : "Reset", bit); + if (LOG) logerror("I8255 '%s' %s Port C Bit %u\n", tag(), 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().c_str()); + if (LOG) logerror("I8255 '%s' Port B Acknowledge\n", tag()); // 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().c_str()); + if (LOG) logerror("I8255 '%s' Port B Strobe\n", tag()); // 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().c_str()); + if (LOG) logerror("I8255 '%s' Port A Strobe\n", tag()); // 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().c_str()); + if (LOG) logerror("I8255 '%s' Port A Acknowledge\n", tag()); // clear output buffer flag set_obf(PORT_A, 1); diff --git a/src/devices/machine/i8255.h b/src/devices/machine/i8255.h index 3ea41d61cc0..1fa41e727a5 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, std::string tag, device_t *owner, UINT32 clock); + i8255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast(device).m_in_pa_cb.set_callback(object); } template static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast(device).m_in_pb_cb.set_callback(object); } diff --git a/src/devices/machine/i8257.cpp b/src/devices/machine/i8257.cpp index 1a8ab36ad85..a54d21697cc 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().c_str(), channel, state); + if (LOG) logerror("I8257 '%s' Channel %u DMA Request: %u\n", tag(), 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().c_str(), m_temp, v1); + logerror("%s: verify error %02x vs. %02x\n", tag(), m_temp, v1); break; } @@ -257,7 +257,7 @@ inline void i8257_device::advance() // i8257_device - constructor //------------------------------------------------- -i8257_device::i8257_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i8257_device::i8257_device(const machine_config &mconfig, const char *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().c_str(), m_transfer_mode); + if (LOG) logerror("I8257 '%s' Command Register: %02x\n", tag(), 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().c_str(), state); + if (LOG) logerror("I8257 '%s' Hold Acknowledge: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("I8257 '%s' Ready: %u\n", tag(), state); m_ready = state; } diff --git a/src/devices/machine/i8257.h b/src/devices/machine/i8257.h index 1d313d935d2..ad02ece924e 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, std::string tag, device_t *owner, UINT32 clock); + i8257_device(const machine_config &mconfig, const char *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 71753101b7c..cd8c0faf5bf 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i8271_device::i8271_device(const machine_config &mconfig, const char *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().c_str(), command[1], + tag(), 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().c_str(), data_completion ? "data" : "seek", rr); + logerror("%s: command done (%s) - %02x\n", tag(), 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().c_str()); + logerror("%s: command recalibrate\n", tag()); 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().c_str(), command[1]); + logerror("%s: command seek %d\n", tag(), 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().c_str(), + tag(), 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().c_str(), + tag(), 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().c_str(), + tag(), 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().c_str(), + tag(), 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().c_str(), + tag(), 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().c_str(), + tag(), 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().c_str()); + logerror("%s: index found, writing track\n", tag()); 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().c_str(), + tag(), 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().c_str(), + logerror("%s: matching %02x %02x %02x - %02x %02x %02x\n", tag(), 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 eff03849a42..e4409bed389 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, std::string tag, device_t *owner, UINT32 clock); + i8271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~i8271_device() {} template static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast(device).intrq_cb.set_callback(object); } diff --git a/src/devices/machine/i8279.cpp b/src/devices/machine/i8279.cpp index 99b4e7388a0..725d1aa4827 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 - constructor //------------------------------------------------- -i8279_device::i8279_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i8279_device::i8279_device(const machine_config &mconfig, const char *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().c_str(), data & 7, (data>>3) & 3); + if (LOG) logerror("I8279 '%s' kb mode %x, display mode %x\n", tag(), 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().c_str(), m_s_ram_ptr, m_autoinc); + if (LOG) logerror("I8279 '%s' selct sensor row %x, AI %d\n", tag(), 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().c_str(), data); + if (LOG) logerror("I8279 '%s' clear cmd %x\n", tag(), data); clear_display(); break; } diff --git a/src/devices/machine/i8279.h b/src/devices/machine/i8279.h index 930a68bf953..3da46da3121 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, std::string tag, device_t *owner, UINT32 clock); + i8279_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(device).m_out_irq_cb.set_callback(object); } template static devcb_base &set_out_sl_callback(device_t &device, _Object object) { return downcast(device).m_out_sl_cb.set_callback(object); } diff --git a/src/devices/machine/i82875p.cpp b/src/devices/machine/i82875p.cpp index 0cace54a7db..58f8b3264c9 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, std::string tag, device_t *owner, UINT32 clock) +i82875p_host_device::i82875p_host_device(const machine_config &mconfig, const char *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(std::string _cpu_tag) +void i82875p_host_device::set_cpu_tag(const char *_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().c_str(), agpm); + logerror("%s: agpm = %02x\n", tag(), 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().c_str(), data); + logerror("%s: fpllcont = %02x\n", tag(), 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().c_str(), offset, data); + logerror("%s: pam[%d] = %02x\n", tag(), 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().c_str(), smram); + logerror("%s: smram = %02x\n", tag(), 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().c_str(), smram); + logerror("%s: esmramc = %02x\n", tag(), 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().c_str(), agpctrl); + logerror("%s: agpctrl = %08x\n", tag(), 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().c_str(), apsize); + logerror("%s: apsize = %02x\n", tag(), 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().c_str(), attbase); + logerror("%s: attbase = %08x\n", tag(), 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().c_str(), toud << 16); + logerror("%s: toud = %08x\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) +i82875p_agp_device::i82875p_agp_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i82875p_overflow_device::i82875p_overflow_device(const machine_config &mconfig, const char *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().c_str(), offset, data); + logerror("%s: dram_row_boundary_w %d, %02x\n", tag(), 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().c_str(), offset, data); + logerror("%s: dram_row_attribute_w %d, %02x\n", tag(), 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().c_str(), dram_timing); + logerror("%s: dram_timing_w %08x\n", tag(), 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().c_str(), dram_controller_mode); + logerror("%s: dram_controller_mode_w %08x\n", tag(), dram_controller_mode); } diff --git a/src/devices/machine/i82875p.h b/src/devices/machine/i82875p.h index 7b437f53d6e..4f7723e64a7 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, std::string tag, device_t *owner, UINT32 clock); + i82875p_host_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void set_cpu_tag(std::string tag); + void set_cpu_tag(const char *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); - std::string cpu_tag; + const char *cpu_tag; int ram_size; cpu_device *cpu; std::vector ram; @@ -98,7 +98,7 @@ private: class i82875p_agp_device : public agp_bridge_device { public: - i82875p_agp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i82875p_agp_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + i82875p_overflow_device(const machine_config &mconfig, const char *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 00b25ef09c5..cf53a098a19 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, std::string tag, device_t *owner, UINT32 clock) +i8355_device::i8355_device(const machine_config &mconfig, const char *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().c_str(), 'A' + port, data); + if (LOG) logerror("I8355 '%s' Port %c Write %02x\n", tag(), '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().c_str(), 'A' + port, data); + if (LOG) logerror("I8355 '%s' Port %c DDR: %02x\n", tag(), '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 442275c0e31..7337fa0193d 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, std::string tag, device_t *owner, UINT32 clock); + i8355_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast(device).m_in_pa_cb.set_callback(object); } template static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast(device).m_out_pa_cb.set_callback(object); } diff --git a/src/devices/machine/idectrl.cpp b/src/devices/machine/idectrl.cpp index 4539c62b0d9..5be4dcd3d5a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +ide_controller_device::ide_controller_device(const machine_config &mconfig, const char *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, std::string 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, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, const char *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, std::string 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, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +bus_master_ide_controller_device::bus_master_ide_controller_device(const machine_config &mconfig, const char *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().c_str(), m_bmcpu); + throw emu_fatalerror("IDE controller '%s' bus master target '%s' doesn't exist!", tag(), m_bmcpu); device_memory_interface *memory; if (!bmtarget->interface(memory)) - throw emu_fatalerror("IDE controller '%s' bus master target '%s' has no memory!", tag().c_str(), m_bmcpu); + throw emu_fatalerror("IDE controller '%s' bus master target '%s' has no memory!", tag(), 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 e250f1e3071..1d5a184b809 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, 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); + 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); 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + bus_master_ide_controller_device(const machine_config &mconfig, const char *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(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 396844e8b1e..c17e4258fbc 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, std::string 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, const char *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), @@ -761,13 +761,13 @@ const device_type IDE_HARDDISK = &device_creator; // ide_hdd_device - constructor //------------------------------------------------- -ide_hdd_device::ide_hdd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ide_hdd_device::ide_hdd_device(const machine_config &mconfig, const char *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, std::string 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, const char *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 b05895d50d4..8acc9e14474 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, std::string 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, const char *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, 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); + 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); protected: // device-level overrides diff --git a/src/devices/machine/im6402.cpp b/src/devices/machine/im6402.cpp index 82c9bfe794d..f713a048517 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, std::string tag, device_t *owner, UINT32 clock) : +im6402_device::im6402_device(const machine_config &mconfig, const char *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().c_str(), m_tbr); + if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag(), 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().c_str(), m_rbr); + if (LOG) logerror("IM6402 '%s' Receive Data %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("IM6402 '%s' Transmit Buffer Register %02x\n", tag(), data); m_tbr = data; if (is_transmit_register_empty()) { - if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag().c_str(), m_tbr); + if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag(), 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().c_str()); + if (LOG) logerror("IM6402 '%s' Control Register Load\n", tag()); 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().c_str(), state); + if (LOG) logerror("IM6402 '%s' Parity Inhibit %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("IM6402 '%s' Stop Bit Select %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("IM6402 '%s' Character Length Select 1 %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("IM6402 '%s' Character Length Select 2 %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("IM6402 '%s' Even Parity Enable %u\n", tag(), state); m_epe = state; } diff --git a/src/devices/machine/im6402.h b/src/devices/machine/im6402.h index f8cdae7946a..05f0b33861a 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, std::string tag, device_t *owner, UINT32 clock); + im6402_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_rrc(device_t &device, int rrc) { downcast(device).m_rrc = rrc; } static void set_trc(device_t &device, int trc) { downcast(device).m_trc = trc; } diff --git a/src/devices/machine/ins8154.cpp b/src/devices/machine/ins8154.cpp index f3d273c365c..7c192ac66e0 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 - constructor //------------------------------------------------- -ins8154_device::ins8154_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ins8154_device::ins8154_device(const machine_config &mconfig, const char *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().c_str(), offset); + logerror("%s: INS8154 '%s' Read from invalid offset %02x!\n", machine().describe_context(), tag(), 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().c_str(), data, offset); + logerror("%s: INS8154 '%s' Write %02x to invalid offset %02x!\n", machine().describe_context(), tag(), 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().c_str(), data); + logerror("%s: INS8154 '%s' ODRA set to %02x\n", machine().describe_context(), tag(), 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().c_str(), data); + logerror("%s: INS8154 '%s' ODRB set to %02x\n", machine().describe_context(), tag(), 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().c_str(), data); + logerror("%s: INS8154 '%s' MDR set to %02x\n", machine().describe_context(), tag(), data); } m_mdr = data; diff --git a/src/devices/machine/ins8154.h b/src/devices/machine/ins8154.h index 32f1eb27c52..6a38a840c89 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, std::string tag, device_t *owner, UINT32 clock); + ins8154_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_in_a_callback(device_t &device, _Object object) { return downcast(device).m_in_a_cb.set_callback(object); } template static devcb_base &set_out_a_callback(device_t &device, _Object object) { return downcast(device).m_out_a_cb.set_callback(object); } diff --git a/src/devices/machine/ins8250.cpp b/src/devices/machine/ins8250.cpp index 7d6aa2a84e5..bbd0fee1584 100644 --- a/src/devices/machine/ins8250.cpp +++ b/src/devices/machine/ins8250.cpp @@ -91,7 +91,7 @@ const device_type NS16450 = &device_creator; const device_type NS16550 = &device_creator; const device_type PC16552D = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +ins8250_device::ins8250_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ns16450_device::ns16450_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ns16550_device::ns16550_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +pc16552_device::pc16552_device(const machine_config &mconfig, const char *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 af5c08dba15..547c3dea602 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); template static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast(device).m_out_tx_cb.set_callback(object); } template static devcb_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + ins8250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ns16450_device : public ins8250_uart_device { public: - ns16450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ns16450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ns16550_device : public ins8250_uart_device { public: - ns16550_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ns16550_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pc16552_device(const machine_config &mconfig, const char *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 55b7705bfc6..9fdc04609c1 100644 --- a/src/devices/machine/intelfsh.cpp +++ b/src/devices/machine/intelfsh.cpp @@ -103,7 +103,6 @@ const device_type SST_39VF020 = &device_creator; const device_type SHARP_LH28F400 = &device_creator; const device_type INTEL_E28F008SA = &device_creator; const device_type INTEL_TE28F160 = &device_creator; -const device_type INTEL_TE28F320 = &device_creator; const device_type SHARP_UNK128MBIT = &device_creator; const device_type INTEL_28F320J3D = &device_creator; const device_type INTEL_28F320J5 = &device_creator; @@ -161,7 +160,7 @@ ADDRESS_MAP_END // intelfsh_device - constructor //------------------------------------------------- -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) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), device_nvram_interface(mconfig, *this), @@ -328,13 +327,6 @@ intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type m_device_id = 0xd0; map = ADDRESS_MAP_NAME( memory_map16_16Mb ); break; - case FLASH_INTEL_TE28F320: - m_bits = 16; - m_size = 0x400000; - m_maker_id = MFG_INTEL; - m_device_id = 0x8896; - map = ADDRESS_MAP_NAME( memory_map16_32Mb ); - break; case FLASH_SHARP_UNK128MBIT: m_bits = 16; m_size = 0x800000; @@ -398,97 +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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +intel_28f016s5_device::intel_28f016s5_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +fujitsu_29f160t_device::fujitsu_29f160t_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +fujitsu_29f016a_device::fujitsu_29f016a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +fujitsu_29dl16x_device::fujitsu_29dl16x_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sharp_lh28f016s_device::sharp_lh28f016s_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +atmel_29c010_device::atmel_29c010_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +amd_29f010_device::amd_29f010_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +amd_29f040_device::amd_29f040_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +amd_29f080_device::amd_29f080_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +amd_29f400t_device::amd_29f400t_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +amd_29f800t_device::amd_29f800t_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +amd_29lv200t_device::amd_29lv200t_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +intel_e28f008sa_device::intel_e28f008sa_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +macronix_29l001mc_device::macronix_29l001mc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +macronix_29lv160tmc_device::macronix_29lv160tmc_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +panasonic_mn63f805mnp_device::panasonic_mn63f805mnp_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sanyo_le26fv10n1ts_device::sanyo_le26fv10n1ts_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sst_28sf040_device::sst_28sf040_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sst_39vf020_device::sst_39vf020_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sharp_lh28f400_device::sharp_lh28f400_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +intel_te28f160_device::intel_te28f160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : intelfsh16_device(mconfig, INTEL_TE28F160, "Intel TE28F160 Flash", tag, owner, clock, FLASH_INTEL_TE28F160, "intel_te28f160", __FILE__) { } -intel_te28f320_device::intel_te28f320_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) - : intelfsh16_device(mconfig, INTEL_TE28F320, "Intel TE28F320 Flash", tag, owner, clock, FLASH_INTEL_TE28F320, "intel_te28f320", __FILE__) { } - -intel_e28f400b_device::intel_e28f400b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +intel_e28f400b_device::intel_e28f400b_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sharp_unk128mbit_device::sharp_unk128mbit_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +intel_28f320j3d_device::intel_28f320j3d_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +intel_28f320j5_device::intel_28f320j5_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sst_39vf400a_device::sst_39vf400a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms_29f040_device::tms_29f040_device(const machine_config &mconfig, const char *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 2b2eae85dc9..d23f0a01849 100644 --- a/src/devices/machine/intelfsh.h +++ b/src/devices/machine/intelfsh.h @@ -147,7 +147,7 @@ public: protected: // construction/destruction - 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); + 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); protected: // device-level overrides @@ -196,7 +196,7 @@ class intelfsh8_device : public intelfsh_device { protected: // construction/destruction - 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); + 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); public: // public interface @@ -216,7 +216,7 @@ class intelfsh16_device : public intelfsh_device { protected: // construction/destruction - 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); + 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); public: // public interface @@ -236,134 +236,134 @@ public: class intel_28f016s5_device : public intelfsh8_device { public: - intel_28f016s5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + intel_28f016s5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class fujitsu_29f160t_device : public intelfsh8_device { public: - fujitsu_29f160t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fujitsu_29f160t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class fujitsu_29f016a_device : public intelfsh8_device { public: - fujitsu_29f016a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fujitsu_29f016a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class fujitsu_29dl16x_device : public intelfsh8_device { public: - fujitsu_29dl16x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fujitsu_29dl16x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class atmel_29c010_device : public intelfsh8_device { public: - atmel_29c010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atmel_29c010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class amd_29f010_device : public intelfsh8_device { public: - amd_29f010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + amd_29f010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class amd_29f040_device : public intelfsh8_device { public: - amd_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + amd_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class amd_29f080_device : public intelfsh8_device { public: - amd_29f080_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + amd_29f080_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class amd_29f400t_device : public intelfsh8_device { public: - amd_29f400t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + amd_29f400t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class amd_29f800t_device : public intelfsh8_device { public: - amd_29f800t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + amd_29f800t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class amd_29lv200t_device : public intelfsh8_device { public: - amd_29lv200t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + amd_29lv200t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class sharp_lh28f016s_device : public intelfsh8_device { public: - sharp_lh28f016s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sharp_lh28f016s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class intel_e28f008sa_device : public intelfsh8_device { public: - intel_e28f008sa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + intel_e28f008sa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class macronix_29l001mc_device : public intelfsh8_device { public: - macronix_29l001mc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + macronix_29l001mc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class macronix_29lv160tmc_device : public intelfsh8_device { public: - macronix_29lv160tmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + macronix_29lv160tmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class panasonic_mn63f805mnp_device : public intelfsh8_device { public: - panasonic_mn63f805mnp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + panasonic_mn63f805mnp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class sanyo_le26fv10n1ts_device : public intelfsh8_device { public: - sanyo_le26fv10n1ts_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sanyo_le26fv10n1ts_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class sst_28sf040_device : public intelfsh8_device { public: - sst_28sf040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sst_28sf040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class sst_39vf020_device : public intelfsh8_device { public: - sst_39vf020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sst_39vf020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms_29f040_device : public intelfsh8_device { public: - tms_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // 16-bit variants class sharp_lh28f400_device : public intelfsh16_device { public: - sharp_lh28f400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sharp_lh28f400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class intel_te28f160_device : public intelfsh16_device { public: - intel_te28f160_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + intel_te28f160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class intel_te28f320_device : public intelfsh16_device @@ -375,31 +375,31 @@ public: class intel_e28f400b_device : public intelfsh16_device { public: - intel_e28f400b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + intel_e28f400b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class sharp_unk128mbit_device : public intelfsh16_device { public: - sharp_unk128mbit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sharp_unk128mbit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class intel_28f320j3d_device : public intelfsh16_device { public: - intel_28f320j3d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + intel_28f320j3d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class intel_28f320j5_device : public intelfsh16_device { public: - intel_28f320j5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + intel_28f320j5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class sst_39vf400a_device : public intelfsh16_device { public: - sst_39vf400a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sst_39vf400a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/machine/jvsdev.cpp b/src/devices/machine/jvsdev.cpp index e5884362f62..c70f8a9fce6 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, std::string 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, const char *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_tag); if(!host) - fatalerror("JVS device %s could not find JVS host %s\n", tag().c_str(), jvs_host_tag); + fatalerror("JVS device %s could not find JVS host %s\n", tag(), 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 70ab6e65345..22a95e2b1a7 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); 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 6acb113bf5d..bca7f7c618c 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, std::string 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, const char *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 4f66e46dccc..a52c2d0fdf0 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); void add_device(jvs_device *dev); diff --git a/src/devices/machine/k033906.cpp b/src/devices/machine/k033906.cpp index 8ea467cb4df..bd32fef29f1 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 - constructor //------------------------------------------------- -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) +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) { } diff --git a/src/devices/machine/k033906.h b/src/devices/machine/k033906.h index a2a51370045..aa2c685df99 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, std::string tag, device_t *owner, UINT32 clock); + k033906_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void set_voodoo_tag(device_t &device, std::string tag) { downcast(device).m_voodoo_tag = tag; } + static void set_voodoo_tag(device_t &device, const char *tag) { downcast(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 - std::string m_voodoo_tag; + const char *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 0ac6da4c957..45020926ace 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k053252_device::k053252_device(const machine_config &mconfig, const char *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,6 +76,7 @@ k053252_device::k053252_device(const machine_config &mconfig, std::string 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) { } @@ -103,7 +104,7 @@ void k053252_device::device_start() save_item(NAME(m_vsw)); save_item(NAME(m_hsw)); - if (!m_slave_screen_tag.empty()) + if (m_slave_screen_tag != nullptr) { // find the screen device if explicitly configured m_slave_screen = device().siblingdevice(m_slave_screen_tag); @@ -258,7 +259,7 @@ WRITE8_MEMBER( k053252_device::write ) } -void k053252_device::static_set_slave_screen(device_t &device, std::string tag) +void k053252_device::static_set_slave_screen(device_t &device, const char *tag) { k053252_device &dev = downcast(device); dev.m_slave_screen_tag = tag; diff --git a/src/devices/machine/k053252.h b/src/devices/machine/k053252.h index 82056202bf6..a00743789ad 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, std::string tag, device_t *owner, UINT32 clock); + k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k053252_device() {} template static devcb_base &set_int1_en_callback(device_t &device, _Object object) { return downcast(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, std::string tag); + static void static_set_slave_screen(device_t &device, const char *tag); protected: @@ -75,7 +75,7 @@ protected: int m_offsx; int m_offsy; - std::string m_slave_screen_tag; + const char * m_slave_screen_tag; screen_device * m_slave_screen; }; diff --git a/src/devices/machine/k056230.cpp b/src/devices/machine/k056230.cpp index 46e63a89124..8d750b66a8a 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 - constructor //------------------------------------------------- -k056230_device::k056230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k056230_device::k056230_device(const machine_config &mconfig, const char *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 04629bce16d..5695261f4c2 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, std::string tag, device_t *owner, UINT32 clock); + k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu.set_tag(tag); } + static void set_cpu_tag(device_t &device, const char *tag) { downcast(device).m_cpu.set_tag(tag); } static void set_thunderh_hack(device_t &device, int thunderh) { downcast(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 77a9900ca1d..ca5fb5e7e76 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 - constructor //------------------------------------------------- -ay3600_device::ay3600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ay3600_device::ay3600_device(const machine_config &mconfig, const char *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 02110a6c57f..1d0529e7a0c 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, std::string tag, device_t *owner, UINT32 clock); + ay3600_device(const machine_config &mconfig, const char *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 a7ef77d4dd7..d801bbf7dcf 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_io_kbd0(*this, "TERM_LINE0"), m_io_kbd1(*this, "TERM_LINE1"), @@ -51,7 +51,7 @@ generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, { } -generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, const char *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 b75f342b3ac..79a91f923c9 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, 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); + 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); template static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast(device).m_keyboard_cb.set_callback(object); } diff --git a/src/devices/machine/kr2376.cpp b/src/devices/machine/kr2376.cpp index 73e4eeba091..169a8b5f60d 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kr2376_device::kr2376_device(const machine_config &mconfig, const char *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 346c2676136..080bfec4b90 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, std::string tag, device_t *owner, UINT32 clock); + kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~kr2376_device() {} template static devcb_base &set_strobe_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_strobe.set_callback(object); } diff --git a/src/devices/machine/laserdsc.cpp b/src/devices/machine/laserdsc.cpp index ffffc5c6cad..50e6dc09836 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), 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, std::string tag) +void laserdisc_device::static_set_overlay_palette(device_t &device, const char *tag) { downcast(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().c_str()); + m_disc = machine().rom_load().get_disk_handle(tag()); // 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().c_str()) == 0) + if (strcmp(devtag, tag()) == 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().c_str()); + xml_set_attribute(ldnode, "tag", tag()); // 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 ec615e512b3..c550a9f61aa 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + laserdisc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual ~laserdisc_device(); public: @@ -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, std::string tag); + static void static_set_overlay_palette(device_t &device, const char *tag); protected: // timer IDs diff --git a/src/devices/machine/latch.cpp b/src/devices/machine/latch.cpp index 8f70ff582ab..55aaf7dfeba 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +output_latch_device::output_latch_device(const machine_config &mconfig, const char *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 15e34737eb5..66e08614b66 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, std::string tag, device_t *owner, UINT32 clock); + output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_bit0_handler(device_t &device, _Object object) { return downcast(device).m_bit0_handler.set_callback(object); } template static devcb_base &set_bit1_handler(device_t &device, _Object object) { return downcast(device).m_bit1_handler.set_callback(object); } diff --git a/src/devices/machine/latch8.cpp b/src/devices/machine/latch8.cpp index b454de88535..9213f8e50c6 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +latch8_device::latch8_device(const machine_config &mconfig, const char *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, std::string 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().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()); + 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()); } //------------------------------------------------- // device_start - device-specific startup diff --git a/src/devices/machine/latch8.h b/src/devices/machine/latch8.h index 3d2844df7fd..dce9ea6f87a 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, std::string tag, device_t *owner, UINT32 clock); + latch8_device(const machine_config &mconfig, const char *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 97adba322c4..9ad9f4cb37a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +lc89510_device::lc89510_device(const machine_config &mconfig, const char *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 b3c9472d13c..0d7ebedcf71 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, std::string tag, device_t *owner, UINT32 clock); + lc89510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp index 4382adb58af..17b02edf276 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, std::string tag, device_t *owner, UINT32 clock) +pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : laserdisc_device(mconfig, PIONEER_PR8210, "Pioneer PR-8210", 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, std: { } -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) +pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : laserdisc_device(mconfig, type, name, tag, owner, clock, shortname, source), m_control(0), m_lastcommand(0), @@ -889,7 +889,7 @@ ROM_END // simutrek_special_device - constructor //------------------------------------------------- -simutrek_special_device::simutrek_special_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +simutrek_special_device::simutrek_special_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pioneer_pr8210_device(mconfig, SIMUTREK_SPECIAL, "Simutrek Modified PR-8210", 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 c149620a87e..7418df3336d 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + simutrek_special_device(const machine_config &mconfig, const char *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 6641b52b28e..ee49e382583 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, std::string tag, device_t *owner, UINT32 clock) + sony_ldp1450_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + pioneer_pr7820_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) + phillips_22vp932_device(const machine_config &mconfig, const char *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 bda17600155..1e6224adc0d 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, std::string tag, device_t *owner, UINT32 clock) +pioneer_ldv1000_device::pioneer_ldv1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : laserdisc_device(mconfig, PIONEER_LDV1000, "Pioneer LD-V1000", 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 b42f829160b..c2f9ead67a6 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, std::string tag, device_t *owner, UINT32 clock); + pioneer_ldv1000_device(const machine_config &mconfig, const char *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 26470147197..716728b638b 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, std::string tag, device_t *owner, UINT32 clock) +phillips_22vp931_device::phillips_22vp931_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : laserdisc_device(mconfig, PHILLIPS_22VP931, "Phillips 22VP931", 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 fc662f475a6..8acd7ebf6bd 100644 --- a/src/devices/machine/ldvp931.h +++ b/src/devices/machine/ldvp931.h @@ -48,7 +48,7 @@ public: typedef delegate data_ready_delegate; // construction/destruction - phillips_22vp931_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + phillips_22vp931_device(const machine_config &mconfig, const char *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 0727a0ebb21..23cc5902a29 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, std::string 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, 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_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().c_str(), m_selected); + logerror("%s: send_command unknown SCSI id %d\n", tag(), 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().c_str(), m_selected); + logerror("%s: get_length unknown SCSI id %d\n", tag(), 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().c_str(), m_selected); + logerror("%s: get_phase unknown SCSI id %d\n", tag(), 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().c_str(), m_selected); + logerror("%s: read_data unknown SCSI id %d\n", tag(), 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().c_str(), m_selected); + logerror("%s: write_data unknown SCSI id %d\n", tag(), m_selected); } } @@ -125,7 +125,7 @@ UINT8 legacy_scsi_host_adapter::get_status() } else { - logerror("%s: get_status unknown SCSI id %d\n", tag().c_str(), m_selected); + logerror("%s: get_status unknown SCSI id %d\n", tag(), m_selected); return 0; } } diff --git a/src/devices/machine/legscsi.h b/src/devices/machine/legscsi.h index 32235ee61aa..b3d8800972c 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - static void set_scsi_port(device_t &device, std::string tag) { downcast(device).m_scsi_port.set_tag(tag); } + static void set_scsi_port(device_t &device, const char *tag) { downcast(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 8244fd68325..88b9b8d51c7 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 - constructor //------------------------------------------------- -lh5810_device::lh5810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +lh5810_device::lh5810_device(const machine_config &mconfig, const char *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 6a3d8fcbd38..63bff576958 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, std::string tag, device_t *owner, UINT32 clock); + lh5810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_porta_r_callback(device_t &device, _Object object) { return downcast(device).m_porta_r_cb.set_callback(object); } template static devcb_base &set_porta_w_callback(device_t &device, _Object object) { return downcast(device).m_porta_w_cb.set_callback(object); } diff --git a/src/devices/machine/linflash.cpp b/src/devices/machine/linflash.cpp index 4c8a5df3b14..efc9583981b 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, std::string 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, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) : +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_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, std::string tag, device_t *owner, UINT32 clock) : +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_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, std::string tag, device_t *owner, UINT32 clock) : +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_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 c588d9bca13..e6acfcf4ef3 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + linear_flash_pccard_16mb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + linear_flash_pccard_32mb_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + linear_flash_pccard_64mb_device(const machine_config &mconfig, const char *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 b9cd34459ff..72d066affaa 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, std::string tag, device_t *owner, UINT32 clock) +lpc_acpi_device::lpc_acpi_device(const machine_config &mconfig, const char *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().c_str(), pm1_sts); + logerror("%s: pm1_sts = %04x\n", tag(), 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().c_str(), pm1_en); + logerror("%s: pm1_en = %04x\n", tag(), 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().c_str(), pm1_cnt); + logerror("%s: pm1_cnt = %08x\n", tag(), 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().c_str(), proc_cnt); + logerror("%s: proc_cnt = %08x\n", tag(), 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().c_str(), gpe0_sts); + logerror("%s: gpe0_sts = %08x\n", tag(), 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().c_str(), gpe0_en); + logerror("%s: gpe0_en = %08x\n", tag(), 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().c_str(), smi_en); + logerror("%s: smi_en = %08x\n", tag(), 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().c_str(), smi_sts); + logerror("%s: smi_sts = %08x\n", tag(), 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().c_str(), alt_gp_smi_en); + logerror("%s: alt_gp_smi_en = %04x\n", tag(), 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().c_str(), alt_gp_smi_sts); + logerror("%s: alt_gp_smi_sts = %04x\n", tag(), 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().c_str(), devact_sts); + logerror("%s: devact_sts = %04x\n", tag(), 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().c_str(), devtrap_en); + logerror("%s: devtrap_en = %04x\n", tag(), devtrap_en); } READ16_MEMBER( lpc_acpi_device::bus_addr_track_r) { - logerror("%s: read bus_addr_track\n", tag().c_str()); + logerror("%s: read bus_addr_track\n", tag()); return 0; } READ8_MEMBER( lpc_acpi_device::bus_cyc_track_r) { - logerror("%s: read bus_cyc_track\n", tag().c_str()); + logerror("%s: read bus_cyc_track\n", tag()); 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().c_str(), tco_rld); + logerror("%s: tco_rld = %02x\n", tag(), 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().c_str(), tco_tmr); + logerror("%s: tco_tmr = %02x\n", tag(), 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().c_str(), tco_dat_in); + logerror("%s: tco_dat_in = %02x\n", tag(), 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().c_str(), tco_dat_out); + logerror("%s: tco_dat_out = %02x\n", tag(), 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().c_str(), tco1_sts); + logerror("%s: tco1_sts = %04x\n", tag(), 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().c_str(), tco2_sts); + logerror("%s: tco2_sts = %04x\n", tag(), 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().c_str(), tco1_cnt); + logerror("%s: tco1_cnt = %04x\n", tag(), 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().c_str(), tco2_cnt); + logerror("%s: tco2_cnt = %04x\n", tag(), 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().c_str(), tco_message1); + logerror("%s: tco_message1 = %02x\n", tag(), 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().c_str(), tco_message2); + logerror("%s: tco_message2 = %02x\n", tag(), 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().c_str(), tco_wdstatus); + logerror("%s: tco_wdstatus = %02x\n", tag(), 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().c_str(), sw_irq_gen); + logerror("%s: sw_irq_gen = %02x\n", tag(), sw_irq_gen); } diff --git a/src/devices/machine/lpc-acpi.h b/src/devices/machine/lpc-acpi.h index bf862155e71..bde29170f04 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, std::string tag, device_t *owner, UINT32 clock); + lpc_acpi_device(const machine_config &mconfig, const char *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 2bb71a600ba..19a07373ec5 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, std::string tag, device_t *owner, UINT32 clock) +lpc_pit_device::lpc_pit_device(const machine_config &mconfig, const char *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().c_str(), offset); + logerror("%s: status_r %d\n", tag(), offset); return 0xff; } WRITE8_MEMBER(lpc_pit_device::access_w) { - logerror("%s: access_w %d, %02x\n", tag().c_str(), offset, data); + logerror("%s: access_w %d, %02x\n", tag(), offset, data); } WRITE8_MEMBER(lpc_pit_device::control_w) { - logerror("%s: control_w %02x\n", tag().c_str(), data); + logerror("%s: control_w %02x\n", tag(), data); } diff --git a/src/devices/machine/lpc-pit.h b/src/devices/machine/lpc-pit.h index 5b56388e9fe..a9e96a7b401 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, std::string tag, device_t *owner, UINT32 clock); + lpc_pit_device(const machine_config &mconfig, const char *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 60a8e61c0ce..455ab99d2fb 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, std::string tag, device_t *owner, UINT32 clock) +lpc_rtc_device::lpc_rtc_device(const machine_config &mconfig, const char *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().c_str(), cur_index, data); + logerror("%s: ram[%02x] = %02x\n", tag(), 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().c_str(), cur_extindex|128, data); + logerror("%s: ram[%02x] = %02x\n", tag(), cur_extindex|128, data); } diff --git a/src/devices/machine/lpc-rtc.h b/src/devices/machine/lpc-rtc.h index 1e8a778354c..f46a3ca2238 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, std::string tag, device_t *owner, UINT32 clock); + lpc_rtc_device(const machine_config &mconfig, const char *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 3a77b09abb7..afb51435f23 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/devices/machine/lpc.h b/src/devices/machine/lpc.h index 5b42c66976d..6ade06d03ff 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); 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 7608d40645e..d03667d5be8 100644 --- a/src/devices/machine/lpci.cpp +++ b/src/devices/machine/lpci.cpp @@ -89,11 +89,12 @@ const device_type PCI_BUS_LEGACY = &device_creator; //------------------------------------------------- // pci_bus_legacy_device - constructor //------------------------------------------------- -pci_bus_legacy_device::pci_bus_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pci_bus_legacy_device::pci_bus_legacy_device(const machine_config &mconfig, const char *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; } @@ -132,7 +133,7 @@ READ32_MEMBER( pci_bus_legacy_device::read ) } if (LOG_PCI) - logerror("read('%s'): offset=%d result=0x%08X\n", tag().c_str(), offset, result); + logerror("read('%s'): offset=%d result=0x%08X\n", tag(), offset, result); return result; } @@ -164,7 +165,7 @@ WRITE32_MEMBER( pci_bus_legacy_device::write ) offset %= 2; if (LOG_PCI) - logerror("write('%s'): offset=%d data=0x%08X\n", tag().c_str(), offset, data); + logerror("write('%s'): offset=%d data=0x%08X\n", tag(), offset, data); switch (offset) { @@ -262,7 +263,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].empty()) + if (m_devtag[i] != nullptr) 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 86111eba18e..849f27d206d 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, std::string tag, device_t *owner, UINT32 clock); + pci_bus_legacy_device(const machine_config &mconfig, const char *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, std::string tag, pci_read_func read_func, pci_write_func write_func) { + void set_device(int num, const char *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; - std::string m_devtag[32]; + const char * 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 a5ffa050560..a8dea68d6ef 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 - constructor //------------------------------------------------- -m6m80011ap_device::m6m80011ap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m6m80011ap_device::m6m80011ap_device(const machine_config &mconfig, const char *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 b7729799035..dfea6c06c14 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, std::string tag, device_t *owner, UINT32 clock); + m6m80011ap_device(const machine_config &mconfig, const char *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 8948b28703c..44c49fb4e88 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mb14241_device::mb14241_device(const machine_config &mconfig, const char *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 a8849d6127d..01c2d1b0dde 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, std::string tag, device_t *owner, UINT32 clock); + mb14241_device(const machine_config &mconfig, const char *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 65fc7a0f615..d749d8abc1a 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 - constructor //------------------------------------------------- -mb3773_device::mb3773_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +mb3773_device::mb3773_device( const machine_config &mconfig, const char *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 2f607bb7044..fa6fdd583fa 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, std::string tag, device_t *owner, UINT32 clock ); + mb3773_device( const machine_config &mconfig, const char *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 2d4fd1525b7..0d3cb819a66 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 - constructor //------------------------------------------------- -mb8421_device::mb8421_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mb8421_device::mb8421_device(const machine_config &mconfig, const char *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 adefd522f04..d1d23ab0691 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, std::string tag, device_t *owner, UINT32 clock); + mb8421_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_intl_handler(device_t &device, _Object object) { return downcast(device).m_intl_handler.set_callback(object); } diff --git a/src/devices/machine/mb87078.cpp b/src/devices/machine/mb87078.cpp index c36585fb126..a94380456f5 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mb87078_device::mb87078_device(const machine_config &mconfig, const char *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 6e72b5ea05d..9eeb6c7526f 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, std::string tag, device_t *owner, UINT32 clock); + mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mb87078_device() {} template static devcb_base &set_gain_changed_callback(device_t &device, _Object object) { return downcast(device).m_gain_changed_cb.set_callback(object); } diff --git a/src/devices/machine/mb8795.cpp b/src/devices/machine/mb8795.cpp index df6f90625e4..7f2c096023c 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, std::string tag, device_t *owner, UINT32 clock) : +mb8795_device::mb8795_device(const machine_config &mconfig, const char *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().c_str(), txstat, space.device().safe_pc()); + // logerror("%s: txstat_r %02x (%08x)\n", tag(), 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().c_str(), txstat, space.device().safe_pc()); + logerror("%s: txstat_w %02x (%08x)\n", tag(), txstat, space.device().safe_pc()); } READ8_MEMBER(mb8795_device::txmask_r) { - logerror("%s: txmask_r %02x (%08x)\n", tag().c_str(), txmask, space.device().safe_pc()); + logerror("%s: txmask_r %02x (%08x)\n", tag(), 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().c_str(), txmask, space.device().safe_pc()); + logerror("%s: txmask_w %02x (%08x)\n", tag(), txmask, space.device().safe_pc()); } READ8_MEMBER(mb8795_device::rxstat_r) { - logerror("%s: rxstat_r %02x (%08x)\n", tag().c_str(), rxstat, space.device().safe_pc()); + logerror("%s: rxstat_r %02x (%08x)\n", tag(), 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().c_str(), rxstat, space.device().safe_pc()); + logerror("%s: rxstat_w %02x (%08x)\n", tag(), rxstat, space.device().safe_pc()); } READ8_MEMBER(mb8795_device::rxmask_r) { - logerror("%s: rxmask_r %02x (%08x)\n", tag().c_str(), rxmask, space.device().safe_pc()); + logerror("%s: rxmask_r %02x (%08x)\n", tag(), 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().c_str(), rxmask, space.device().safe_pc()); + logerror("%s: rxmask_w %02x (%08x)\n", tag(), rxmask, space.device().safe_pc()); } READ8_MEMBER(mb8795_device::txmode_r) { - logerror("%s: txmode_r %02x (%08x)\n", tag().c_str(), txmode, space.device().safe_pc()); + logerror("%s: txmode_r %02x (%08x)\n", tag(), txmode, space.device().safe_pc()); return txmode; } WRITE8_MEMBER(mb8795_device::txmode_w) { txmode = data; - logerror("%s: txmode_w %02x (%08x)\n", tag().c_str(), txmode, space.device().safe_pc()); + logerror("%s: txmode_w %02x (%08x)\n", tag(), txmode, space.device().safe_pc()); } READ8_MEMBER(mb8795_device::rxmode_r) { - logerror("%s: rxmode_r %02x (%08x)\n", tag().c_str(), rxmode, space.device().safe_pc()); + logerror("%s: rxmode_r %02x (%08x)\n", tag(), rxmode, space.device().safe_pc()); return rxmode; } WRITE8_MEMBER(mb8795_device::rxmode_w) { rxmode = data; - logerror("%s: rxmode_w %02x (%08x)\n", tag().c_str(), rxmode, space.device().safe_pc()); + logerror("%s: rxmode_w %02x (%08x)\n", tag(), 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().c_str(), txcount & 0xff, space.device().safe_pc()); + logerror("%s: tdc_lsb_r %02x (%08x)\n", tag(), 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().c_str(), txcount >> 8, space.device().safe_pc()); + logerror("%s: tdc_msb_r %02x (%08x)\n", tag(), 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().c_str(), + logerror("%s: send packet, dest=%02x.%02x.%02x.%02x.%02x.%02x len=%04x loopback=%s\n", tag(), 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().c_str(), + logerror("%s: received packet for %02x.%02x.%02x.%02x.%02x.%02x len=%04x, mode=%d -> %s\n", tag(), 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 b1f8b754e80..4811d38c04d 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, std::string tag, device_t *owner, UINT32 clock); + mb8795_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_tx_irq_wr_callback(device_t &device, _Object object) { return downcast(device).irq_tx_cb.set_callback(object); } template static devcb_base &set_rx_irq_wr_callback(device_t &device, _Object object) { return downcast(device).irq_rx_cb.set_callback(object); } diff --git a/src/devices/machine/mb89352.cpp b/src/devices/machine/mb89352.cpp index 9335204e3ca..1b0894c2007 100644 --- a/src/devices/machine/mb89352.cpp +++ b/src/devices/machine/mb89352.cpp @@ -115,7 +115,7 @@ const device_type MB89352A = &device_creator; * Device */ -mb89352_device::mb89352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +mb89352_device::mb89352_device(const machine_config &mconfig, const char *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 15a808f3b84..faae5c4ab3f 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, std::string tag, device_t *owner, UINT32 clock); + mb89352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } template static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast(device).m_drq_cb.set_callback(object); } diff --git a/src/devices/machine/mb89363b.cpp b/src/devices/machine/mb89363b.cpp index 975378a11db..2e4f210a865 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mb89363b_device::mb89363b_device(const machine_config &mconfig, const char *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 bf03320df25..85b1913e6d1 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, std::string tag, device_t *owner, UINT32 clock); + mb89363b_device(const machine_config &mconfig, const char *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 fd29deb94a1..1188f295725 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( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +mb89371_device::mb89371_device( const machine_config &mconfig, const char *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 5862c202f6b..f7d5c1a2bad 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, std::string tag, device_t *owner, UINT32 clock); + mb89371_device(const machine_config &mconfig, const char *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 dccbf078ef4..9166e189952 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 - constructor //------------------------------------------------- -mc146818_device::mc146818_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc146818_device::mc146818_device(const machine_config &mconfig, const char *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, std::string tag, { } -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) +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) : 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 c45b05ea42e..c1c30eae17e 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, 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); + 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); // callbacks template 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 27d2536a5f0..f93dc1b5ab1 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, std::string tag, device_t *owner, UINT32 clock) : +mc2661_device::mc2661_device(const machine_config &mconfig, const char *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().c_str(), data); + if (LOG) logerror("MC2661 '%s' Transmit Holding Register: %02x\n", tag(), 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().c_str(), m_sync_index + 1, data); + if (LOG) logerror("MC2661 '%s' Sync Register %u: %02x\n", tag(), 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().c_str(), m_mode_index + 1, data); + if (LOG) logerror("MC2661 '%s' Mode Register %u: %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC2661 '%s' Command Register: %02x\n", tag(), 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().c_str(), state); + if (LOG) logerror("MC2661 '%s' Data Set Ready: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MC2661 '%s' Data Carrier Detect: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MC2661 '%s' Clear to Send: %u\n", tag(), state); } diff --git a/src/devices/machine/mc2661.h b/src/devices/machine/mc2661.h index bcbe2157e1e..a18aa0141f1 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, std::string tag, device_t *owner, UINT32 clock); + mc2661_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_rxc(device_t &device, int clock) { downcast(device).m_rxc = clock; } static void static_set_txc(device_t &device, int clock) { downcast(device).m_txc = clock; } diff --git a/src/devices/machine/mc68328.cpp b/src/devices/machine/mc68328.cpp index ffe47f686ac..deb73d0eaa4 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc68328_device::mc68328_device(const machine_config &mconfig, const char *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 c11aeae5b22..c01e2ab471b 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, std::string tag, device_t *owner, UINT32 clock); + mc68328_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mc68328_device() {} - static void static_set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu.set_tag(tag); } + static void static_set_cpu_tag(device_t &device, const char *tag) { downcast(device).m_cpu.set_tag(tag); } template static devcb_base &set_out_port_a_callback(device_t &device, _Object object) { return downcast(device).m_out_port_a_cb.set_callback(object); } template static devcb_base &set_out_port_b_callback(device_t &device, _Object object) { return downcast(device).m_out_port_b_cb.set_callback(object); } template static devcb_base &set_out_port_c_callback(device_t &device, _Object object) { return downcast(device).m_out_port_c_cb.set_callback(object); } diff --git a/src/devices/machine/mc6843.cpp b/src/devices/machine/mc6843.cpp index 3d68988d15f..04a7b6a0906 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc6843_device::mc6843_device(const machine_config &mconfig, const char *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 d9eb57cddfd..9dea3271e0d 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, std::string tag, device_t *owner, UINT32 clock); + mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mc6843_device() {} template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } diff --git a/src/devices/machine/mc6846.cpp b/src/devices/machine/mc6846.cpp index c213dc04669..18b9f723bfb 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc6846_device::mc6846_device(const machine_config &mconfig, const char *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 7444980bed3..bb198ee64d7 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, std::string tag, device_t *owner, UINT32 clock); + mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mc6846_device() {} template static devcb_base &set_out_port_callback(device_t &device, _Object object) { return downcast(device).m_out_port_cb.set_callback(object); } diff --git a/src/devices/machine/mc6852.cpp b/src/devices/machine/mc6852.cpp index 6d323b35d52..b0cf1ff9ca9 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 - constructor //------------------------------------------------- -mc6852_device::mc6852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +mc6852_device::mc6852_device(const machine_config &mconfig, const char *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().c_str()); + if (LOG) logerror("MC6852 '%s' Receiver Reset\n", tag()); 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().c_str()); + if (LOG) logerror("MC6852 '%s' Transmitter Reset\n", tag()); m_status &= ~(S_TUF | S_CTS | S_TDRA); } if (LOG) { - 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()); + 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()); } m_cr[0] = data; diff --git a/src/devices/machine/mc6852.h b/src/devices/machine/mc6852.h index 6d18bdd68d2..68cd76f6126 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, std::string tag, device_t *owner, UINT32 clock); + mc6852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_rx_clock(device_t &device, int clock) { downcast(device).m_rx_clock = clock; } static void set_tx_clock(device_t &device, int clock) { downcast(device).m_tx_clock = clock; } diff --git a/src/devices/machine/mc6854.cpp b/src/devices/machine/mc6854.cpp index d14a5e666c8..3461d58dde5 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc6854_device::mc6854_device(const machine_config &mconfig, const char *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 64f083addc5..9c665d0429b 100644 --- a/src/devices/machine/mc6854.h +++ b/src/devices/machine/mc6854.h @@ -41,7 +41,7 @@ typedef device_delegate mc6854_out_frame_delegat class mc6854_device : public device_t { public: - mc6854_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mc6854_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mc6854_device() {} template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(device).m_out_irq_cb.set_callback(object); } diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp index eee90e35867..00b38347285 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, std::string tag, device_t *owner, UINT32 clock) +mc68681_device::mc68681_device(const machine_config &mconfig, const char *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().c_str(), offset, duart68681_reg_read_names[offset] )); + LOG(( "Reading 68681 (%s) reg %x (%s) ", tag(), 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().c_str(), offset, duart68681_reg_write_names[offset], data )); + LOG(( "Writing 68681 (%s) reg %x (%s) with %04x\n", tag(), 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().c_str(), data); + logerror( "68681 (%s): Unhandled OPCR value: %02x\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) +mc68681_channel::mc68681_channel(const machine_config &mconfig, const char *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().c_str(), m_ch); +// printf("%s ch %d rcv complete\n", tag(), 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().c_str(), m_ch); +// printf("%s ch %d Tx complete\n", tag(), 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().c_str(), m_ch, bit); +// printf("%s ch %d transmit %d\n", tag(), 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().c_str(), m_ch, data, tx_baud_rate, rx_baud_rate); +// printf("%s ch %d CSR %02x Tx baud %d Rx baud %d\n", tag(), 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().c_str(), 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(), 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().c_str(), m_ch, data); +// printf("%s ch %d Tx %02x\n", tag(), 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 2d55d4a8585..abae110dbac 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, std::string tag, device_t *owner, UINT32 clock); + mc68681_channel(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mc68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_chanA; required_device m_chanB; diff --git a/src/devices/machine/mc68901.cpp b/src/devices/machine/mc68901.cpp index 975bd26dfb2..4d35d2a2c44 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().c_str(), bit); + if (LOG) logerror("MC68901 '%s' Edge Transition Detected on GPIO%u\n", tag(), 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().c_str(), bit); + if (LOG) logerror("MC68901 '%s' Interrupt Pending for GPIO%u\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) +mc68901_device::mc68901_device(const machine_config &mconfig, const char *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().c_str(), data); + if (LOG) logerror("MC68901 '%s' General Purpose I/O : %x\n", tag(), data); m_gpip = data; gpio_output(); break; case REGISTER_AER: - if (LOG) logerror("MC68901 '%s' Active Edge Register : %x\n", tag().c_str(), data); + if (LOG) logerror("MC68901 '%s' Active Edge Register : %x\n", tag(), data); m_aer = data; break; case REGISTER_DDR: - if (LOG) logerror("MC68901 '%s' Data Direction Register : %x\n", tag().c_str(), data); + if (LOG) logerror("MC68901 '%s' Data Direction Register : %x\n", tag(), data); m_ddr = data; gpio_output(); break; case REGISTER_IERA: - if (LOG) logerror("MC68901 '%s' Interrupt Enable Register A : %x\n", tag().c_str(), data); + if (LOG) logerror("MC68901 '%s' Interrupt Enable Register A : %x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC68901 '%s' Interrupt Enable Register B : %x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC68901 '%s' Interrupt Pending Register A : %x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC68901 '%s' Interrupt Pending Register B : %x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register A : %x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register B : %x\n", tag(), data); m_isr &= (m_isr & 0xff00) | data; break; case REGISTER_IMRA: - if (LOG) logerror("MC68901 '%s' Interrupt Mask Register A : %x\n", tag().c_str(), data); + if (LOG) logerror("MC68901 '%s' Interrupt Mask Register A : %x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC68901 '%s' Interrupt Mask Register B : %x\n", tag(), 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().c_str(), data & 0xf0); + if (LOG) logerror("MC68901 '%s' Interrupt Vector : %x\n", tag(), data & 0xf0); m_vr = data & 0xf8; if (m_vr & VR_S) { - if (LOG) logerror("MC68901 '%s' Software End-Of-Interrupt Mode\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Software End-Of-Interrupt Mode\n", tag()); } else { - if (LOG) logerror("MC68901 '%s' Automatic End-Of-Interrupt Mode\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Automatic End-Of-Interrupt Mode\n", tag()); 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().c_str()); + if (LOG) logerror("MC68901 '%s' Timer A Stopped\n", tag()); 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().c_str(), divisor); + if (LOG) logerror("MC68901 '%s' Timer A Delay Mode : %u Prescale\n", tag(), 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().c_str()); + if (LOG) logerror("MC68901 '%s' Timer A Event Count Mode\n", tag()); 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().c_str(), divisor); + if (LOG) logerror("MC68901 '%s' Timer A Pulse Width Mode : %u Prescale\n", tag(), 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().c_str()); + if (LOG) logerror("MC68901 '%s' Timer A Reset\n", tag()); 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().c_str()); + if (LOG) logerror("MC68901 '%s' Timer B Stopped\n", tag()); 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().c_str(), divisor); + if (LOG) logerror("MC68901 '%s' Timer B Delay Mode : %u Prescale\n", tag(), 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().c_str()); + if (LOG) logerror("MC68901 '%s' Timer B Event Count Mode\n", tag()); 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().c_str(), DIVISOR); + if (LOG) logerror("MC68901 '%s' Timer B Pulse Width Mode : %u Prescale\n", tag(), 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().c_str()); + if (LOG) logerror("MC68901 '%s' Timer B Reset\n", tag()); 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().c_str()); + if (LOG) logerror("MC68901 '%s' Timer D Stopped\n", tag()); 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().c_str(), divisor); + if (LOG) logerror("MC68901 '%s' Timer D Delay Mode : %u Prescale\n", tag(), 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().c_str()); + if (LOG) logerror("MC68901 '%s' Timer C Stopped\n", tag()); 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().c_str(), divisor); + if (LOG) logerror("MC68901 '%s' Timer C Delay Mode : %u Prescale\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC68901 '%s' Timer A Data Register : %x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC68901 '%s' Timer B Data Register : %x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC68901 '%s' Timer C Data Register : %x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC68901 '%s' Timer D Data Register : %x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MC68901 '%s' Sync Character : %x\n", tag(), 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().c_str()); + if (LOG) logerror("MC68901 '%s' Parity : Even\n", tag()); parity = PARITY_EVEN; } else { - if (LOG) logerror("MC68901 '%s' Parity : Odd\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Parity : Odd\n", tag()); parity = PARITY_ODD; } } else { - if (LOG) logerror("MC68901 '%s' Parity : Disabled\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Parity : Disabled\n", tag()); parity = PARITY_NONE; } - if (LOG) logerror("MC68901 '%s' Word Length : %u bits\n", tag().c_str(), data_bit_count); + if (LOG) logerror("MC68901 '%s' Word Length : %u bits\n", tag(), 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().c_str()); + if (LOG) logerror("MC68901 '%s' Start Bits : 0, Stop Bits : 0, Format : synchronous\n", tag()); 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().c_str()); + if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1, Format : asynchronous\n", tag()); 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().c_str()); + if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1.5, Format : asynchronous\n", tag()); 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().c_str()); + if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 2, Format : asynchronous\n", tag()); break; } if (data & UCR_CLOCK_DIVIDE_16) { - if (LOG) logerror("MC68901 '%s' Rx/Tx Clock Divisor : 16\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Rx/Tx Clock Divisor : 16\n", tag()); } else { - if (LOG) logerror("MC68901 '%s' Rx/Tx Clock Divisor : 1\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Rx/Tx Clock Divisor : 1\n", tag()); } 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().c_str()); + if (LOG) logerror("MC68901 '%s' Receiver Disabled\n", tag()); m_rsr = 0; } else { - if (LOG) logerror("MC68901 '%s' Receiver Enabled\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Receiver Enabled\n", tag()); if (data & RSR_SYNC_STRIP_ENABLE) { - if (LOG) logerror("MC68901 '%s' Sync Strip Enabled\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Sync Strip Enabled\n", tag()); } else { - if (LOG) logerror("MC68901 '%s' Sync Strip Disabled\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Sync Strip Disabled\n", tag()); } if (data & RSR_FOUND_SEARCH) - if (LOG) logerror("MC68901 '%s' Receiver Search Mode Enabled\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Receiver Search Mode Enabled\n", tag()); 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().c_str()); + if (LOG) logerror("MC68901 '%s' Transmitter Disabled\n", tag()); 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().c_str()); + if (LOG) logerror("MC68901 '%s' Transmitter Enabled\n", tag()); switch (data & 0x06) { case TSR_OUTPUT_HI_Z: - if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : Hi-Z\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : Hi-Z\n", tag()); break; case TSR_OUTPUT_LOW: - if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : 0\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : 0\n", tag()); break; case TSR_OUTPUT_HIGH: - if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : 1\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : 1\n", tag()); break; case TSR_OUTPUT_LOOP: - if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : Loop\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : Loop\n", tag()); break; } if (data & TSR_BREAK) { - if (LOG) logerror("MC68901 '%s' Transmitter Break Enabled\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Transmitter Break Enabled\n", tag()); } else { - if (LOG) logerror("MC68901 '%s' Transmitter Break Disabled\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Transmitter Break Disabled\n", tag()); } if (data & TSR_AUTO_TURNAROUND) { - if (LOG) logerror("MC68901 '%s' Transmitter Auto Turnaround Enabled\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Transmitter Auto Turnaround Enabled\n", tag()); } else { - if (LOG) logerror("MC68901 '%s' Transmitter Auto Turnaround Disabled\n", tag().c_str()); + if (LOG) logerror("MC68901 '%s' Transmitter Auto Turnaround Disabled\n", tag()); } 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().c_str(), data); + if (LOG) logerror("MC68901 '%s' UDR %x\n", tag(), 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 5177c98b38e..9bbe8ee2280 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, std::string tag, device_t *owner, UINT32 clock); + mc68901_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_timer_clock(device_t &device, int timer_clock) { downcast(device).m_timer_clock = timer_clock; } static void set_rx_clock(device_t &device, int rx_clock) { downcast(device).m_rx_clock = rx_clock; } diff --git a/src/devices/machine/mccs1850.cpp b/src/devices/machine/mccs1850.cpp index ce10db52af1..72fb12a667a 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().c_str(), offset); + logerror("MCCS1850 '%s' Unsupported read from test register %02x!\n", tag(), 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().c_str(), (data & CONTROL_STR_STP) ? "Start" : "Stop"); + if (LOG) logerror("MCCS1850 '%s' Counter %s\n", tag(), (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().c_str()); + if (LOG) logerror("MCCS1850 '%s' Power Down\n", tag()); set_pse_line(false); } if (data & CONTROL_AR) { - if (LOG) logerror("MCCS1850 '%s' Auto Restart\n", tag().c_str()); + if (LOG) logerror("MCCS1850 '%s' Auto Restart\n", tag()); } if (data & CONTROL_AC) { - if (LOG) logerror("MCCS1850 '%s' Alarm Clear\n", tag().c_str()); + if (LOG) logerror("MCCS1850 '%s' Alarm Clear\n", tag()); m_ram[REGISTER_STATUS] &= ~STATUS_AI; } if (data & CONTROL_FTUC) { - if (LOG) logerror("MCCS1850 '%s' First Time Up Clear\n", tag().c_str()); + if (LOG) logerror("MCCS1850 '%s' First Time Up Clear\n", tag()); m_ram[REGISTER_STATUS] &= ~STATUS_FTU; } if (data & CONTROL_RPCD) { - if (LOG) logerror("MCCS1850 '%s' Request to Power Down Clear\n", tag().c_str()); + if (LOG) logerror("MCCS1850 '%s' Request to Power Down Clear\n", tag()); 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().c_str(), offset); + logerror("MCCS1850 '%s' Unsupported write to test register %02x!\n", tag(), offset); break; default: @@ -279,7 +279,7 @@ inline void mccs1850_device::advance_seconds() // mccs1850_device - constructor //------------------------------------------------- -mccs1850_device::mccs1850_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +mccs1850_device::mccs1850_device(const machine_config &mconfig, const char *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().c_str(), BIT(m_address, 7) ? "Write" : "Read", m_address & 0x7f); + if (LOG) logerror("MCCS1850 '%s' %s Address %02x\n", tag(), 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().c_str(), m_shift); + if (LOG) logerror("MCCS1850 '%s' Data Out %02x\n", tag(), 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().c_str(), m_shift); + if (LOG) logerror("MCCS1850 '%s' Data In %02x\n", tag(), 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().c_str(), m_shift); + if (LOG) logerror("MCCS1850 '%s' Data Out %02x\n", tag(), 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().c_str()); + if (LOG) logerror("MCCS1850 '%s' Test Mode\n", tag()); m_ram[REGISTER_STATUS] |= STATUS_TM; } else { - if (LOG) logerror("MCCS1850 '%s' Normal Operation\n", tag().c_str()); + if (LOG) logerror("MCCS1850 '%s' Normal Operation\n", tag()); m_ram[REGISTER_STATUS] &= ~STATUS_TM; } diff --git a/src/devices/machine/mccs1850.h b/src/devices/machine/mccs1850.h index 5ed6dde0b35..e4179c47e82 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, std::string tag, device_t *owner, UINT32 clock); + mccs1850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast(device).int_cb.set_callback(object); } template static devcb_base &set_pse_wr_callback(device_t &device, _Object object) { return downcast(device).pse_cb.set_callback(object); } diff --git a/src/devices/machine/mcf5206e.cpp b/src/devices/machine/mcf5206e.cpp index b2e50350ae5..cdc1a9b6477 100644 --- a/src/devices/machine/mcf5206e.cpp +++ b/src/devices/machine/mcf5206e.cpp @@ -828,7 +828,7 @@ const device_type MCF5206E_PERIPHERAL = &device_creator; -microtouch_device::microtouch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +microtouch_device::microtouch_device(const machine_config &mconfig, const char *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 05dc708bbb9..4ee60abede7 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, std::string tag, device_t *owner, UINT32 clock); + microtouch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &static_set_stx_callback(device_t &device, _Object object) { return downcast(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 59789ef6a7e..ed66df7603f 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, std::string tag, device_t *owner, UINT32 clock) +mm58167_device::mm58167_device(const machine_config &mconfig, const char *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 5dfbb5a4f46..c1a7e0b320e 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, std::string tag, device_t *owner, UINT32 clock); + mm58167_device(const machine_config &mconfig, const char *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 bc3b2f3fa4e..0690f775b5d 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mm58274c_device::mm58274c_device(const machine_config &mconfig, const char *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 50b6f8b723b..f92a795c6db 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, std::string tag, device_t *owner, UINT32 clock); + mm58274c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mm58274c_device() {} static void set_mode24(device_t &device, int mode) { downcast(device).m_mode24 = mode; } diff --git a/src/devices/machine/mm74c922.cpp b/src/devices/machine/mm74c922.cpp index 670cebd364e..c822c783b33 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 - constructor //------------------------------------------------- -mm74c922_device::mm74c922_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +mm74c922_device::mm74c922_device(const machine_config &mconfig, const char *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().c_str(), m_data); + if (LOG) logerror("MM74C922 '%s' Data Read: %02x\n", tag(), 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().c_str(), m_da); + if (LOG) logerror("MM74C922 '%s' Data Available: %u\n", tag(), 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().c_str()); + if (LOG) logerror("MM74C922 '%s' Key Released\n", tag()); } } 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().c_str(), m_x, y, m_data); + if (LOG) logerror("MM74C922 '%s' Key Depressed: X %u Y %u = %02x\n", tag(), m_x, y, m_data); return; } } diff --git a/src/devices/machine/mm74c922.h b/src/devices/machine/mm74c922.h index f845d54482c..4cca5f6e9c3 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, std::string tag, device_t *owner, UINT32 clock); + mm74c922_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_cap_osc(device_t &device, double value) { downcast(device).m_cap_osc = value; } static void static_set_cap_debounce(device_t &device, double value) { downcast(device).m_cap_debounce = value; } diff --git a/src/devices/machine/mos6526.cpp b/src/devices/machine/mos6526.cpp index 79962b1e5b0..317c6b8555d 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +mos6526_device::mos6526_device(const machine_config &mconfig, const char *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, std::string tag, d m_write_pb(*this) { } -mos6526a_device::mos6526a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos6526a_device::mos6526a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mos8520_device::mos8520_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mos5710_device::mos5710_device(const machine_config &mconfig, const char *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 b2dfb5b097e..99bfab3abc3 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, 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); + 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); static void static_set_tod_clock(device_t &device, int clock) { downcast(device).m_tod_clock = clock; } @@ -254,7 +254,7 @@ protected: class mos6526a_device : public mos6526_device { public: - mos6526a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mos6526a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; @@ -263,7 +263,7 @@ public: class mos8520_device : public mos6526_device { public: - mos8520_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mos8520_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mos5710_device(const machine_config &mconfig, const char *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 17c64912de3..ebae2ca6f5a 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 - constructor //------------------------------------------------- -mos6529_device::mos6529_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos6529_device::mos6529_device(const machine_config &mconfig, const char *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 e27c9838cd4..fe9f8a3e063 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, std::string tag, device_t *owner, UINT32 clock); + mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_p0_handler(device_t &device, _Object object) { return downcast(device).m_p0_handler.set_callback(object); } template static devcb_base &set_p1_handler(device_t &device, _Object object) { return downcast(device).m_p1_handler.set_callback(object); } diff --git a/src/devices/machine/mos6530.cpp b/src/devices/machine/mos6530.cpp index cec08a5519f..46979b078f0 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos6530_device::mos6530_device(const machine_config &mconfig, const char *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 a59ca486992..c60ff759a1b 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, std::string tag, device_t *owner, UINT32 clock); + mos6530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mos6530_device() {} template static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast(device).m_in_pa_cb.set_callback(object); } diff --git a/src/devices/machine/mos6530n.cpp b/src/devices/machine/mos6530n.cpp index 96c714c5092..31c15c65e1d 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, std::string 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, 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_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, std::string tag, device_t *owner, UINT32 clock) +mos6530_t::mos6530_t(const machine_config &mconfig, const char *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, std::string tag, device_t *o // mos6532_t - constructor //------------------------------------------------- -mos6532_t::mos6532_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos6532_t::mos6532_t(const machine_config &mconfig, const char *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().c_str()); + if (LOG) logerror("%s %s '%s' edge-detect IRQ\n", machine().time().as_string(), name(), tag()); 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), data); + if (LOG) logerror("%s %s %s '%s' Port A Data In %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), 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().c_str(), data); + if (LOG) logerror("%s %s %s '%s' Port A Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), 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().c_str(), data); + if (LOG) logerror("%s %s %s '%s' Port A DDR %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), 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().c_str(), data); + if (LOG) logerror("%s %s %s '%s' Port B Data In %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), 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().c_str(), data); + if (LOG) logerror("%s %s %s '%s' Port B Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), 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().c_str(), data); + if (LOG) logerror("%s %s %s '%s' Port B DDR %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), 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(), 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().c_str(), cur_live.value); + if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name(), tag(), 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().c_str(), cur_live.value); + if (LOG_TIMER) logerror("%s %s '%s' timer %02x interrupt\n", cur_live.tm.as_string(), name(), tag(), 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().c_str(), cur_live.value); + if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name(), tag(), 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 ded6479d475..71688040e89 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } template static devcb_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + mos6530_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mos6532_t(const machine_config &mconfig, const char *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 997903ba687..24901ee67e0 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +mos6551_device::mos6551_device(const machine_config &mconfig, const char *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().c_str()); + if (LOG) logerror("MOS6551 '%s': RX START BIT\n", tag()); } 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().c_str()); + if (LOG) logerror("MOS6551 '%s': RX FALSE START BIT\n", tag()); } } 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().c_str(), m_rx_bits, m_rxd); + if (LOG) logerror("MOS6551 '%s': RX DATA BIT %d %d\n", tag(), m_rx_bits, m_rxd); } else { - if (LOG) logerror("MOS6551 '%s': RX PARITY BIT %x\n", tag().c_str(), m_rxd); + if (LOG) logerror("MOS6551 '%s': RX PARITY BIT %x\n", tag(), 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().c_str()); + if (LOG) logerror("MOS6551 '%s': RX STOP BIT\n", tag()); 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().c_str(), m_tdr); + if (LOG) logerror("MOS6551 '%s': TX DATA %x\n", tag(), m_tdr); m_tx_output = OUTPUT_TXD; - if (LOG) logerror("MOS6551 '%s': TX START BIT\n", tag().c_str()); + if (LOG) logerror("MOS6551 '%s': TX START BIT\n", tag()); 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().c_str()); + if (LOG) logerror("MOS6551 '%s': TX BREAK START\n", tag()); } 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().c_str(), m_tx_bits, m_txd); + if (LOG) logerror("MOS6551 '%s': TX DATA BIT %d %d\n", tag(), 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().c_str(), m_txd); + if (LOG) logerror("MOS6551 '%s': TX PARITY BIT %d\n", tag(), 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().c_str()); + if (LOG) logerror("MOS6551 '%s': TX STOP BIT\n", tag()); } } } @@ -806,7 +806,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock) { if (!m_brk) { - if (LOG) logerror("MOS6551 '%s': TX BREAK END\n", tag().c_str()); + if (LOG) logerror("MOS6551 '%s': TX BREAK END\n", tag()); m_tx_counter = 0; m_tx_state = STATE_STOP; diff --git a/src/devices/machine/mos6551.h b/src/devices/machine/mos6551.h index 8049e6affc7..9567ccc02a4 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, std::string tag, device_t *owner, UINT32 clock); + mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_xtal(device_t &device, UINT32 xtal) { downcast(device).set_xtal(xtal); } template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/machine/mos6702.cpp b/src/devices/machine/mos6702.cpp index 1814dceb933..9dc11e24af9 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 - constructor //------------------------------------------------- -mos6702_device::mos6702_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos6702_device::mos6702_device(const machine_config &mconfig, const char *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 511a49dbf23..191bff45bcc 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, std::string tag, device_t *owner, UINT32 clock); + mos6702_device(const machine_config &mconfig, const char *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 268a4db53ed..ca07506423b 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 - constructor //------------------------------------------------- -mos8706_device::mos8706_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos8706_device::mos8706_device(const machine_config &mconfig, const char *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 1a225d57792..2fd710e1337 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, std::string tag, device_t *owner, UINT32 clock); + mos8706_device(const machine_config &mconfig, const char *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 7a77aaf17ee..214a52faa21 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, std::string tag, device_t *owner, UINT32 clock) : +mos8722_device::mos8722_device(const machine_config &mconfig, const char *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().c_str(), offset & 0x0f, data); + if (LOG) logerror("MOS8722 '%s' Write %01x : %02x\n", tag(), 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().c_str(), offset & 0x0f, data); + if (LOG) logerror("MOS8722 '%s' Write %01x : %02x\n", tag(), offset & 0x0f, data); switch (offset & 0x0f) { diff --git a/src/devices/machine/mos8722.h b/src/devices/machine/mos8722.h index d3fd9de1245..5cbe9681da3 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, std::string tag, device_t *owner, UINT32 clock); + mos8722_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_z80en_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_z80en.set_callback(object); } template static devcb_base &set_fsdir_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_fsdir.set_callback(object); } diff --git a/src/devices/machine/mos8726.cpp b/src/devices/machine/mos8726.cpp index bcee7f60b87..eca6ada5187 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 - constructor //------------------------------------------------- -mos8726_device::mos8726_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos8726_device::mos8726_device(const machine_config &mconfig, const char *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 106bb0d2df8..8edc5e001d9 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, std::string tag, device_t *owner, UINT32 clock); + mos8726_device(const machine_config &mconfig, const char *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 d0633713264..98e4bb90b76 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, std::string tag, device_t *owner, UINT32 clock) : +mpu401_device::mpu401_device(const machine_config &mconfig, const char *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 244968905d3..4d3b8347eda 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, std::string tag, device_t *owner, UINT32 clock); + mpu401_device(const machine_config &mconfig, const char *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 43bb7b8d299..21fdeb3ba63 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, std::string tag, device_t *owner, UINT32 clock) +msm5832_device::msm5832_device(const machine_config &mconfig, const char *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().c_str(), m_address, data & 0x0f); + if (LOG) logerror("MSM5832 '%s' Register Read %01x: %01x\n", tag(), 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().c_str(), m_address, data & 0x0f); + if (LOG) logerror("MSM5832 '%s' Register Write %01x: %01x\n", tag(), 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().c_str(), data & 0x0f); + if (LOG) logerror("MSM5832 '%s' Address: %01x\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM5832 '%s' 30 ADJ: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM5832 '%s' TEST: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM5832 '%s' HOLD: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM5832 '%s' READ: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM5832 '%s' WR: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM5832 '%s' CS: %u\n", tag(), state); m_cs = state; } diff --git a/src/devices/machine/msm5832.h b/src/devices/machine/msm5832.h index 5d114ecbd7e..a437501f23b 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, std::string tag, device_t *owner, UINT32 clock); + msm5832_device(const machine_config &mconfig, const char *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 ddfc2631f68..7bdd77713ea 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, std::string tag, device_t *owner, UINT32 clock) +msm58321_device::msm58321_device(const machine_config &mconfig, const char *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().c_str(), reg_name(m_address), m_address, data & 0x0f); + if (LOG) logerror("MSM58321 '%s' Register Read %s (%01x): %01x\n", tag(), 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().c_str(), data); + if (LOG) logerror("MSM58321 '%s' Latch Address %01x\n", tag(), 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().c_str()); + if (LOG) logerror("MSM58321 '%s' Reset\n", tag()); 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().c_str()); + if (LOG) logerror("MSM58321 '%s' Reference Signal\n", tag()); break; default: - if (LOG) logerror("MSM58321 '%s' Register Write %s (%01x): %01x\n", tag().c_str(), reg_name(m_address), m_address, data); + if (LOG) logerror("MSM58321 '%s' Register Write %s (%01x): %01x\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM58321 '%s' CS2: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM58321 '%s' WRITE: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM58321 '%s' READ: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM58321 '%s' ADDRESS WRITE: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM58321 '%s' STOP: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM58321 '%s' TEST: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("MSM58321 '%s' CS1: %u\n", tag(), state); m_cs1 = state; diff --git a/src/devices/machine/msm58321.h b/src/devices/machine/msm58321.h index 8d872177827..04d174eedc2 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, std::string tag, device_t *owner, UINT32 clock); + msm58321_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_d0_handler(device_t &device, _Object object) { return downcast(device).m_d0_handler.set_callback(object); } diff --git a/src/devices/machine/msm6242.cpp b/src/devices/machine/msm6242.cpp index 0b25db4785b..a4a188cbcb6 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 - constructor //------------------------------------------------- -msm6242_device::msm6242_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msm6242_device::msm6242_device(const machine_config &mconfig, const char *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 763057d2e5b..f53e4b60f01 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, std::string tag, device_t *owner, UINT32 clock); + msm6242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_int_handler(device_t &device, _Object object) { return downcast(device).m_out_int_handler.set_callback(object); } diff --git a/src/devices/machine/ncr5380.cpp b/src/devices/machine/ncr5380.cpp index eff2e777a60..fe62190d40f 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 - constructor/destructor //------------------------------------------------- -ncr5380_device::ncr5380_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +ncr5380_device::ncr5380_device(const machine_config &mconfig, const char *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 24ba21e9bb3..77e8adc58b0 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, std::string tag, device_t *owner, UINT32 clock); + ncr5380_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } diff --git a/src/devices/machine/ncr5380n.cpp b/src/devices/machine/ncr5380n.cpp index 12daf539960..cffe173d73c 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, std::string tag, device_t *owner, UINT32 clock) +ncr5380n_device::ncr5380n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nscsi_device(mconfig, NCR5380N, "5380 SCSI (new)", tag, owner, clock, "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().c_str()); + logerror("%s: scsi bus reset\n", tag()); return; } @@ -148,7 +148,7 @@ void ncr5380n_device::step(bool timeout) if(0) printf("%s: state=%d.%d %s\n", - tag().c_str(), state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT, + tag(), 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().c_str(), + tag(), 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().c_str(), m_outdata); +// printf("%s: driving data bus with %02x\n", tag(), 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().c_str(), newdata); +// printf("%s: changing control lines %04x\n", tag(), 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().c_str(), data, space.device().safe_pc()); +// printf("%s: mode_w %02x (%08x)\n", tag(), 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().c_str(), m_tcommand, space.device().safe_pc()); +// logerror("%s: command_r %02x (%08x)\n", tag(), m_tcommand, space.device().safe_pc()); return m_tcommand; } WRITE8_MEMBER(ncr5380n_device::command_w) { -// printf("%s: command_w %02x (%08x)\n", tag().c_str(), data, space.device().safe_pc()); +// printf("%s: command_w %02x (%08x)\n", tag(), 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().c_str(), res, space.device().safe_pc()); +// printf("%s: status_r %02x (%08x)\n", tag(), 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().c_str(), res, space.device().safe_pc()); +// printf("%s: busandstatus_r %02x (%08x)\n", tag(), res, space.device().safe_pc()); return res; } diff --git a/src/devices/machine/ncr5380n.h b/src/devices/machine/ncr5380n.h index 4a54d170783..444ef1af32d 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, std::string tag, device_t *owner, UINT32 clock); + ncr5380n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/machine/ncr5390.cpp b/src/devices/machine/ncr5390.cpp index d84a57733d3..9de72de9afe 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, std::string tag, device_t *owner, UINT32 clock) +ncr5390_device::ncr5390_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nscsi_device(mconfig, NCR5390, "5390 SCSI", tag, owner, clock, "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().c_str()); + logerror("%s: scsi bus reset\n", tag()); return; } @@ -125,7 +125,7 @@ void ncr5390_device::step(bool timeout) if(0) logerror("%s: state=%d.%d %s\n", - tag().c_str(), state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT, + tag(), 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().c_str()); + logerror("%s: mode switch to Target\n", tag()); mode = MODE_T; } else { - logerror("%s: mode switch to Initiator\n", tag().c_str()); + logerror("%s: mode switch to Initiator\n", tag()); 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().c_str()); + logerror("%s: select timeout\n", tag()); 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().c_str(), scsi_bus->ctrl_r() & S_PHASE_MASK); + logerror("%s: xfer on phase %d\n", tag(), 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().c_str(), + tag(), 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().c_str(), tcount & 0xff, space.device().safe_pc()); + logerror("%s: tcount_lo_r %02x (%08x)\n", tag(), 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().c_str(), data, space.device().safe_pc()); + logerror("%s: tcount_lo_w %02x (%08x)\n", tag(), data, space.device().safe_pc()); } READ8_MEMBER(ncr5390_device::tcount_hi_r) { - logerror("%s: tcount_hi_r %02x (%08x)\n", tag().c_str(), tcount >> 8, space.device().safe_pc()); + logerror("%s: tcount_hi_r %02x (%08x)\n", tag(), 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().c_str(), data, space.device().safe_pc()); + logerror("%s: tcount_hi_w %02x (%08x)\n", tag(), 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().c_str(), space.device().safe_pc()); + logerror("%s: command_r (%08x)\n", tag(), space.device().safe_pc()); return command[0]; } WRITE8_MEMBER(ncr5390_device::command_w) { - // logerror("%s: command_w %02x (%08x)\n", tag().c_str(), data, space.device().safe_pc()); + // logerror("%s: command_w %02x (%08x)\n", tag(), 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().c_str(), command[0]); + logerror("%s: invalid command %02x\n", tag(), 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_str(), c); + logerror("%s: start unimplemented command %02x\n", tag(), 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().c_str(), res, space.device().safe_pc()); + logerror("%s: status_r %02x (%08x)\n", tag(), 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().c_str(), bus_id); + logerror("%s: bus_id=%d\n", tag(), 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().c_str(), res, space.device().safe_pc()); + logerror("%s: istatus_r %02x (%08x)\n", tag(), 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().c_str(), seq, space.device().safe_pc()); + logerror("%s: seq_step_r %d (%08x)\n", tag(), seq, space.device().safe_pc()); return seq; } diff --git a/src/devices/machine/ncr5390.h b/src/devices/machine/ncr5390.h index 4020cee1369..7dfac6f5681 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, std::string tag, device_t *owner, UINT32 clock); + ncr5390_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/machine/ncr539x.cpp b/src/devices/machine/ncr539x.cpp index 23ded806b3a..3d0a83b5246 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 - constructor/destructor //------------------------------------------------- -ncr539x_device::ncr539x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +ncr539x_device::ncr539x_device(const machine_config &mconfig, const char *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 42d89a65abb..95b3655228d 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, std::string tag, device_t *owner, UINT32 clock); + ncr539x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast(device).m_out_irq_cb.set_callback(object); } template static devcb_base &set_out_drq_callback(device_t &device, _Object object) { return downcast(device).m_out_drq_cb.set_callback(object); } diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index 2c714d0d0e6..1b8c76743bc 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, std::string tag, device_t *owner, UINT32 clock) +netlist_mame_analog_input_t::netlist_mame_analog_input_t(const machine_config &mconfig, const char *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().c_str())); + LOG_DEV_CALLS(("start %s\n", tag())); netlist::param_t *p = this->nl_owner().setup().find_param(m_param_name); m_param = dynamic_cast(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, std::string tag, device_t *owner, UINT32 clock) +netlist_mame_analog_output_t::netlist_mame_analog_output_t(const machine_config &mconfig, const char *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().c_str())); + LOG_DEV_CALLS(("start %s\n", tag())); } @@ -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, std::string tag, device_t *owner, UINT32 clock) +netlist_mame_logic_input_t::netlist_mame_logic_input_t(const machine_config &mconfig, const char *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().c_str())); + LOG_DEV_CALLS(("start %s\n", tag())); netlist::param_t *p = downcast(this->owner())->setup().find_param(m_param_name); m_param = dynamic_cast(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, std::string tag, device_t *owner, UINT32 clock) +netlist_mame_stream_input_t::netlist_mame_stream_input_t(const machine_config &mconfig, const char *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().c_str())); + LOG_DEV_CALLS(("start %s\n", tag())); } 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, std::string tag, device_t *owner, UINT32 clock) +netlist_mame_stream_output_t::netlist_mame_stream_output_t(const machine_config &mconfig, const char *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().c_str())); + LOG_DEV_CALLS(("start %s\n", tag())); } 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, std::string tag, device_t *owner, UINT32 clock) +netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, const char *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, std: { } -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) +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) : 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().c_str())); + LOG_DEV_CALLS(("device_start %s\n", tag())); //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, std::string tag, device_t *owner, UINT32 clock) +netlist_mame_cpu_device_t::netlist_mame_cpu_device_t(const machine_config &mconfig, const char *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().c_str())); + LOG_DEV_CALLS(("cpu device_start %s\n", tag())); // 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, std::string tag, device_t *owner, UINT32 clock) +netlist_mame_sound_device_t::netlist_mame_sound_device_t(const machine_config &mconfig, const char *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().c_str())); + LOG_DEV_CALLS(("sound device_start %s\n", tag())); // Configure outputs diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h index af3c0a1cdae..961bb7a26ea 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + netlist_mame_cpu_device_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + netlist_mame_sound_device_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + netlist_mame_analog_input_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + netlist_mame_analog_output_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + netlist_mame_logic_input_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + netlist_mame_stream_input_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + netlist_mame_stream_output_t(const machine_config &mconfig, const char *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 e980f748104..0b23eda21d7 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, std::string tag, device_t *owner, UINT32 clock) +nmc9306_device::nmc9306_device(const machine_config &mconfig, const char *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().c_str(), m_di); + if (LOG) logerror("NMC9306 '%s' Idle %u\n", tag(), 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().c_str(), m_di); + if (LOG) logerror("NMC9306 '%s' Command Bit %u\n", tag(), 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().c_str(), m_di); + if (LOG) logerror("NMC9306 '%s' Address Bit %u\n", tag(), 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().c_str()); + if (LOG) logerror("NMC9306 '%s' EWDS\n", tag()); m_ewen = false; m_state = STATE_IDLE; break; case WRAL: - if (LOG) logerror("NMC9306 '%s' WRAL\n", tag().c_str()); + if (LOG) logerror("NMC9306 '%s' WRAL\n", tag()); break; case ERAL: - if (LOG) logerror("NMC9306 '%s' ERAL\n", tag().c_str()); + if (LOG) logerror("NMC9306 '%s' ERAL\n", tag()); break; case EWEN: - if (LOG) logerror("NMC9306 '%s' EWEN\n", tag().c_str()); + if (LOG) logerror("NMC9306 '%s' EWEN\n", tag()); 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().c_str(), m_address & 0x0f); + if (LOG) logerror("NMC9306 '%s' WRITE %u\n", tag(), m_address & 0x0f); m_state = STATE_DATA_IN; break; case READ: - if (LOG) logerror("NMC9306 '%s' READ %u\n", tag().c_str(), m_address & 0x0f); + if (LOG) logerror("NMC9306 '%s' READ %u\n", tag(), 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().c_str(), m_address & 0x0f); + if (LOG) logerror("NMC9306 '%s' ERASE %u\n", tag(), 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().c_str(), m_di); + if (LOG) logerror("NMC9306 '%s' Data Bit IN %u\n", tag(), 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().c_str(), m_di); + if (LOG) logerror("NMC9306 '%s' Data Bit OUT %u\n", tag(), 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 81aec67d185..92aba51965b 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, std::string tag, device_t *owner, UINT32 clock); + nmc9306_device(const machine_config &mconfig, const char *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 4ec76576bfd..fb2f3466508 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nsc810_device::nsc810_device(const machine_config &mconfig, const char *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().c_str()); + if(LOG) logerror("NSC810 '%s': Timer 0 output set\n",tag()); } } 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().c_str()); + if(LOG) logerror("NSC810 '%s': Timer 1 output set\n",tag()); } } 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().c_str(),res); + //if(LOG) logerror("NSC810 '%s': Port A data read %02x\n",tag(),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().c_str(),res); + //if(LOG) logerror("NSC810 '%s': Port B data read %02x\n",tag(),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().c_str(),res); + //if(LOG) logerror("NSC810 '%s': Port C data read %02x\n",tag(),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().c_str()); + if(LOG) logerror("NSC810 '%s': Timer 0 output reset\n",tag()); } 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().c_str()); + if(LOG) logerror("NSC810 '%s': Timer 0 output reset\n",tag()); } 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().c_str()); + if(LOG) logerror("NSC810 '%s': Timer 1 output reset\n",tag()); } 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().c_str()); + if(LOG) logerror("NSC810 '%s': Timer 1 output reset\n",tag()); } break; default: - if(LOG) logerror("NSC810 '%s': unused port %02x read\n", tag().c_str(),offset); + if(LOG) logerror("NSC810 '%s': unused port %02x read\n",tag(),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().c_str(),data); + if(LOG) logerror("NSC810 '%s': Port A data write %02x\n",tag(),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().c_str(),data); + if(LOG) logerror("NSC810 '%s': Port B data write %02x\n",tag(),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().c_str(),data); + if(LOG) logerror("NSC810 '%s': Port C data write %02x\n",tag(),data); break; case REG_DDRA: m_ddrA = data; - if(LOG) logerror("NSC810 '%s': Port A direction write %02x\n", tag().c_str(),data); + if(LOG) logerror("NSC810 '%s': Port A direction write %02x\n",tag(),data); break; case REG_DDRB: m_ddrB = data; - if(LOG) logerror("NSC810 '%s': Port B direction write %02x\n", tag().c_str(),data); + if(LOG) logerror("NSC810 '%s': Port B direction write %02x\n",tag(),data); break; case REG_DDRC: m_ddrC = data; - if(LOG) logerror("NSC810 '%s': Port C direction write %02x\n", tag().c_str(),data); + if(LOG) logerror("NSC810 '%s': Port C direction write %02x\n",tag(),data); break; case REG_MODE_DEF: - if(LOG) logerror("NSC810 '%s': Mode Definition write %02x\n", tag().c_str(),data); + if(LOG) logerror("NSC810 '%s': Mode Definition write %02x\n",tag(),data); break; case REG_PORTA_BITCLR: - if(LOG) logerror("NSC810 '%s': Port A bit-clear write %02x\n", tag().c_str(),data); + if(LOG) logerror("NSC810 '%s': Port A bit-clear write %02x\n",tag(),data); break; case REG_PORTB_BITCLR: - if(LOG) logerror("NSC810 '%s': Port B bit-clear write %02x\n", tag().c_str(),data); + if(LOG) logerror("NSC810 '%s': Port B bit-clear write %02x\n",tag(),data); break; case REG_PORTC_BITCLR: - if(LOG) logerror("NSC810 '%s': Port C bit-clear write %02x\n", tag().c_str(),data); + if(LOG) logerror("NSC810 '%s': Port C bit-clear write %02x\n",tag(),data); break; case REG_PORTA_BITSET: - if(LOG) logerror("NSC810 '%s': Port A bit-set write %02x\n", tag().c_str(),data); + if(LOG) logerror("NSC810 '%s': Port A bit-set write %02x\n",tag(),data); break; case REG_PORTB_BITSET: - if(LOG) logerror("NSC810 '%s': Port B bit-set write %02x\n", tag().c_str(),data); + if(LOG) logerror("NSC810 '%s': Port B bit-set write %02x\n",tag(),data); break; case REG_PORTC_BITSET: - if(LOG) logerror("NSC810 '%s': Port C bit-set write %02x\n", tag().c_str(),data); + if(LOG) logerror("NSC810 '%s': Port C bit-set write %02x\n",tag(),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().c_str(),data,m_timer0_base); + if(LOG) logerror("NSC810 '%s': Timer 0 low-byte write %02x (base=%04x)\n",tag(),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().c_str(),data,m_timer0_base); + if(LOG) logerror("NSC810 '%s': Timer 0 high-byte write %02x (base=%04x)\n",tag(),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().c_str(),data,m_timer1_base); + if(LOG) logerror("NSC810 '%s': Timer 1 low-byte write %02x (base=%04x)\n",tag(),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().c_str(),data,m_timer1_base); + if(LOG) logerror("NSC810 '%s': Timer 1 high-byte write %02x (base=%04x)\n",tag(),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().c_str(),data); + if(LOG) logerror("NSC810 '%s': Timer 0 Stop write %02x\n",tag(),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().c_str(),data); + if(LOG) logerror("NSC810 '%s': Timer 0 Start write %02x\n",tag(),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().c_str(),data); + if(LOG) logerror("NSC810 '%s': Timer 1 Stop write %02x\n",tag(),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().c_str(),data); + if(LOG) logerror("NSC810 '%s': Timer 1 Start write %02x\n",tag(),data); break; case REG_MODE_TIMER0: m_timer0_mode = data; - if(LOG) logerror("NSC810 '%s': Timer 0 Mode write %02x\n", tag().c_str(),data); + if(LOG) logerror("NSC810 '%s': Timer 0 Mode write %02x\n",tag(),data); break; case REG_MODE_TIMER1: m_timer1_mode = data; - if(LOG) logerror("NSC810 '%s': Timer 1 Mode write %02x\n", tag().c_str(),data); + if(LOG) logerror("NSC810 '%s': Timer 1 Mode write %02x\n",tag(),data); break; default: - logerror("NSC810 '%s': Unused register %02x write %02x\n", tag().c_str(),offset,data); + logerror("NSC810 '%s': Unused register %02x write %02x\n",tag(),offset,data); } } } diff --git a/src/devices/machine/nsc810.h b/src/devices/machine/nsc810.h index eed1801491a..036b197680d 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, std::string tag, device_t *owner, UINT32 clock); + nsc810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_portA_read_callback(device_t &device, _Object object) { return downcast(device).m_portA_r.set_callback(object); } template static devcb_base &set_portB_read_callback(device_t &device, _Object object) { return downcast(device).m_portB_r.set_callback(object); } diff --git a/src/devices/machine/nscsi_bus.cpp b/src/devices/machine/nscsi_bus.cpp index f753077f631..d0508059758 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; const device_type NSCSI_CONNECTOR = &device_creator; -nscsi_bus_device::nscsi_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nscsi_bus_device::nscsi_bus_device(const machine_config &mconfig, const char *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().c_str(), + tag(), 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, std::string tag, device_t *owner, UINT32 clock) : +nscsi_connector::nscsi_connector(const machine_config &mconfig, const char *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(get_card_device()); } -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) : +nscsi_device::nscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_slot_card_interface(mconfig, *this) { @@ -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, std::string 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, const char *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().c_str()); + logerror("%s: scsi bus reset\n", tag()); return; } if(0) logerror("%s: state=%d.%d %s\n", - tag().c_str(), scsi_state & STATE_MASK, (scsi_state & SUB_MASK) >> SUB_SHIFT, + tag(), 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().c_str()); + logerror("%s: Parity error? Say what?\n", tag()); 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().c_str(), + tag(), 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().c_str()); + throw emu_fatalerror("%s: buf_control overflow\n", tag()); 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().c_str()); + throw emu_fatalerror("%s: buf_control underflow\n", tag()); 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().c_str(), command_names[scsi_cmdbuf[0]]); + logerror("%s: Unhandled command %s", tag(), 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().c_str()); + logerror("%s: command REQUEST SENSE\n", tag()); 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().c_str()); + logerror("%s: Unknown message", tag()); 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 2e70dc02e2c..c0b35af248e 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, std::string tag, device_t *owner, UINT32 clock); + nscsi_bus_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + nscsi_connector(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); void connect_to_bus(nscsi_bus_device *bus, int refid, int default_scsi_id); virtual void scsi_ctrl_changed(); @@ -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, std::string 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, const char *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 f0cf4fbd726..94950098f6a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nscsi_callback_device::nscsi_callback_device(const machine_config &mconfig, const char *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 930cb653160..547f288842b 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, std::string tag, device_t *owner, UINT32 clock); + nscsi_callback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template void set_rst_callback(_line line) { m_write_rst.set_callback(line); } template 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 d0b86e209b9..2cc3dc48ae5 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nscsi_cdrom_device::nscsi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nscsi_full_device(mconfig, NSCSI_CDROM, "SCSI CDROM", tag, owner, clock, "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().c_str()); + logerror("%s: CD READ ERROR !\n", tag()); 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().c_str()); + logerror("%s: command TEST UNIT READY\n", tag()); 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().c_str(), lba, blocks); + tag(), 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().c_str(), + tag(), 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().c_str()); + logerror("%s: command START STOP UNIT\n", tag()); scsi_status_complete(SS_GOOD); break; @@ -134,7 +134,7 @@ void nscsi_cdrom_device::scsi_command() break; } - logerror("%s: command READ CAPACITY\n", tag().c_str()); + logerror("%s: command READ CAPACITY\n", tag()); 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().c_str(), lba, blocks); + tag(), 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().c_str(), + tag(), 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().c_str(), page); + logerror("%s: mode sense page %02x unhandled\n", tag(), page); break; } } diff --git a/src/devices/machine/nscsi_cd.h b/src/devices/machine/nscsi_cd.h index b516d1e0987..a251d1a3e98 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, std::string tag, device_t *owner, UINT32 clock); + nscsi_cdrom_device(const machine_config &mconfig, const char *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 92a77fc939f..d7d3ccb5e5b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nscsi_full_device(mconfig, NSCSI_HARDDISK, "SCSI HARDDISK", tag, owner, clock, "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, std::string 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, const char *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().c_str()); + logerror("%s: HD READ ERROR !\n", tag()); 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().c_str()); + logerror("%s: HD WRITE ERROR !\n", tag()); } } @@ -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().c_str()); + logerror("%s: command TEST UNIT READY\n", tag()); 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().c_str(), lba, blocks); + tag(), 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().c_str(), lba, blocks); + tag(), 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().c_str(), + tag(), 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().c_str(), + tag(), 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().c_str(), page); + logerror("%s: mode sense page %02x unhandled\n", tag(), 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().c_str()); + logerror("%s: command START STOP UNIT\n", tag()); scsi_status_complete(SS_GOOD); break; case SC_READ_CAPACITY: { - logerror("%s: command READ CAPACITY\n", tag().c_str()); + logerror("%s: command READ CAPACITY\n", tag()); 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().c_str(), lba, blocks); + tag(), 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().c_str(), lba, blocks); + tag(), lba, blocks); scsi_data_out(2, blocks*bytes_per_sector); scsi_status_complete(SS_GOOD); break; default: - logerror("%s: command %02x ***UNKNOWN***\n", tag().c_str(), scsi_cmdbuf[0]); + logerror("%s: command %02x ***UNKNOWN***\n", tag(), 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 ef83629c456..2206b3e3a73 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, 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); + 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); 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 84f5ff2ee83..b486b4994e9 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nscsi_s1410_device::nscsi_s1410_device(const machine_config &mconfig, const char *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().c_str()); + logerror("%s: HD WRITE ERROR !\n", tag()); 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().c_str(), scsi_cmdbuf[0]); + logerror("%s: command %02x ***UNKNOWN***\n", tag(), scsi_cmdbuf[0]); break; } } diff --git a/src/devices/machine/nscsi_s1410.h b/src/devices/machine/nscsi_s1410.h index e4d135d9467..446cf18568d 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, std::string tag, device_t *owner, UINT32 clock); + nscsi_s1410_device(const machine_config &mconfig, const char *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 44a809cdb68..d1e99ceb98b 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 - constructor //------------------------------------------------- -nvram_device::nvram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nvram_device::nvram_device(const machine_config &mconfig, const char *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().c_str()); + throw emu_fatalerror("NVRAM device '%s' has no corresponding AM_SHARE region", tag()); 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().c_str(), m_length); + throw emu_fatalerror("NVRAM device '%s' has a default region, but it should be 0x%" SIZETFMT "X bytes", tag(), m_length); } diff --git a/src/devices/machine/nvram.h b/src/devices/machine/nvram.h index 49b24e5ebee..ac6b62e7bca 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, std::string tag, device_t *owner, UINT32 clock); + nvram_device(const machine_config &mconfig, const char *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 03a35a4e290..d72db5a0c45 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : pc_fdc_interface(mconfig, type, name, tag, owner, clock, shortname, source), fdc(*this, "upd765"), 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().c_str(), data); + logerror("%s: dor = %02x\n", tag(), 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().c_str(), data); + logerror("%s: ccr = %02x\n", tag(), 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().c_str(), irq); + logerror("%s: pc_irq = %d\n", tag(), 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, 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_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_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__) +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__) { } diff --git a/src/devices/machine/pc_fdc.h b/src/devices/machine/pc_fdc.h index b6dbb4f6c5c..b94fab2a2ca 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast(device).intrq_cb.set_callback(object); } template static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + pc_fdc_xt_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pc_fdc_at_device(const machine_config &mconfig, const char *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 e87ceade046..f483c7bb336 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pc_lpt_device::pc_lpt_device(const machine_config &mconfig, const char *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().c_str(), offset); + logerror("PC-LPT %s: Read from invalid offset %x\n", tag(), offset); return 0xff; } diff --git a/src/devices/machine/pc_lpt.h b/src/devices/machine/pc_lpt.h index a2b150d67fa..ca2a71f6524 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, std::string tag, device_t *owner, UINT32 clock); + pc_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/machine/pccard.cpp b/src/devices/machine/pccard.cpp index c15ff32a6f9..3284c2c5d45 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pccard_slot_device::pccard_slot_device(const machine_config &mconfig, const char *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 ea24bb063ef..2068406d4b2 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, std::string tag, device_t *owner, UINT32 clock); + pccard_slot_device(const machine_config &mconfig, const char *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 004287cb16b..48e002fdf2d 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 - constructor //------------------------------------------------- -pcf8593_device::pcf8593_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pcf8593_device::pcf8593_device(const machine_config &mconfig, const char *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 a52dfdd0c8c..63b3befe6b9 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, std::string tag, device_t *owner, UINT32 clock); + pcf8593_device(const machine_config &mconfig, const char *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 ee5674fc58f..ce32692c7e6 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +apic_device::apic_device(const machine_config &mconfig, const char *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 b39a853ff71..4da0dc00bd3 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, std::string tag, device_t *owner, UINT32 clock); + apic_device(const machine_config &mconfig, const char *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 0785cf77730..65cc090848b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sata_device::sata_device(const machine_config &mconfig, const char *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 fc696e9b6ab..7075b49bb58 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, std::string tag, device_t *owner, UINT32 clock); + sata_device(const machine_config &mconfig, const char *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 89953d11587..13d4d491570 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, std::string tag, device_t *owner, UINT32 clock) +smbus_device::smbus_device(const machine_config &mconfig, const char *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().c_str(), hst_sts); + logerror("%s: hst_sts = %02x\n", tag(), 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().c_str(), hst_cnt); + logerror("%s: hst_cnt = %02x\n", tag(), 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().c_str(), hst_cmd); + logerror("%s: hst_cmd = %02x\n", tag(), 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().c_str(), xmit_slva); + logerror("%s: xmit_slva = %02x\n", tag(), 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().c_str(), hst_d0); + logerror("%s: hst_d0 = %02x\n", tag(), 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().c_str(), hst_d1); + logerror("%s: hst_d1 = %02x\n", tag(), 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().c_str(), host_block_db); + logerror("%s: host_block_db = %02x\n", tag(), 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().c_str(), pec); + logerror("%s: pec = %02x\n", tag(), 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().c_str(), rcv_slva); + logerror("%s: rcv_slva = %02x\n", tag(), 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().c_str(), slv_data); + logerror("%s: slv_data = %02x\n", tag(), 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().c_str(), aux_sts); + logerror("%s: aux_sts = %02x\n", tag(), 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().c_str(), aux_ctl); + logerror("%s: aux_ctl = %02x\n", tag(), 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().c_str(), smlink_pin_ctl); + logerror("%s: smlink_pin_ctl = %02x\n", tag(), 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().c_str(), smbus_pin_ctl); + logerror("%s: smbus_pin_ctl = %02x\n", tag(), 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().c_str(), slv_sts); + logerror("%s: slv_sts = %02x\n", tag(), 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().c_str(), slv_cmd); + logerror("%s: slv_cmd = %02x\n", tag(), 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 eb808e2c583..2ff96befc9b 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, std::string tag, device_t *owner, UINT32 clock); + smbus_device(const machine_config &mconfig, const char *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 68098c1ffcc..56789e12eb3 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; DEVICE_ADDRESS_MAP_START(map, 32, usb_uhci_device) ADDRESS_MAP_END -usb_uhci_device::usb_uhci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +usb_uhci_device::usb_uhci_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +usb_ehci_device::usb_ehci_device(const machine_config &mconfig, const char *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 bbbb7f14830..31541432efd 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, std::string tag, device_t *owner, UINT32 clock); + usb_uhci_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + usb_ehci_device(const machine_config &mconfig, const char *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 0e54518250b..f41eaea2e20 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, std::string 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, const char *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().c_str(), offset, data); + logerror("%s: write to address base (%d, %08x) not linked to any bank\n", tag(), 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().c_str(), command); + logerror("%s: command = %04x\n", tag(), 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().c_str(), 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(), 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().c_str(), expansion_rom_base & ~1, (expansion_rom_base & ~1) + expansion_rom_size - 1); + logerror("%s: map expansion rom at %08x-%08x\n", tag(), 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().c_str(), 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(), 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().c_str(), name(), size); + logerror("Device %s (%s) has 0x%x bytes of expansion rom\n", tag(), 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +pci_bridge_device::pci_bridge_device(const machine_config &mconfig, const char *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, std::string 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, const char *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().c_str(); + const char *t = d->tag(); 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().c_str(), bus, device >> 3, device & 7, reg, data, mem_mask); + logerror("%s: config_read %02x:%02x.%x:%02x %08x @ %08x\n", tag(), 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().c_str(), bus, device >> 3, device & 7, 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); } } @@ -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().c_str(), offset); + logerror("%s: b_address_base_r %d\n", tag(), offset); return 0xffffffff; } WRITE32_MEMBER(pci_bridge_device::b_address_base_w) { - logerror("%s: b_address_base_w %d, %08x\n", tag().c_str(), offset, data); + logerror("%s: b_address_base_w %d, %08x\n", tag(), offset, data); } READ8_MEMBER (pci_bridge_device::primary_bus_r) { - logerror("%s: primary_bus_r\n", tag().c_str()); + logerror("%s: primary_bus_r\n", tag()); return primary_bus; } WRITE8_MEMBER (pci_bridge_device::primary_bus_w) { primary_bus = data; - logerror("%s: primary_bus_w %02x\n", tag().c_str(), data); + logerror("%s: primary_bus_w %02x\n", tag(), data); } READ8_MEMBER (pci_bridge_device::secondary_bus_r) { - logerror("%s: secondary_bus_r\n", tag().c_str()); + logerror("%s: secondary_bus_r\n", tag()); return secondary_bus; } WRITE8_MEMBER (pci_bridge_device::secondary_bus_w) { secondary_bus = data; - logerror("%s: secondary_bus_w %02x\n", tag().c_str(), data); + logerror("%s: secondary_bus_w %02x\n", tag(), data); } READ8_MEMBER (pci_bridge_device::subordinate_bus_r) { - logerror("%s: subordinate_bus_r\n", tag().c_str()); + logerror("%s: subordinate_bus_r\n", tag()); return subordinate_bus; } WRITE8_MEMBER (pci_bridge_device::subordinate_bus_w) { subordinate_bus = data; - logerror("%s: subordinate_bus_w %02x\n", tag().c_str(), data); + logerror("%s: subordinate_bus_w %02x\n", tag(), data); } READ8_MEMBER (pci_bridge_device::secondary_latency_r) { - logerror("%s: secondary_latency_r\n", tag().c_str()); + logerror("%s: secondary_latency_r\n", tag()); return 0xff; } WRITE8_MEMBER (pci_bridge_device::secondary_latency_w) { - logerror("%s: secondary_latency_w %02x\n", tag().c_str(), data); + logerror("%s: secondary_latency_w %02x\n", tag(), 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().c_str(), data); + logerror("%s: iobase_w %02x\n", tag(), 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().c_str(), data); + logerror("%s: iolimit_w %02x\n", tag(), data); } READ16_MEMBER (pci_bridge_device::secondary_status_r) { - logerror("%s: secondary_status_r\n", tag().c_str()); + logerror("%s: secondary_status_r\n", tag()); return 0xffff; } WRITE16_MEMBER(pci_bridge_device::secondary_status_w) { - logerror("%s: secondary_status_w %04x\n", tag().c_str(), data); + logerror("%s: secondary_status_w %04x\n", tag(), 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().c_str(), memory_base); + logerror("%s: memory_base_w %04x\n", tag(), 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().c_str(), memory_limit); + logerror("%s: memory_limit_w %04x\n", tag(), 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().c_str(), prefetch_base); + logerror("%s: prefetch_base_w %04x\n", tag(), 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().c_str(), prefetch_limit); + logerror("%s: prefetch_limit_w %04x\n", tag(), 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().c_str(), prefetch_baseu); + logerror("%s: prefetch_baseu_w %08x\n", tag(), 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().c_str(), prefetch_limitu); + logerror("%s: prefetch_limitu_w %08x\n", tag(), 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().c_str(), iobaseu); + logerror("%s: iobaseu_w %04x\n", tag(), 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().c_str(), iolimitu); + logerror("%s: iolimitu_w %04x\n", tag(), iolimitu); } READ8_MEMBER (pci_bridge_device::interrupt_line_r) { - logerror("%s: interrupt_line_r\n", tag().c_str()); + logerror("%s: interrupt_line_r\n", tag()); return 0xff; } WRITE8_MEMBER (pci_bridge_device::interrupt_line_w) { - logerror("%s: interrupt_line_w %02x\n", tag().c_str(), data); + logerror("%s: interrupt_line_w %02x\n", tag(), data); } READ8_MEMBER (pci_bridge_device::interrupt_pin_r) { - logerror("%s: interrupt_pin_r\n", tag().c_str()); + logerror("%s: interrupt_pin_r\n", tag()); return 0xff; } WRITE8_MEMBER (pci_bridge_device::interrupt_pin_w) { - logerror("%s: interrupt_pin_w %02x\n", tag().c_str(), data); + logerror("%s: interrupt_pin_w %02x\n", tag(), 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().c_str(), bridge_control); + logerror("%s: bridge_control_w %04x\n", tag(), bridge_control); } -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) +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) : 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +pci_root_device::pci_root_device(const machine_config &mconfig, const char *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 f0e663e85f9..a88f0a3b7fb 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); 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, 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); + 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); 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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + pci_root_device(const machine_config &mconfig, const char *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 4cc6d7e4380..6e74a19e284 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, std::string tag, device_t *owner, UINT32 clock) +pci9050_device::pci9050_device(const machine_config &mconfig, const char *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 893d40eced5..adb3ac969e0 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, std::string tag, device_t *owner, UINT32 clock); + pci9050_device(const machine_config &mconfig, const char *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 bff25f2d764..0650fc8cea3 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; const device_type AT_KEYB = &device_creator; -pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, const char *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, std::strin { } -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) : +at_keyboard_device::at_keyboard_device(const machine_config &mconfig, const char *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 c5e4ebe2a86..69a133df2c6 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + at_keyboard_device(const machine_config &mconfig, const char *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 2945a294d9c..4a882d12a04 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, std::string tag, device_t *owner, UINT32 clock) : +pdc_device::pdc_device(const machine_config &mconfig, const char *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 8c4f5f46d87..c1f3a3cbf51 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, std::string tag, device_t *owner, UINT32 clock); + pdc_device(const machine_config &mconfig, const char *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 2e2aff0904c..40fe6fd916c 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().c_str(), irq); + logerror("pic8259_timerproc() %s: PIC IRQ #%d still in service\n", tag(), 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().c_str(), irq); + logerror("pic8259_timerproc() %s: PIC triggering IRQ #%d\n", tag(), 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().c_str(), irq); + logerror("pic8259_set_irq_line() %s: PIC set IRQ line #%d\n", tag(), 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().c_str(), irq); + logerror("pic8259_device::set_irq_line() %s: PIC cleared IRQ line #%d\n", tag(), 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().c_str(), irq); + logerror("pic8259_acknowledge() %s: PIC acknowledge IRQ #%d\n", tag(), 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().c_str(), data); + logerror("pic8259_device::write() %s: ICW1; data=0x%02X\n", tag(), 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().c_str(), data); + logerror("pic8259_device::write() %s: OCW3; data=0x%02X\n", tag(), 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().c_str(), data); + logerror("pic8259_device::write() %s: OCW2; data=0x%02X\n", tag(), 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().c_str(), data); + logerror("pic8259_device::write() %s: ICW2; data=0x%02X\n", tag(), 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().c_str(), data); + logerror("pic8259_device::write() %s: ICW3; data=0x%02X\n", tag(), 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().c_str(), data); + logerror("pic8259_device::write() %s: ICW4; data=0x%02X\n", tag(), 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pic8259_device::pic8259_device(const machine_config &mconfig, const char *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 1372f60b11d..d02c74bca4f 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, std::string tag, device_t *owner, UINT32 clock); + pic8259_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &static_set_out_int_callback(device_t &device, _Object object) { return downcast(device).m_out_int_func.set_callback(object); } template static devcb_base &static_set_sp_en_callback(device_t &device, _Object object) { return downcast(device).m_sp_en_func.set_callback(object); } diff --git a/src/devices/machine/pit8253.cpp b/src/devices/machine/pit8253.cpp index efad6443bdd..d0bf2bc5c84 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pit8253_device::pit8253_device(const machine_config &mconfig, const char *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, std::string tag, d { } -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) : +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) : 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pit8254_device::pit8254_device(const machine_config &mconfig, const char *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 3f6707e667f..e31ce8a3d19 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, 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(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() {} // 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, std::string tag, device_t *owner, UINT32 clock); + pit8254_device(const machine_config &mconfig, const char *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 8ecb0c6ba96..f96a2bd8f60 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 - constructor //------------------------------------------------- -pla_device::pla_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pla_device::pla_device(const machine_config &mconfig, const char *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().c_str(), result); + logerror("%s PLA parse error %d!\n", tag(), result); return; } diff --git a/src/devices/machine/pla.h b/src/devices/machine/pla.h index 97dd1604dcd..9f14a155ac5 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, std::string tag, device_t *owner, UINT32 clock); + pla_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers static void set_num_inputs(device_t &device, UINT32 i) { downcast(device).m_inputs = i; } diff --git a/src/devices/machine/r10696.cpp b/src/devices/machine/r10696.cpp index 6367b685858..819d31084e9 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +r10696_device::r10696_device(const machine_config &mconfig, const char *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 6a7cd728adf..b3e821a9ed9 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, std::string tag, device_t *owner, UINT32 clock); + r10696_device(const machine_config &mconfig, const char *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 e129d592f83..f6e9d65ecbf 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +r10788_device::r10788_device(const machine_config &mconfig, const char *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 1e165afaa47..d7428074abc 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, std::string tag, device_t *owner, UINT32 clock); + r10788_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~r10788_device() {} enum { diff --git a/src/devices/machine/ra17xx.cpp b/src/devices/machine/ra17xx.cpp index e83a41723fb..c1252181c7d 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ra17xx_device::ra17xx_device(const machine_config &mconfig, const char *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 4afa6cf0971..0bc1fc991e4 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, std::string tag, device_t *owner, UINT32 clock); + ra17xx_device(const machine_config &mconfig, const char *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 997d2ed68a2..92728b55303 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 - constructor //------------------------------------------------- -ram_device::ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ram_device::ram_device(const machine_config &mconfig, const char *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().c_str(), ":" RAM_TAG) == 0) + if (strcmp(tag(), ":" 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().empty() && strcmp(tag().c_str(), ":" RAM_TAG) == 0) + if (tag() != nullptr && strcmp(tag(), ":" 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 e815242a8be..7d3f054895f 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, std::string tag, device_t *owner, UINT32 clock); + ram_device(const machine_config &mconfig, const char *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 b70ff43ac3f..f2da08685ab 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +rf5c296_device::rf5c296_device(const machine_config &mconfig, const char *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 850e5d7cd80..faab5e738fb 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, std::string tag, device_t *owner, UINT32 clock); + rf5c296_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers static void set_pccard_name(device_t &device, const char *name) { downcast(device).m_pccard_name = name; } diff --git a/src/devices/machine/roc10937.cpp b/src/devices/machine/roc10937.cpp index 327d2f9cf4c..c76e02f13e6 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; -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) +roc10937_t::roc10937_t(const machine_config &mconfig, const char *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, std::string tag, device_t const device_type MSC1937 = &device_creator; -msc1937_t::msc1937_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msc1937_t::msc1937_t(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +roc10957_t::roc10957_t(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s16lf01_t::s16lf01_t(const machine_config &mconfig, const char *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 ae826fbc7cf..3acf90726b0 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + roc10937_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class msc1937_t : public rocvfd_t { public: - msc1937_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + msc1937_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class roc10957_t : public rocvfd_t { public: - roc10957_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + roc10957_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void write_char(int data); }; class s16lf01_t : public rocvfd_t { public: - s16lf01_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + s16lf01_t(const machine_config &mconfig, const char *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 cb99a41caad..5ac56b4b415 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().c_str(), alarm); + if (LOG) logerror("RP5C01 '%s' Alarm %u\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) +rp5c01_device::rp5c01_device(const machine_config &mconfig, const char *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().c_str(), offset, data); + if (LOG) logerror("RP5C01 '%s' Register %u Read %02x\n", tag(), offset, data); return data & 0x0f; } @@ -371,14 +371,14 @@ WRITE8_MEMBER( rp5c01_device::write ) if (LOG) { - 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"); + 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"); } break; case REGISTER_TEST: - if (LOG) logerror("RP5C01 '%s' Test %u not supported!\n", tag().c_str(), data); + if (LOG) logerror("RP5C01 '%s' Test %u not supported!\n", tag(), 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().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"); + 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"); } break; @@ -422,7 +422,7 @@ WRITE8_MEMBER( rp5c01_device::write ) break; } - if (LOG) logerror("RP5C01 '%s' Register %u Write %02x\n", tag().c_str(), offset, data); + if (LOG) logerror("RP5C01 '%s' Register %u Write %02x\n", tag(), offset, data); break; } } diff --git a/src/devices/machine/rp5c01.h b/src/devices/machine/rp5c01.h index 7e20fd55123..f9cf0a12609 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, std::string tag, device_t *owner, UINT32 clock); + rp5c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_alarm_callback(device_t &device, _Object object) { return downcast(device).m_out_alarm_cb.set_callback(object); } static void remove_battery(device_t &device) { downcast(device).m_battery_backed = false; } diff --git a/src/devices/machine/rp5c15.cpp b/src/devices/machine/rp5c15.cpp index c6190ba5ddb..7967366c349 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().c_str(), alarm); + if (LOG) logerror("RP5C15 '%s' Alarm %u\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) +rp5c15_device::rp5c15_device(const machine_config &mconfig, const char *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().c_str(), offset, data); + if (LOG) logerror("RP5C15 '%s' Register %u Read %02x\n", tag(), offset, data); return data & 0x0f; } @@ -345,14 +345,14 @@ WRITE8_MEMBER( rp5c15_device::write ) if (LOG) { - 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"); + 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"); } break; case REGISTER_TEST: - if (LOG) logerror("RP5C15 '%s' Test %u not supported!\n", tag().c_str(), data); + if (LOG) logerror("RP5C15 '%s' Test %u not supported!\n", tag(), 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().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"); + 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"); } break; @@ -441,7 +441,7 @@ WRITE8_MEMBER( rp5c15_device::write ) break; } - if (LOG) logerror("RP5C15 '%s' Register %u Write %02x\n", tag().c_str(), offset, data); + if (LOG) logerror("RP5C15 '%s' Register %u Write %02x\n", tag(), offset, data); break; } } diff --git a/src/devices/machine/rp5c15.h b/src/devices/machine/rp5c15.h index b4d2eb9d0e9..1e36dfaf60f 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, std::string tag, device_t *owner, UINT32 clock); + rp5c15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_alarm_callback(device_t &device, _Object object) { return downcast(device).m_out_alarm_cb.set_callback(object); } template static devcb_base &set_out_clkout_callback(device_t &device, _Object object) { return downcast(device).m_out_clkout_cb.set_callback(object); } diff --git a/src/devices/machine/rp5h01.cpp b/src/devices/machine/rp5h01.cpp index 37ea36b901c..40964570129 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rp5h01_device::rp5h01_device(const machine_config &mconfig, const char *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 6a242b5cec0..9a72c6384de 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, std::string tag, device_t *owner, UINT32 clock); + rp5h01_device(const machine_config &mconfig, const char *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 93f77f2e48d..ac1eba33e79 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 - constructor //------------------------------------------------- -rtc4543_device::rtc4543_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rtc4543_device::rtc4543_device(const machine_config &mconfig, const char *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().c_str(), state); + if (VERBOSE) printf("RTC4543 '%s' CE: %u\n", tag(), 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().c_str(), state); + if (VERBOSE) logerror("RTC4543 '%s' WR: %u\n", tag(), 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().c_str(), state); + if (VERBOSE) logerror("RTC4543 '%s' CLK: %u\n", tag(), 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().c_str(), m_shiftreg); + logerror("RTC4543 '%s' sending byte: %02x\n", tag(), 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().c_str(), state); + if (VERBOSE) logerror("RTC4543 '%s' I/O: %u\n", tag(), state); m_data = state & 1; } diff --git a/src/devices/machine/rtc4543.h b/src/devices/machine/rtc4543.h index 1b9dabdf753..e32e37370ee 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, std::string tag, device_t *owner, UINT32 clock); + rtc4543_device(const machine_config &mconfig, const char *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 b0690f3d35f..074b8d87f48 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 - constructor //------------------------------------------------- -rtc65271_device::rtc65271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rtc65271_device::rtc65271_device(const machine_config &mconfig, const char *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 e3925bf068a..c5d554e75fd 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, std::string tag, device_t *owner, UINT32 clock); + rtc65271_device(const machine_config &mconfig, const char *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 a367ea7eb57..7c92ddc53e7 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 - constructor //------------------------------------------------- -rtc9701_device::rtc9701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rtc9701_device::rtc9701_device(const machine_config &mconfig, const char *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 fa367cb21c5..14407f157ec 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, std::string tag, device_t *owner, UINT32 clock); + rtc9701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // I/O operations diff --git a/src/devices/machine/s2636.cpp b/src/devices/machine/s2636.cpp index d39ce5f2271..0beddbed0a3 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s2636_device::s2636_device(const machine_config &mconfig, const char *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 371168df616..2a22aa323d7 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, std::string tag, device_t *owner, UINT32 clock); + s2636_device(const machine_config &mconfig, const char *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 cbf33391b00..d37a6b2a542 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 - constructor //------------------------------------------------- -s3520cf_device::s3520cf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s3520cf_device::s3520cf_device(const machine_config &mconfig, const char *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 f925d8b4efc..c277c69142a 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, std::string tag, device_t *owner, UINT32 clock); + s3520cf_device(const machine_config &mconfig, const char *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 83a05dc110b..a1ef609a1ac 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s3c2400_device::s3c2400_device(const machine_config &mconfig, const char *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, std::string tag) +void s3c2400_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/devices/machine/s3c2400.h b/src/devices/machine/s3c2400.h index 347156612e5..fbd2e5e70d4 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, std::string tag, device_t *owner, UINT32 clock); + s3c2400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s3c2400_device(); // static configuration - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); template static devcb_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast(device).m_pin_r_cb.set_callback(object); } template static devcb_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast(device).m_pin_w_cb.set_callback(object); } template static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast(device).m_port_r_cb.set_callback(object); } diff --git a/src/devices/machine/s3c2410.cpp b/src/devices/machine/s3c2410.cpp index 12166118c49..c89a67ef47b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s3c2410_device::s3c2410_device(const machine_config &mconfig, const char *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, std::string tag) +void s3c2410_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/devices/machine/s3c2410.h b/src/devices/machine/s3c2410.h index e09b5a3ccc5..6e9b28a9146 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, std::string tag, device_t *owner, UINT32 clock); + s3c2410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s3c2410_device(); // static configuration - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); template static devcb_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast(device).m_pin_r_cb.set_callback(object); } template static devcb_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast(device).m_pin_w_cb.set_callback(object); } template static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast(device).m_port_r_cb.set_callback(object); } diff --git a/src/devices/machine/s3c2440.cpp b/src/devices/machine/s3c2440.cpp index 4c78d38b1bc..7cc5e0a6247 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s3c2440_device::s3c2440_device(const machine_config &mconfig, const char *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, std::string tag) +void s3c2440_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/devices/machine/s3c2440.h b/src/devices/machine/s3c2440.h index b19f5aaf483..58976ddcf1a 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, std::string tag, device_t *owner, UINT32 clock); + s3c2440_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s3c2440_device(); // static configuration - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); template static devcb_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast(device).m_pin_r_cb.set_callback(object); } template static devcb_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast(device).m_pin_w_cb.set_callback(object); } template static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast(device).m_port_r_cb.set_callback(object); } diff --git a/src/devices/machine/s3c44b0.cpp b/src/devices/machine/s3c44b0.cpp index 766c0e77c72..19579a1aa03 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s3c44b0_device::s3c44b0_device(const machine_config &mconfig, const char *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 d379ca66af0..05b0c134532 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, std::string tag, device_t *owner, UINT32 clock); + s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s3c44b0_device() {} template static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast(device).m_port_r_cb.set_callback(object); } diff --git a/src/devices/machine/serflash.cpp b/src/devices/machine/serflash.cpp index 29891365a47..ebdd1dd53a9 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 - constructor //------------------------------------------------- -serflash_device::serflash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +serflash_device::serflash_device(const machine_config &mconfig, const char *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 718de72609e..a5cf2c58bfb 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, std::string tag, device_t *owner, UINT32 clock); + serflash_device(const machine_config &mconfig, const char *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 463f76403d4..a38be999136 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, std::string 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, 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_irq_handler(*this) { @@ -183,7 +183,7 @@ void smc91c9x_device::device_reset() const device_type SMC91C94 = &device_creator; -smc91c94_device::smc91c94_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +smc91c94_device::smc91c94_device(const machine_config &mconfig, const char *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, std::string tag, const device_type SMC91C96 = &device_creator; -smc91c96_device::smc91c96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +smc91c96_device::smc91c96_device(const machine_config &mconfig, const char *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 041e9819d72..f3e7032e0e2 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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() {} template static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + smc91c94_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + smc91c96_device(const machine_config &mconfig, const char *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 78dd3b14093..34a7cb87f05 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().c_str(), space.device().safe_pc(), data); + printf ("cpu '%s' (PC=%08X) SMPC: undocumented Command %02x\n", space.device().tag(), 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().c_str(), 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(), 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 dab4f65e7a9..542be5b4ded 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +speechrom_device::speechrom_device(const machine_config &mconfig, const char *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().c_str()); + throw emu_fatalerror("No region for device '%s'\n", tag()); } m_speechrom_data = region->base(); diff --git a/src/devices/machine/spchrom.h b/src/devices/machine/spchrom.h index 42d8a107601..c72af249529 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, std::string tag, device_t *owner, UINT32 clock); + speechrom_device(const machine_config &mconfig, const char *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 9eb8b6c251b..2f63c8529d3 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +stepper_device::stepper_device(const machine_config &mconfig, const char *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 7778bbc6f47..4b180e75355 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, std::string tag, device_t *owner, UINT32 clock); + stepper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_optic_handler(device_t &device, _Object object) { return downcast(device).m_optic_cb.set_callback(object); } diff --git a/src/devices/machine/strata.cpp b/src/devices/machine/strata.cpp index ab908868626..4f7006f4d99 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +strataflash_device::strataflash_device(const machine_config &mconfig, const char *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 a80fa8c7e59..5092d1e891e 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, std::string tag, device_t *owner, UINT32 clock); + strataflash_device(const machine_config &mconfig, const char *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 af1221a2bfc..b6f0fa68f34 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().c_str()); + m_device->logerror( "T10MMC %s: no CD found!\n", m_image->tag() ); } m_lba = 0; diff --git a/src/devices/machine/t10sbc.cpp b/src/devices/machine/t10sbc.cpp index a6caecd9750..623d73acf42 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().c_str()); + m_device->logerror("T10SBC %s: no HD found!\n", m_image->owner()->tag()); } else { diff --git a/src/devices/machine/tc009xlvc.cpp b/src/devices/machine/tc009xlvc.cpp index cc0af416d3f..724bd5edf16 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, std::string tag, device_t *owner, UINT32 clock) +tc0091lvc_device::tc0091lvc_device(const machine_config &mconfig, const char *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, std::string ta // gfx decoder //------------------------------------------------- -void tc0091lvc_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void tc0091lvc_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -189,7 +189,7 @@ void tc0091lvc_device::static_set_gfxdecode_tag(device_t &device, std::string ta // palette device //------------------------------------------------- -void tc0091lvc_device::static_set_palette_tag(device_t &device, std::string tag) +void tc0091lvc_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/devices/machine/tc009xlvc.h b/src/devices/machine/tc009xlvc.h index 142d4f242da..66911acd4e5 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, std::string tag, device_t *owner, UINT32 clock); + tc0091lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); + static void static_set_palette_tag(device_t &device, const char *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 1d47a65ce1f..6b1b26b8c85 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, std::string 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, 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_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, std::string tag, device_t *owner, UINT32 clock) +generic_terminal_device::generic_terminal_device(const machine_config &mconfig, const char *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 aef9960ca7e..0f6901629af 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, 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); + 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); template static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast(device).m_keyboard_cb.set_callback(object); } diff --git a/src/devices/machine/timekpr.cpp b/src/devices/machine/timekpr.cpp index bb137f1647e..ccd849ef21d 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_nvram_interface(mconfig, *this) { } -m48t02_device::m48t02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m48t02_device::m48t02_device(const machine_config &mconfig, const char *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, std::string tag, dev m_size = 0x800; } -m48t35_device::m48t35_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m48t35_device::m48t35_device(const machine_config &mconfig, const char *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, std::string tag, dev m_size = 0x8000; } -m48t37_device::m48t37_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m48t37_device::m48t37_device(const machine_config &mconfig, const char *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, std::string tag, dev m_size = 0x8000; } -m48t58_device::m48t58_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m48t58_device::m48t58_device(const machine_config &mconfig, const char *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, std::string tag, dev m_size = 0x2000; } -mk48t08_device::mk48t08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mk48t08_device::mk48t08_device(const machine_config &mconfig, const char *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 8e057fe0519..4cb11f6ea86 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); public: DECLARE_WRITE8_MEMBER( write ); @@ -107,31 +107,31 @@ protected: class m48t02_device : public timekeeper_device { public: - m48t02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m48t02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class m48t35_device : public timekeeper_device { public: - m48t35_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m48t35_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class m48t37_device : public timekeeper_device { public: - m48t37_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m48t37_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class m48t58_device : public timekeeper_device { public: - m48t58_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m48t58_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class mk48t08_device : public timekeeper_device { public: - mk48t08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mk48t08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // device type definition diff --git a/src/devices/machine/tmp68301.cpp b/src/devices/machine/tmp68301.cpp index 39fa851de23..c2526699070 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, std::string tag, device_t *owner, UINT32 clock) +tmp68301_device::tmp68301_device(const machine_config &mconfig, const char *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 875dc93b93b..b22add4a6c6 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, std::string tag, device_t *owner, UINT32 clock); + tmp68301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tmp68301_device() {} template static devcb_base &set_in_parallel_callback(device_t &device, _Object object) { return downcast(device).m_in_parallel_cb.set_callback(object); } diff --git a/src/devices/machine/tms1024.cpp b/src/devices/machine/tms1024.cpp index b77747217ce..6e7d5c206e7 100644 --- a/src/devices/machine/tms1024.cpp +++ b/src/devices/machine/tms1024.cpp @@ -24,19 +24,19 @@ const device_type TMS1025 = &device_creator; // constructor //------------------------------------------------- -tms1024_device::tms1024_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms1024_device::tms1024_device(const machine_config &mconfig, const char *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, std::string 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, 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_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, std::string tag, device_t *owner, UINT32 clock) +tms1025_device::tms1025_device(const machine_config &mconfig, const char *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 27c90581cd1..e351f87d2fb 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, 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); + 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); // static configuration helpers template static devcb_base &set_write_port1_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + tms1025_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/machine/tms5501.cpp b/src/devices/machine/tms5501.cpp index 4dfe350d631..71f3f298cde 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, std::string tag, device_t *owner, UINT32 clock) : +tms5501_device::tms5501_device(const machine_config &mconfig, const char *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().c_str(), data); + if (LOG) logerror("TMS5501 '%s' Command %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("TMS5501 '%s' Rate Register %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("TMS5501 '%s' Transmitter Buffer %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("TMS5501 '%s' Output %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("TMS5501 '%s' Mask Register %02x\n", tag(), 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().c_str(), offset, data); + if (LOG) logerror("TMS5501 '%s' Timer %u %02x\n", tag(), 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().c_str(), mask); + if (LOG) logerror("TMS5501 '%s' Interrupt %02x\n", tag(), 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().c_str()); + if (LOG) logerror("TMS5501 '%s' Interrupt Assert\n", tag()); 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().c_str(), rst); + if (LOG) logerror("%s: TMS5501 '%s' Interrupt Acknowledge %02x\n", machine().describe_context(), tag(), rst); break; } } diff --git a/src/devices/machine/tms5501.h b/src/devices/machine/tms5501.h index 3e3a03d13a2..b618266212c 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, std::string tag, device_t *owner, UINT32 clock); + tms5501_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_xmt_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_xmt.set_callback(object); } diff --git a/src/devices/machine/tms6100.cpp b/src/devices/machine/tms6100.cpp index 951536e8941..67eb9d17a14 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(const machine_config &mconfig, device_type type, const char *name, std::string 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, 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_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, std::string tag, device_t *owner, UINT32 clock) +tms6100_device::tms6100_device(const machine_config &mconfig, const char *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, std::string tag, d const device_type M58819 = &device_creator; -m58819_device::m58819_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m58819_device::m58819_device(const machine_config &mconfig, const char *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 a0130a51c10..cd802bab7d2 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, 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); + 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); static void enable_4bit_mode(device_t &device) { downcast(device).m_4bit_mode = true; } @@ -140,7 +140,7 @@ protected: class m58819_device : public tms6100_device { public: - m58819_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m58819_device(const machine_config &mconfig, const char *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 5ffca982353..8ca2f4b2bf7 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, std::string tag, device_t *owner, UINT32 clock) +tms9901_device::tms9901_device(const machine_config &mconfig, const char *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().c_str()); + if (TRACE_CLOCK) logerror("%s: timer fires\n", tag()); current_ints |= TMS9901_INT3; } else { - if (TRACE_CLOCK) logerror("%s: timer clear\n", tag().c_str()); + if (TRACE_CLOCK) logerror("%s: timer clear\n", tag()); 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().c_str(), answer); + if (TRACE_PINS) logerror("%s: input on lines INT7..CB = %02x\n", tag(), 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().c_str(), answer); + if (TRACE_PINS) logerror("%s: input on lines INT15..INT8 = %02x\n", tag(), 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().c_str(), answer); + if (TRACE_PINS) logerror("%s: input on lines P7..P0 = %02x\n", tag(), 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().c_str(), answer); + if (TRACE_PINS) logerror("%s: input on lines P15..P8 = %02x\n", tag(), 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().c_str(), pin, data); + if (TRACE_PINS) logerror("%s: output on P%d = %d\n", tag(), 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().c_str()); + if (TRACE_MODE) logerror("%s: int mode\n", tag()); } else { m_clock_mode = true; - if (TRACE_MODE) logerror("%s: clock mode\n", tag().c_str()); + if (TRACE_MODE) logerror("%s: clock mode\n", tag()); // 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().c_str()); + if (TRACE_MODE) logerror("%s: Soft reset (RST2*)\n", tag()); } } 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().c_str(), m_enabled_ints); + if (TRACE_PINS) logerror("%s: interrupts = %04x\n", tag(), 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().c_str(), m_clock_register); + if (TRACE_CLOCK) logerror("%s: clock register = %04x\n", tag(), 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().c_str(), m_enabled_ints); + if (TRACE_MODE) logerror("%s: enabled interrupts = %04x\n", tag(), 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().c_str(), m_decrementer_value); + if (TRACE_CLOCK) logerror("%s: decrementer = %d\n", tag(), 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 bd0700aaa71..87d314e0685 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, std::string tag, device_t *owner, UINT32 clock); + tms9901_device(const machine_config &mconfig, const char *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 444e4b5033e..40194b312fe 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, std::string tag, device_t *owner, UINT32 clock) +tms9902_device::tms9902_device(const machine_config &mconfig, const char *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 b9f522dd977..f0ccf6c2b41 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, std::string tag, device_t *owner, UINT32 clock); + tms9902_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_int_callback(device_t &device, _Object object) { return downcast(device).m_int_cb.set_callback(object); } template static devcb_base &set_rcv_callback(device_t &device, _Object object) { return downcast(device).m_rcv_cb.set_callback(object); } diff --git a/src/devices/machine/upd1990a.cpp b/src/devices/machine/upd1990a.cpp index a4245e29670..59f85d9c4ca 100644 --- a/src/devices/machine/upd1990a.cpp +++ b/src/devices/machine/upd1990a.cpp @@ -44,7 +44,7 @@ const device_type UPD4990A = &device_creator; // upd1990a_device - constructor //------------------------------------------------- -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +upd1990a_device::upd1990a_device(const machine_config &mconfig, const char *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, std::string tag, { } -upd4990a_device::upd4990a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd4990a_device::upd4990a_device(const machine_config &mconfig, const char *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().c_str(), state); + if (LOG) logerror("uPD1990A '%s' STB %u\n", tag(), 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().c_str(), m_c); + if (LOG) logerror("uPD1990A '%s' Command %x\n", tag(), 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().c_str(), state); + if (LOG) logerror("uPD1990A '%s' CLK %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("uPD1990A '%s' CS %u\n", tag(), state); m_cs = state; } WRITE_LINE_MEMBER( upd1990a_device::oe_w ) { // output enable - if (LOG) logerror("uPD1990A '%s' OE %u\n", tag().c_str(), state); + if (LOG) logerror("uPD1990A '%s' OE %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("uPD1990A '%s' C0 %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("uPD1990A '%s' C1 %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("uPD1990A '%s' C2 %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("uPD1990A '%s' DATA IN %u\n", tag(), state); m_data_in = state; } diff --git a/src/devices/machine/upd1990a.h b/src/devices/machine/upd1990a.h index ee8ed3bd1b2..3c80670ec8e 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, 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); + 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); template void set_data_callback(_data data) { m_write_data.set_callback(data); } template 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, std::string tag, device_t *owner, UINT32 clock); + upd4990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/machine/upd4701.cpp b/src/devices/machine/upd4701.cpp index 3e7ce6c8e7a..37e5d5dadd9 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd4701_device::upd4701_device(const machine_config &mconfig, const char *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 d9c080d8820..d559e8e00b6 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, std::string tag, device_t *owner, UINT32 clock); + upd4701_device(const machine_config &mconfig, const char *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 516e83c6f76..5e53da565a6 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 - constructor //------------------------------------------------- -upd4992_device::upd4992_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd4992_device::upd4992_device(const machine_config &mconfig, const char *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 60d09a3bea7..23d7dc50cea 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, std::string tag, device_t *owner, UINT32 clock); + upd4992_device(const machine_config &mconfig, const char *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 4651b6cfabf..30803adc481 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd7002_device::upd7002_device(const machine_config &mconfig, const char *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 3824e0e5c6b..0875549f7e8 100644 --- a/src/devices/machine/upd7002.h +++ b/src/devices/machine/upd7002.h @@ -31,7 +31,7 @@ typedef device_delegate upd7002_eoc_delegate; class upd7002_device : public device_t { public: - upd7002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + upd7002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~upd7002_device() {} static void set_get_analogue_callback(device_t &device, upd7002_get_analogue_delegate callback) { downcast(device).m_get_analogue_cb = callback; } diff --git a/src/devices/machine/upd71071.cpp b/src/devices/machine/upd71071.cpp index 64ff0531ee5..921c0bcc7a4 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd71071_device::upd71071_device(const machine_config &mconfig, const char *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 2dc11d7e938..e63546a7f40 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, std::string tag, device_t *owner, UINT32 clock); + upd71071_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~upd71071_device() {} - static void static_set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu.set_tag(tag); } + static void static_set_cpu_tag(device_t &device, const char *tag) { downcast(device).m_cpu.set_tag(tag); } static void set_clock(device_t &device, int clock) { downcast(device).m_upd_clock = clock; } template static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast(device).m_out_hreq_cb.set_callback(object); } template static devcb_base &set_out_eop_callback(device_t &device, _Object object) { return downcast(device).m_out_eop_cb.set_callback(object); } diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp index 7b24b50dfe0..48901ef2314 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : pc_fdc_interface(mconfig, type, name, tag, owner, clock, shortname, source), 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().c_str(), _tc); + logerror("%s: tc=%d\n", tag(), _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().c_str(), data); + logerror("%s: dor = %02x\n", tag(), 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().c_str(), data); + logerror("%s: dsr_w %02x\n", tag(), 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().c_str(), main_phase); + logerror("%s: fifo_r in phase %d\n", tag(), 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().c_str(), main_phase); + logerror("%s: fifo_r in phase %d\n", tag(), 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().c_str(), command[0]); + logerror("%s: Invalid on %02x\n", tag(), 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().c_str(), main_phase); + logerror("%s: fifo_w in phase %d\n", tag(), main_phase); break; default: - logerror("%s: fifo_w in phase %d\n", tag().c_str(), main_phase); + logerror("%s: fifo_w in phase %d\n", tag(), 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().c_str()); + logerror("%s: Fifo overrun\n", tag()); 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().c_str()); + logerror("%s: Fifo underrun\n", tag()); 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().c_str(), command[12], command[13], command[14], command[15]); + tag(), 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().c_str(), command[12], command[13], command[14], command[15]); + tag(), 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().c_str(), + tag(), 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().c_str()); + logerror("%s: command dump regs\n", tag()); 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().c_str(), locked ? "on" : "off"); + logerror("%s: command lock (%s)\n", tag(), locked ? "on" : "off"); break; case C_PERPENDICULAR: - logerror("%s: command perpendicular\n", tag().c_str()); + logerror("%s: command perpendicular\n", tag()); 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().c_str(), fi.id, result[0]); + logerror("%s: command sense drive status %d (%02x)\n", tag(), 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().c_str(), result[0]); + logerror("%s: command sense interrupt status (%02x)\n", tag(), 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().c_str(), fid, result[0], result[1]); + logerror("%s: command sense interrupt status (fid=%d %02x %02x)\n", tag(), 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().c_str(), + tag(), 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().c_str(), data_completion ? "data" : "seek"); + logerror("%s: command done (%s) -", tag(), 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().c_str()); + logerror("%s: command recalibrate\n", tag()); 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().c_str(), command[0] & 0x80 ? "relative " : "", command[2]); + logerror("%s: command %sseek %d\n", tag(), 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().c_str(), + tag(), 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().c_str(), + tag(), 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().c_str(), + tag(), 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().c_str(), + tag(), 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().c_str(), + tag(), 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().c_str()); + logerror("%s: index found, reading track\n", tag()); 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().c_str(), + tag(), 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().c_str(), + tag(), 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().c_str()); + logerror("%s: index found, writing track\n", tag()); 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().c_str(), + tag(), 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().c_str(), cur_irq); + logerror("%s: irq = %d\n", tag(), 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().c_str(), fid, flopi[fid].ready, ready); + logerror("%s: polled %d : %d -> %d\n", tag(), 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().c_str(), + logerror("%s: matching %02x %02x %02x %02x - %02x %02x %02x %02x\n", tag(), 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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, 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__) +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__) { ready_polled = false; ready_connected = false; select_connected = true; } -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__) +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__) { ready_polled = false; ready_connected = false; select_connected = true; } -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__) +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__) { ready_polled = true; ready_connected = false; select_connected = true; } -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__) +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__) { ready_polled = true; ready_connected = false; select_connected = true; } -mcs3201_device::mcs3201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +mcs3201_device::mcs3201_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tc8566af_device::tc8566af_device(const machine_config &mconfig, const char *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 fc7bac48cf2..19da61d4712 100644 --- a/src/devices/machine/upd765.h +++ b/src/devices/machine/upd765.h @@ -75,7 +75,7 @@ public: typedef delegate byte_read_cb; typedef delegate byte_write_cb; - 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) {} + 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) {} /* 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast(device).intrq_cb.set_callback(object); } template static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + upd765a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + upd765b_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + i8272a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + smc37c78_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + upd72065_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + n82077aa_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pc_fdc_superio_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + dp8473_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + pc8477a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + wd37c65c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mcs3201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_input_handler(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + tc8566af_device(const machine_config &mconfig, const char *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 190d50f8ea0..ab0057d9951 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 - constructor //------------------------------------------------- -v3021_device::v3021_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v3021_device::v3021_device(const machine_config &mconfig, const char *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 a99c09f2175..7e4844216c4 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, std::string tag, device_t *owner, UINT32 clock); + v3021_device(const machine_config &mconfig, const char *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 f0ea9c894cc..c6797193c49 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, 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), +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), 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().c_str(),m_ram_size,m_ram_base); + logerror("%s: map_cpu_space ram_size=%08X ram_base=%08X\n", tag(),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().c_str(),m_simm_size,m_simm_base); + logerror("%s: map_cpu_space simm_size=%08X simm_base=%08X\n", tag(),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().c_str(), winStart, winEnd, winSize, m_pci1_laddr); + logerror("%s: map_cpu_space Master Window 1 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), 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().c_str(), winStart, winEnd, winSize, m_pci2_laddr); + logerror("%s: map_cpu_space Master Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), 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().c_str(), winStart, winEnd, winSize, m_pci_io_laddr); + logerror("%s: map_cpu_space IO Window start=%08X end=%08X size=%08X laddr=%08X\n", tag(), 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().c_str(), winStart, winEnd, winSize, m_target1_laddr); + logerror("%s: map_extra Target Window 1 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), 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().c_str(), winStart, winEnd, winSize, m_target2_laddr); + logerror("%s: map_extra Target Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), 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(std::string _cpu_tag) +void vrc4373_device::set_cpu_tag(const char *_cpu_tag) { if (LOG_NILE) - logerror("%s: set_cpu_tag\n", tag().c_str()); + logerror("%s: set_cpu_tag\n", tag()); cpu_tag = _cpu_tag; } // PCI bus control diff --git a/src/devices/machine/vrc4373.h b/src/devices/machine/vrc4373.h index 4af2e5e9e4a..bbd740b8084 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, std::string tag, device_t *owner, UINT32 clock); + vrc4373_device(const machine_config &mconfig, const char *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(std::string tag); + void set_cpu_tag(const char *tag); virtual DECLARE_ADDRESS_MAP(config_map, 32) override; @@ -103,7 +103,7 @@ protected: private: mips3_device *m_cpu; - std::string cpu_tag; + const char *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 fa6798c2858..8f24e2338fd 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(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) +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) { } diff --git a/src/devices/machine/vt82c496.h b/src/devices/machine/vt82c496.h index 8ce78d8bdf8..d6c1c34e819 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, std::string tag, device_t *owner, UINT32 clock); + vt82c496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void static_set_cpu(device_t &device, std::string tag) { dynamic_cast(device).m_cpu_tag = tag; } - static void static_set_region(device_t &device, std::string tag) { dynamic_cast(device).m_region_tag = tag; } + static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast(device).m_cpu_tag = tag; } + static void static_set_region(device_t &device, const char *tag) { dynamic_cast(device).m_region_tag = tag; } DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -38,8 +38,8 @@ protected: virtual void device_reset() override; private: - std::string m_cpu_tag; - std::string m_region_tag; + const char* m_cpu_tag; + const char* 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 e27c3e58aa4..1957b848c9b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +vt83c461_device::vt83c461_device(const machine_config &mconfig, const char *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 6acc978b8c4..1fbe3a475bb 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, std::string tag, device_t *owner, UINT32 clock); + vt83c461_device(const machine_config &mconfig, const char *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 ca412f5122e..0f38c32c624 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, std::string tag, device_t *owner, UINT32 clock) +wd11c00_17_device::wd11c00_17_device(const machine_config &mconfig, const char *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().c_str(), m_ra); + if (LOG) logerror("%s WD11C00-17 '%s' Read Data %03x:", machine().describe_context(), tag(), 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().c_str(), m_ra, data); + if (LOG) logerror("%s WD11C00-17 '%s' Write Data %03x:%02x\n", machine().describe_context(), tag(), 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().c_str()); + if (LOG) logerror("%s WD11C00-17 '%s' Software Reset\n", machine().describe_context(), tag()); software_reset(); break; case 2: // Board Select - if (LOG) logerror("%s WD11C00-17 '%s' Select\n", machine().describe_context(), tag().c_str()); + if (LOG) logerror("%s WD11C00-17 '%s' Select\n", machine().describe_context(), tag()); 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().c_str(), BIT(data, 1), BIT(data, 0)); + if (LOG) logerror("%s WD11C00-17 '%s' Mask IRQ %u DMA %u\n", machine().describe_context(), tag(), 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().c_str(), m_ra); + if (LOG) logerror("%s WD11C00-17 '%s' Read RAM %03x:", machine().describe_context(), tag(), 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().c_str(), m_ra, data); + if (LOG) logerror("%s WD11C00-17 '%s' Write RAM %03x:%02x\n", machine().describe_context(), tag(), 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().c_str(), m_ra); + if (LOG) logerror("%s WD11C00-17 '%s' RA %03x\n", machine().describe_context(), tag(), 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().c_str(), state); + if (LOG) logerror("%s WD11C00-17 '%s' IREQ %u\n", machine().describe_context(), tag(), 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().c_str(), state); + if (LOG) logerror("%s WD11C00-17 '%s' I/O %u\n", machine().describe_context(), tag(), 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().c_str(), state); + if (LOG) logerror("%s WD11C00-17 '%s' C/D %u\n", machine().describe_context(), tag(), 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().c_str(), state); + if (LOG) logerror("%s WD11C00-17 '%s' CLCT %u\n", machine().describe_context(), tag(), 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().c_str(), state); + if (LOG) logerror("%s WD11C00-17 '%s' MODE %u\n", machine().describe_context(), tag(), 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 ac97a8617b0..7104e20c4dc 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, std::string tag, device_t *owner, UINT32 clock); + wd11c00_17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_irq5_callback(device_t &device, _Object object) { return downcast(device).m_out_irq5_cb.set_callback(object); } template static devcb_base &set_out_drq3_callback(device_t &device, _Object object) { return downcast(device).m_out_drq3_cb.set_callback(object); } diff --git a/src/devices/machine/wd2010.cpp b/src/devices/machine/wd2010.cpp index 1c46377951d..a97b35b2517 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 - constructor //------------------------------------------------- -wd2010_device::wd2010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +wd2010_device::wd2010_device(const machine_config &mconfig, const char *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().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); + 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); } 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().c_str(), WRITE_PRECOMP_CYLINDER); + if (LOG) logerror("%s WD2010 '%s' Write Precomp Cylinder: %u\n", machine().describe_context(), tag(), WRITE_PRECOMP_CYLINDER); break; case TASK_FILE_SECTOR_COUNT: - if (LOG) logerror("%s WD2010 '%s' Sector Count: %u\n", machine().describe_context(), tag().c_str(), SECTOR_COUNT); + if (LOG) logerror("%s WD2010 '%s' Sector Count: %u\n", machine().describe_context(), tag(), SECTOR_COUNT); break; case TASK_FILE_SECTOR_NUMBER: - if (LOG) logerror("%s WD2010 '%s' Sector Number: %u\n", machine().describe_context(), tag().c_str(), SECTOR_NUMBER); + if (LOG) logerror("%s WD2010 '%s' Sector Number: %u\n", machine().describe_context(), tag(), SECTOR_NUMBER); break; case TASK_FILE_CYLINDER_LOW: - if (LOG) logerror("%s WD2010 '%s' Cylinder (lower bits set): %u\n", machine().describe_context(), tag().c_str(), CYLINDER); + if (LOG) logerror("%s WD2010 '%s' Cylinder (lower bits set): %u\n", machine().describe_context(), tag(), CYLINDER); break; case TASK_FILE_CYLINDER_HIGH: - if (LOG) logerror("%s WD2010 '%s' Cylinder (MSB bits set): %u\n", machine().describe_context(), tag().c_str(), CYLINDER); + if (LOG) logerror("%s WD2010 '%s' Cylinder (MSB bits set): %u\n", machine().describe_context(), tag(), CYLINDER); break; case TASK_FILE_SDH_REGISTER: if (LOG) { - 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); + 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); } 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().c_str()); + if (LOG) logerror("%s WD2010 '%s' COMPUTE CORRECTION\n", machine().describe_context(), tag()); 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().c_str()); + if (LOG) logerror("%s WD2010 '%s' SET PARAMETER\n", machine().describe_context(), tag()); 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().c_str()); + if (LOG) logerror("%s WD2010 '%s' RESTORE\n", machine().describe_context(), tag()); restore(data); break; case COMMAND_SEEK: - if (LOG) logerror("%s WD2010 '%s' SEEK\n", machine().describe_context(), tag().c_str()); + if (LOG) logerror("%s WD2010 '%s' SEEK\n", machine().describe_context(), tag()); seek(data); break; case COMMAND_READ_SECTOR: - 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)); + if (LOG) logerror("%s WD2010 '%s' READ SECTOR (I = %u) (M = %u)\n", machine().describe_context(), tag(), ((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().c_str(), ((data & 4) > 0)); + if (LOG) logerror("%s WD2010 '%s' WRITE SECTOR (M = %u)\n", machine().describe_context(), tag(), ((data & 4) > 0)); write_sector(data); break; case COMMAND_SCAN_ID: - if (LOG) logerror("%s WD2010 '%s' SCAN ID\n", machine().describe_context(), tag().c_str()); + if (LOG) logerror("%s WD2010 '%s' SCAN ID\n", machine().describe_context(), tag()); scan_id(data); break; case COMMAND_WRITE_FORMAT: - if (LOG) logerror("%s WD2010 '%s' WRITE FORMAT\n", machine().describe_context(), tag().c_str()); + if (LOG) logerror("%s WD2010 '%s' WRITE FORMAT\n", machine().describe_context(), tag()); format(data); break; } diff --git a/src/devices/machine/wd2010.h b/src/devices/machine/wd2010.h index d30389dc381..204cb768385 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, std::string tag, device_t *owner, UINT32 clock); + wd2010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_intrq_callback(device_t &device, _Object object) { return downcast(device).m_out_intrq_cb.set_callback(object); } template static devcb_base &set_out_bdrq_callback(device_t &device, _Object object) { return downcast(device).m_out_bdrq_cb.set_callback(object); } diff --git a/src/devices/machine/wd33c93.cpp b/src/devices/machine/wd33c93.cpp index 65dc4571ff6..2ae5f9d370a 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, std::string tag, device_t *owner, UINT32 clock) : +wd33c93_device::wd33c93_device(const machine_config &mconfig, const char *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 f006ee737c4..b749131d692 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, std::string tag, device_t *owner, UINT32 clock); + wd33c93_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp index 5409e68aaef..63586c3d858 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, std::string tag) +void wd7600_device::static_set_cputag(device_t &device, const char *tag) { wd7600_device &chip = downcast(device); chip.m_cputag = tag; } -void wd7600_device::static_set_isatag(device_t &device, std::string tag) +void wd7600_device::static_set_isatag(device_t &device, const char *tag) { wd7600_device &chip = downcast(device); chip.m_isatag = tag; } -void wd7600_device::static_set_biostag(device_t &device, std::string tag) +void wd7600_device::static_set_biostag(device_t &device, const char *tag) { wd7600_device &chip = downcast(device); chip.m_biostag = tag; } -void wd7600_device::static_set_keybctag(device_t &device, std::string tag) +void wd7600_device::static_set_keybctag(device_t &device, const char *tag) { wd7600_device &chip = downcast(device); chip.m_keybctag = tag; } -wd7600_device::wd7600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +wd7600_device::wd7600_device(const machine_config &mconfig, const char *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().c_str(), data); +// if(LOG) logerror("WD7600 '%s': keyboard data write %02x\n", tag(), 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().c_str(), ret); +// if(LOG) logerror("WD7600 '%s': keyboard data read %02x\n", tag(), ret); return ret; } WRITE8_MEMBER( wd7600_device::keyb_cmd_w ) { -// if(LOG) logerror("WD7600 '%s': keyboard command %02x\n", tag().c_str(), data); +// if(LOG) logerror("WD7600 '%s': keyboard command %02x\n", tag(), 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().c_str()); + if(LOG) logerror("WD7600 '%s': System reset\n",tag()); } } @@ -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().c_str(),data); + if(LOG) logerror("WD7600 '%s': Refresh Control write %04x\n",tag(),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().c_str(),data); + if(LOG) logerror("WD7600 '%s': Chip Select write %04x\n",tag(),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().c_str(),data); + if(LOG) logerror("WD7600 '%s': Memory Control write %04x\n",tag(),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().c_str(),m_bank_start[0] << 16); + if(LOG) logerror("WD7600 '%s': Bank 0 start address %08x\n",tag(),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().c_str(),m_bank_start[1] << 16); + if(LOG) logerror("WD7600 '%s': Bank 1 start address %08x\n",tag(),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().c_str(),m_bank_start[2] << 16); + if(LOG) logerror("WD7600 '%s': Bank 2 start address %08x\n",tag(),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().c_str(),m_bank_start[3] << 16); + if(LOG) logerror("WD7600 '%s': Bank 3 start address %08x\n",tag(),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().c_str(),data); + if(LOG) logerror("WD7600 '%s': Split start address write %04x\n",tag(),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().c_str(),data); + if(LOG) logerror("WD7600 '%s': Diagnostic write %04x\n",tag(),data); } diff --git a/src/devices/machine/wd7600.h b/src/devices/machine/wd7600.h index e6c461079b1..25050c9fb0c 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, std::string tag, device_t *owner, UINT32 clock); + wd7600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -80,10 +80,10 @@ public: template void set_spkr_callback(_spkr spkr) { m_write_spkr.set_callback(spkr); } // inline configuration - 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); + 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); 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 - std::string m_cputag; - std::string m_isatag; - std::string m_biostag; - std::string m_keybctag; + const char *m_cputag; + const char *m_isatag; + const char *m_biostag; + const char *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 3db68daeb20..32cda7b663c 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; // Show state machine #define TRACE_STATE 0 -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) : +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) : 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().c_str()); + logerror("%s: Warning, this chip doesn't have an ENMF line.\n", tag()); 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().c_str()); + logerror("%s: Error, this chip does not have a dden line\n", tag()); return; } if(dden != _dden) { dden = _dden; - if (TRACE_LINES) logerror("%s: select %s\n", tag().c_str(), dden ? "fm" : "mfm"); + if (TRACE_LINES) logerror("%s: select %s\n", tag(), 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().c_str(), (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(), (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().c_str(), data, track); + if (TRACE_COMMAND) logerror("%s: seek %d (track=%d)\n", tag(), 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().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag()); return; case SPINUP_DONE: - if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SEEK_MOVE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SEEK_WAIT_STEP_TIME\n", tag()); return; case SEEK_WAIT_STEP_TIME_DONE: { - if (TRACE_STATE) logerror("%s: SEEK_WAIT_STEP_TIME_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SEEK_WAIT_STEP_TIME_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SEEK_WAIT_STABILIZATION_TIME\n", tag()); return; case SEEK_WAIT_STABILIZATION_TIME_DONE: - if (TRACE_STATE) logerror("%s: SEEK_WAIT_STABILIZATION_TIME_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SEEK_WAIT_STABILIZATION_TIME_DONE\n", tag()); sub_state = SEEK_DONE; break; case SEEK_DONE: - if (TRACE_STATE) logerror("%s: SEEK_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SEEK_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag()); 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().c_str(), + logerror("%s: matching read T=%02x H=%02x S=%02x L=%02x - searched T=%02x S=%02x\n", tag(), 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().c_str(), command & 0x10 ? " multiple" : "", command, track, sector); + if (TRACE_COMMAND) logerror("%s: read sector%s (c=%02x) t=%d, s=%d\n", tag(), 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().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag()); return; case SPINUP_DONE: - if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag()); return; case SETTLE_DONE: - if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag()); status |= S_RNF; command_end(); return; case SECTOR_READ: - if (TRACE_STATE) logerror("%s: SECTOR_READ\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SECTOR_READ\n", tag()); 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().c_str(), command, track); + if (TRACE_COMMAND) logerror("%s: read track (c=%02x) t=%d\n", tag(), 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().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag()); return; case SPINUP_DONE: - if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag()); return; case SETTLE_DONE: - if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag()); sub_state = WAIT_INDEX; return; case WAIT_INDEX: - if (TRACE_STATE) logerror("%s: WAIT_INDEX\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: WAIT_INDEX\n", tag()); return; case WAIT_INDEX_DONE: - if (TRACE_STATE) logerror("%s: WAIT_INDEX_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: WAIT_INDEX_DONE\n", tag()); sub_state = TRACK_DONE; live_start(READ_TRACK_DATA); return; case TRACK_DONE: - if (TRACE_STATE) logerror("%s: TRACK_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: TRACK_DONE\n", tag()); 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().c_str(), command); + if (TRACE_COMMAND) logerror("%s: read id (c=%02x)\n", tag(), 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().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag()); return; case SPINUP_DONE: - if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag()); return; case SETTLE_DONE: - if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag()); command_end(); return; case SCAN_ID_FAILED: - if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag()); 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().c_str(), command, track); + if (TRACE_COMMAND) logerror("%s: write track (c=%02x) t=%d\n", tag(), 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().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag()); return; case SPINUP_DONE: - if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag()); return; case SETTLE_DONE: - if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: DATA_LOAD_WAIT\n", tag()); return; case DATA_LOAD_WAIT_DONE: - if (TRACE_STATE) logerror("%s: DATA_LOAD_WAIT_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: DATA_LOAD_WAIT_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: WAIT_INDEX\n", tag()); return; case WAIT_INDEX_DONE: - if (TRACE_STATE) logerror("%s: WAIT_INDEX_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: WAIT_INDEX_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: TRACK_DONE\n", tag()); 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().c_str(), format_description_string.c_str()); + if (TRACE_DESC) logerror("%s: track description %s\n", tag(), 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().c_str(), command & 0x10 ? " multiple" : "", command, track, sector); + if (TRACE_COMMAND) logerror("%s: write sector%s (c=%02x) t=%d, s=%d\n", tag(), 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().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag()); return; case SPINUP_DONE: - if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag()); return; case SETTLE_DONE: - if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag()); 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().c_str()); + if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag()); status |= S_RNF; command_end(); return; case SECTOR_WRITE: - if (TRACE_STATE) logerror("%s: SECTOR_WRITE\n", tag().c_str()); + if (TRACE_STATE) logerror("%s: SECTOR_WRITE\n", tag()); 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().c_str(), command); + if (TRACE_COMMAND) logerror("%s: Forced interrupt (c=%02x)\n", tag(), 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().c_str(), val); + if (TRACE_COMP) logerror("%s: Initiating command %02x\n", tag(), 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().c_str(), raw, cur_live.crc); + if (TRACE_WRITE) logerror("%s: write raw %04x, CRC=%04x\n", tag(), 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().c_str(), mfm, raw, cur_live.crc); + if (TRACE_WRITE) logerror("%s: live_write_mfm byte=%02x, raw=%04x, CRC=%04x\n", tag(), 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().c_str(), fm, raw, cur_live.crc); + if (TRACE_WRITE) logerror("%s: live_write_fm byte=%02x, raw=%04x, CRC=%04x\n", tag(), 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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *own nonsticky_immint = false; } -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__) +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__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2471,7 +2471,7 @@ fd1792_t::fd1792_t(const machine_config &mconfig, std::string tag, device_t *own nonsticky_immint = false; } -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__) +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__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2487,7 +2487,7 @@ fd1793_t::fd1793_t(const machine_config &mconfig, std::string tag, device_t *own nonsticky_immint = false; } -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__) +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__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2503,7 +2503,7 @@ kr1818vg93_t::kr1818vg93_t(const machine_config &mconfig, std::string tag, devic nonsticky_immint = true; } -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__) +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__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2519,7 +2519,7 @@ fd1794_t::fd1794_t(const machine_config &mconfig, std::string tag, device_t *own nonsticky_immint = false; } -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__) +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__) { 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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *own nonsticky_immint = false; } -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__) +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__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2599,7 +2599,7 @@ mb8876_t::mb8876_t(const machine_config &mconfig, std::string tag, device_t *own nonsticky_immint = false; } -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__) +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__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2615,7 +2615,7 @@ mb8877_t::mb8877_t(const machine_config &mconfig, std::string tag, device_t *own nonsticky_immint = false; } -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__) +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__) { step_times = fd176x_step_times; delay_register_commit = 16; @@ -2631,7 +2631,7 @@ fd1761_t::fd1761_t(const machine_config &mconfig, std::string tag, device_t *own nonsticky_immint = false; } -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__) +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__) { step_times = fd176x_step_times; delay_register_commit = 16; @@ -2647,7 +2647,7 @@ fd1763_t::fd1763_t(const machine_config &mconfig, std::string tag, device_t *own nonsticky_immint = false; } -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__) +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__) { 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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *own nonsticky_immint = false; } -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__) +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__) { step_times = fd179x_step_times; delay_register_commit = 16; @@ -2727,7 +2727,7 @@ wd2793_t::wd2793_t(const machine_config &mconfig, std::string tag, device_t *own nonsticky_immint = false; } -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__) +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__) { 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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *own nonsticky_immint = false; } -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__) +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__) { 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, std::string 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, const char *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 d167017a737..4abc761e74b 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast(device).intrq_cb.set_callback(object); } template static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast(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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + fd1771_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + fd1781_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + fd1791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class fd1792_t : public wd_fdc_analog_t { public: - fd1792_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fd1792_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class fd1793_t : public wd_fdc_analog_t { public: - fd1793_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fd1793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class kr1818vg93_t : public wd_fdc_analog_t { public: - kr1818vg93_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kr1818vg93_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class fd1794_t : public wd_fdc_analog_t { public: - fd1794_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fd1794_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class fd1795_t : public wd_fdc_analog_t { public: - fd1795_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fd1795_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + fd1797_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mb8866_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class mb8876_t : public wd_fdc_analog_t { public: - mb8876_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mb8876_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class mb8877_t : public wd_fdc_analog_t { public: - mb8877_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mb8877_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class fd1761_t : public wd_fdc_analog_t { public: - fd1761_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fd1761_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class fd1763_t : public wd_fdc_analog_t { public: - fd1763_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fd1763_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class fd1765_t : public wd_fdc_analog_t { public: - fd1765_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fd1765_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + fd1767_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + wd2791_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + wd2793_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + wd2795_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + wd2797_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + wd1770_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class wd1772_t : public wd_fdc_digital_t { public: - wd1772_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wd1772_t(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + wd1773_t(const machine_config &mconfig, const char *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 9e91c1a3004..6428aae26c6 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) : +diskii_fdc::diskii_fdc(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) : +appleiii_fdc::appleiii_fdc(const machine_config &mconfig, const char *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 a9a82fce78d..75247f62c8b 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + diskii_fdc(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + appleiii_fdc(const machine_config &mconfig, const char *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 ecb54ee47cf..cb6fc2b57e9 100644 --- a/src/devices/machine/x2212.cpp +++ b/src/devices/machine/x2212.cpp @@ -38,7 +38,7 @@ const device_type X2210 = &device_creator; // x2212_device - constructor //------------------------------------------------- -x2212_device::x2212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +x2212_device::x2212_device(const machine_config &mconfig, const char *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, std::string tag, devic { } -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) +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) : 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().c_str()); + fatalerror("x2212 region '%s' wrong size (expected size = 0x100)\n", tag()); if (m_region->bytewidth() != 1) - fatalerror("x2212 region '%s' needs to be an 8-bit region\n", tag().c_str()); + fatalerror("x2212 region '%s' needs to be an 8-bit region\n", tag()); 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, std::string tag, device_t *owner, UINT32 clock) +x2210_device::x2210_device(const machine_config &mconfig, const char *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 3c20543f462..161cf399457 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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + x2210_device(const machine_config &mconfig, const char *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 a2927d8db59..21dea0ae141 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().c_str(), buf ); + logerror( "%s: x76f041(%s) %s", machine().describe_context(), tag(), buf ); } } // device type definition const device_type X76F041 = &device_creator; -x76f041_device::x76f041_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +x76f041_device::x76f041_device( const machine_config &mconfig, const char *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().c_str() ); + logerror( "x76f041(%s) region not found\n", tag() ); } else if( m_region->bytes() != expected_bytes ) { - logerror( "x76f041(%s) region length 0x%x expected 0x%x\n", tag().c_str(), m_region->bytes(), expected_bytes ); + logerror( "x76f041(%s) region length 0x%x expected 0x%x\n", tag(), m_region->bytes(), expected_bytes ); } else { diff --git a/src/devices/machine/x76f041.h b/src/devices/machine/x76f041.h index 9638325d346..228540969eb 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, std::string tag, device_t *owner, UINT32 clock ); + x76f041_device( const machine_config &mconfig, const char *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 d21dbad45a2..830a0e51448 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().c_str(), buf ); + logerror( "%s: x76f100(%s) %s", machine().describe_context(), tag(), buf ); } } // device type definition const device_type X76F100 = &device_creator; -x76f100_device::x76f100_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +x76f100_device::x76f100_device( const machine_config &mconfig, const char *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().c_str() ); + logerror( "x76f100(%s) region not found\n", tag() ); } else if( m_region->bytes() != expected_size ) { - logerror("x76f100(%s) region length 0x%x expected 0x%x\n", tag().c_str(), m_region->bytes(), expected_size ); + logerror("x76f100(%s) region length 0x%x expected 0x%x\n", tag(), m_region->bytes(), expected_size ); } else { diff --git a/src/devices/machine/x76f100.h b/src/devices/machine/x76f100.h index adf103a8c55..287a4a17a56 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, std::string tag, device_t *owner, UINT32 clock ); + x76f100_device( const machine_config &mconfig, const char *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 0d533acda10..bdaef303d77 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2148_device::ym2148_device(const machine_config &mconfig, const char *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 db15f792196..729b28e8fc2 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, std::string tag, device_t *owner, UINT32 clock); + ym2148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast(device).m_txd_handler.set_callback(object); } diff --git a/src/devices/machine/z80ctc.cpp b/src/devices/machine/z80ctc.cpp index 90e7cd2bdcd..276254d96f1 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 - constructor //------------------------------------------------- -z80ctc_device::z80ctc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +z80ctc_device::z80ctc_device(const machine_config &mconfig, const char *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 2f01b4b4710..2c3002e1166 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, std::string tag, device_t *owner, UINT32 clock); + z80ctc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_intr_callback(device_t &device, _Object object) { return downcast(device).m_intr_cb.set_callback(object); } template static devcb_base &set_zc0_callback(device_t &device, _Object object) { return downcast(device).m_zc0_cb.set_callback(object); } diff --git a/src/devices/machine/z80dart.cpp b/src/devices/machine/z80dart.cpp index 69a3c2de16f..e976080881f 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +z80dart_device::z80dart_device(const machine_config &mconfig, const char *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, std::string tag, d elem = 0; } -z80sio0_device::z80sio0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +z80sio0_device::z80sio0_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +z80sio1_device::z80sio1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +z80sio2_device::z80sio2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +z80sio3_device::z80sio3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +z80sio4_device::z80sio4_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +i8274_device::i8274_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +upd7201_device::upd7201_device(const machine_config &mconfig, const char *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().c_str())); + LOG(("Z80DART \"%s\" Reset\n", tag())); 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().c_str(), + LOG(("Z80DART \"%s\" : Interrupt State A:%d%d%d%d B:%d%d%d%d\n", tag(), 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().c_str(), state)); + LOG(("Z80DART \"%s\" : Interrupt State %u\n", tag(), state)); return state; } @@ -269,7 +269,7 @@ int z80dart_device::z80daisy_irq_ack() { int i; - LOG(("Z80DART \"%s\" Interrupt Acknowledge\n", tag().c_str())); + LOG(("Z80DART \"%s\" Interrupt Acknowledge\n", tag())); // 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().c_str(), m_chanB->m_rr[2])); + LOG(("Z80DART \"%s\" : Interrupt Acknowledge Vector %02x\n", tag(), 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().c_str())); + LOG(("Z80DART \"%s\" Return from Interrupt\n", tag())); // 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().c_str(), 'A' + index, state)); + LOG(("Z80DART \"%s\" Channel %c : Interrupt Request %u\n", tag(), '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, std::string tag, device_t *owner, UINT32 clock) +z80dart_channel::z80dart_channel(const machine_config &mconfig, const char *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().c_str(), 'A' + m_index, m_tx_data)); + LOG(("Z80DART \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + //LOG(("Z80DART \"%s\" Channel %c : Control Register Read '%02x'\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80DART \"%s\" Channel %c : Control Register Write '%02x'\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("Z80DART \"%s\" Channel %c : Null\n", m_owner->tag(), 'A' + m_index)); break; case WR0_SEND_ABORT: - 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); + 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); 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().c_str(), 'A' + m_index)); + LOG(("Z80DART \"%s\" Channel %c : Reset External/Status Interrupt\n", m_owner->tag(), 'A' + m_index)); break; case WR0_CHANNEL_RESET: // channel reset - LOG(("Z80DART \"%s\" Channel %c : Channel Reset\n", m_owner->tag().c_str(), 'A' + m_index)); + LOG(("Z80DART \"%s\" Channel %c : Channel Reset\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("Z80DART \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag(), '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().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); + 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); break; case WR0_ERROR_RESET: // error reset - LOG(("Z80DART \"%s\" Channel %c : Error Reset\n", m_owner->tag().c_str(), 'A' + m_index)); + LOG(("Z80DART \"%s\" Channel %c : Error Reset\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("Z80DART \"%s\" Channel %c : Return from Interrupt\n", m_owner->tag(), '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().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")); + 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")); switch (data & WR1_RX_INT_MODE_MASK) { case WR1_RX_INT_DISABLE: - LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag().c_str(), 'A' + m_index)); + LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag(), 'A' + m_index)); break; case WR1_RX_INT_FIRST: - LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag().c_str(), 'A' + m_index)); + LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on All Characters, Parity Affects Vector\n", m_owner->tag(), 'A' + m_index)); break; case WR1_RX_INT_ALL: - LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag().c_str(), 'A' + m_index)); + LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80DART \"%s\" Channel %c : Interrupt Vector %02x\n", m_owner->tag(), 'A' + m_index, data)); break; case 3: - 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())); + 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())); update_serial(); break; case 4: - 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())); + 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())); update_serial(); break; case 5: - 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)); + 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)); 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().c_str(), 'A' + m_index, data)); + LOG(("Z80DART \"%s\" Channel %c : Transmit Sync %02x\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80DART \"%s\" Channel %c : Receive Sync %02x\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80DART \"%s\" Channel %c : Data Register Read '%02x'\n", m_owner->tag(), '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().c_str(), 'A' + m_index, m_tx_data)); + LOG(("Z80DART \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80DART \"%s\" Channel %c : Data Register Write '%02x'\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80DART \"%s\" Channel %c : Receive Data Byte '%02x'\n", m_owner->tag(), '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().c_str(), 'A' + m_index, state)); + LOG(("Z80DART \"%s\" Channel %c : CTS %u\n", m_owner->tag(), '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().c_str(), 'A' + m_index, state)); + LOG(("Z80DART \"%s\" Channel %c : DCD %u\n", m_owner->tag(), '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().c_str(), 'A' + m_index, state)); + LOG(("Z80DART \"%s\" Channel %c : RI %u\n", m_owner->tag(), '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().c_str(), 'A' + m_index, state)); + LOG(("Z80DART \"%s\" Channel %c : SYNC %u\n", m_owner->tag(), '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().c_str(), m_index + 'A')); + //LOG(("Z80DART \"%s\" Channel %c : Receiver Clock Pulse\n", m_owner->tag(), 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().c_str(), m_index + 'A')); + //LOG(("Z80DART \"%s\" Channel %c : Transmitter Clock Pulse\n", m_owner->tag(), 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 8032ff49a58..d1efa05fd30 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, std::string tag, device_t *owner, UINT32 clock); + z80dart_channel(const machine_config &mconfig, const char *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, 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); + 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); template static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast(device).m_out_txda_cb.set_callback(object); } template static devcb_base &set_out_dtra_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + z80sio0_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + z80sio1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + z80sio2_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + z80sio3_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + z80sio4_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + i8274_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + upd7201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/machine/z80dma.cpp b/src/devices/machine/z80dma.cpp index 9513774eef2..c1f3162bebd 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 - constructor //------------------------------------------------- -z80dma_device::z80dma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +z80dma_device::z80dma_device(const machine_config &mconfig, const char *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().c_str(), state); + if (LOG) logerror("Z80DMA '%s' Interrupt State: %u\n", tag(), 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().c_str()); + if (LOG) logerror("Z80DMA '%s' Interrupt Acknowledge\n", tag()); // 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().c_str()); + if (LOG) logerror("Z80DMA '%s' Return from Interrupt\n", tag()); // 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().c_str()); + if (LOG) logerror("Z80DMA '%s' Interrupt Pending\n", tag()); 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().c_str(), m_addressA, PORTA_MEMORY ? "mem" : "i/o", m_latch); + if (DMA_LOG) logerror("Z80DMA '%s' A src: %04x %s -> data: %02x\n", tag(), 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().c_str(), m_addressB, PORTB_MEMORY ? "mem" : "i/o", m_latch); + if (DMA_LOG) logerror("Z80DMA '%s' B src: %04x %s -> data: %02x\n", tag(), 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().c_str(), m_addressB, PORTB_MEMORY ? "mem" : "i/o"); + if (DMA_LOG) logerror("Z80DMA '%s' B dst: %04x %s\n", tag(), 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().c_str(), m_addressA, PORTA_MEMORY ? "mem" : "i/o"); + if (DMA_LOG) logerror("Z80DMA '%s' A dst: %04x %s\n", tag(), 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().c_str()); + if (LOG) logerror("Z80DMA '%s' End of Block\n", tag()); 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().c_str()); + if (LOG) logerror("Z80DMA '%s' Auto Restart\n", tag()); 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().c_str(), res); + if (LOG) logerror("Z80DMA '%s' Read %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("Z80DMA '%s' WR2 %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("Z80DMA '%s' WR1 %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("Z80DMA '%s' WR0 %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("Z80DMA '%s' WR3 %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("Z80DMA '%s' WR4 %02x\n", tag(), 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().c_str(), data); + if (LOG) logerror("Z80DMA '%s' WR5 %02x\n", tag(), data); WR5 = data; } else if ((data & 0x83) == 0x83) // WR6 { - if (LOG) logerror("Z80DMA '%s' WR6 %02x\n", tag().c_str(), data); + if (LOG) logerror("Z80DMA '%s' WR6 %02x\n", tag(), 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().c_str(), data); + fatalerror("Z80DMA '%s' Unimplemented WR6 command %02x\n", tag(), data); case COMMAND_READ_STATUS_BYTE: - if (LOG) logerror("Z80DMA '%s' CMD Read status Byte\n", tag().c_str()); + if (LOG) logerror("Z80DMA '%s' CMD Read status Byte\n", tag()); 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().c_str()); + if (LOG) logerror("Z80DMA '%s' Initiate Read Sequence\n", tag()); 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().c_str()); + if (LOG) logerror("Z80DMA '%s' Reset\n", tag()); 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().c_str(), m_addressA, m_addressB, m_count); + if (LOG) logerror("Z80DMA '%s' Load A: %x B: %x N: %x\n", tag(), m_addressA, m_addressB, m_count); break; case COMMAND_DISABLE_DMA: - if (LOG) logerror("Z80DMA '%s' Disable DMA\n", tag().c_str()); + if (LOG) logerror("Z80DMA '%s' Disable DMA\n", tag()); m_dma_enabled = 0; break; case COMMAND_ENABLE_DMA: - if (LOG) logerror("Z80DMA '%s' Enable DMA\n", tag().c_str()); + if (LOG) logerror("Z80DMA '%s' Enable DMA\n", tag()); m_dma_enabled = 1; update_status(); break; case COMMAND_READ_MASK_FOLLOWS: - if (LOG) logerror("Z80DMA '%s' Set Read Mask\n", tag().c_str()); + if (LOG) logerror("Z80DMA '%s' Set Read Mask\n", tag()); m_regs_follow[m_num_follow++] = GET_REGNUM(READ_MASK); break; case COMMAND_CONTINUE: - if (LOG) logerror("Z80DMA '%s' Continue\n", tag().c_str()); + if (LOG) logerror("Z80DMA '%s' Continue\n", tag()); 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().c_str()); + if (LOG) logerror("Z80DMA '%s' Reset Port A Timing\n", tag()); PORTA_TIMING = 0; break; case COMMAND_RESET_PORT_B_TIMING: - if (LOG) logerror("Z80DMA '%s' Reset Port B Timing\n", tag().c_str()); + if (LOG) logerror("Z80DMA '%s' Reset Port B Timing\n", tag()); PORTB_TIMING = 0; break; case COMMAND_FORCE_READY: - if (LOG) logerror("Z80DMA '%s' Force Ready\n", tag().c_str()); + if (LOG) logerror("Z80DMA '%s' Force Ready\n", tag()); m_force_ready = 1; update_status(); break; case COMMAND_ENABLE_INTERRUPTS: - if (LOG) logerror("Z80DMA '%s' Enable IRQ\n", tag().c_str()); + if (LOG) logerror("Z80DMA '%s' Enable IRQ\n", tag()); WR3 |= 0x20; break; case COMMAND_DISABLE_INTERRUPTS: - if (LOG) logerror("Z80DMA '%s' Disable IRQ\n", tag().c_str()); + if (LOG) logerror("Z80DMA '%s' Disable IRQ\n", tag()); WR3 &= ~0x20; break; case COMMAND_REINITIALIZE_STATUS_BYTE: - if (LOG) logerror("Z80DMA '%s' Reinitialize status byte\n", tag().c_str()); + if (LOG) logerror("Z80DMA '%s' Reinitialize status byte\n", tag()); 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().c_str(), data); + if (LOG) logerror("Z80DMA '%s' undocumented command triggered 0x%02X!\n", tag(), data); break; default: - printf("Z80DMA '%s' Unknown WR6 command %02x\n", tag().c_str(), data); + printf("Z80DMA '%s' Unknown WR6 command %02x\n", tag(), data); } } else if(data == 0x8e) //newtype on Sharp X1, unknown purpose - printf("Z80DMA '%s' Unknown base register %02x\n", tag().c_str(), data); + printf("Z80DMA '%s' Unknown base register %02x\n", tag(), data); else - fatalerror("Z80DMA '%s' Unknown base register %02x\n", tag().c_str(), data); + fatalerror("Z80DMA '%s' Unknown base register %02x\n", tag(), data); m_cur_follow = 0; } else { - if (LOG) logerror("Z80DMA '%s' Write %02x\n", tag().c_str(), data); + if (LOG) logerror("Z80DMA '%s' Write %02x\n", tag(), 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().c_str(), state, READY_ACTIVE_HIGH); + if (LOG) logerror("Z80DMA '%s' RDY: %d Active High: %d\n", tag(), 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 1513d9e6e24..fc1c3c1175c 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, std::string tag, device_t *owner, UINT32 clock); + z80dma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_busreq_callback(device_t &device, _Object object) { return downcast(device).m_out_busreq_cb.set_callback(object); } template static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast(device).m_out_int_cb.set_callback(object); } diff --git a/src/devices/machine/z80pio.cpp b/src/devices/machine/z80pio.cpp index 6855e43d014..21541eb68ba 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 - constructor //------------------------------------------------- -z80pio_device::z80pio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +z80pio_device::z80pio_device(const machine_config &mconfig, const char *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().c_str(), 'A' + index); + if (LOG) logerror("Z80PIO '%s' Port %c Interrupt Acknowledge\n", tag(), '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().c_str(), 'A' + index); + if (LOG) logerror("Z80PIO '%s' Port %c Return from Interrupt\n", tag(), '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().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 (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 (!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().c_str(), state); + if (LOG) logerror("Z80PIO '%s' INT %u\n", tag(), 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().c_str(), 'A' + m_index); + if (LOG) m_device->logerror("Z80PIO '%s' Port %c Transfer Mode Interrupt Pending\n", m_device->tag(), '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().c_str(), 'A' + m_index, state); + if (LOG) m_device->logerror("Z80PIO '%s' Port %c Ready: %u\n", m_device->tag(), '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().c_str(), 'A' + m_index, mode); + if (LOG) m_device->logerror("Z80PIO '%s' Port %c Mode: %u\n", m_device->tag(), '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().c_str(), 'A' + m_index, mode); + m_device->logerror("Z80PIO '%s' Port %c Invalid Mode: %u!\n", m_device->tag(), '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().c_str(), 'A' + m_index, state); + if (LOG) m_device->logerror("Z80PIO '%s' Port %c Strobe: %u\n", m_device->tag(), '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().c_str(), 'A' + m_index); + if (LOG) m_device->logerror("Z80PIO '%s' Port %c Bit Control Mode Interrupt Pending\n", m_device->tag(), '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().c_str(), 'A' + m_index, data); + if (LOG) m_device->logerror("Z80PIO '%s' Port %c Interrupt Vector: %02x\n", m_device->tag(), '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().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)); + 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)); } 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().c_str(), 'A' + m_index, BIT(data, 7)); + if (LOG) m_device->logerror("Z80PIO '%s' Port %c Interrupt Enable: %u\n", m_device->tag(), '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().c_str(), 'A' + m_index, data); + m_device->logerror("Z80PIO '%s' Port %c Invalid Control Word: %02x!\n", m_device->tag(), '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().c_str(), 'A' + m_index, data); + if (LOG) m_device->logerror("Z80PIO '%s' Port %c IOR: %02x\n", m_device->tag(), '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().c_str(), 'A' + m_index, data); + if (LOG) m_device->logerror("Z80PIO '%s' Port %c Mask: %02x\n", m_device->tag(), '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 815e2cd6029..623f586891f 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, std::string tag, device_t *owner, UINT32 clock); + z80pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast(device).m_out_int_cb.set_callback(object); } template static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast(device).m_in_pa_cb.set_callback(object); } diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index 812d4e07870..d2aa4a5f5bd 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +z80scc_device::z80scc_device(const machine_config &mconfig, const char *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, std::string tag, dev elem = 0; } -scc8030_device::scc8030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +scc8030_device::scc8030_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scc80C30_device::scc80C30_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scc80230_device::scc80230_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scc8530_device::scc8530_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scc85C30_device::scc85C30_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scc85230_device::scc85230_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scc85233_device::scc85233_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +scc8523L_device::scc8523L_device(const machine_config &mconfig, const char *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().c_str())); + LOG(("%s %s \n",FUNCNAME, tag())); 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().c_str(), + LOG(("%s %s A:%d%d%d B:%d%d%d ",FUNCNAME, tag(), 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().c_str())); + LOG(("%s %s - needs fixing for SCC\n",FUNCNAME, tag())); // 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().c_str(), m_chanB->m_rr2)); + //LOG(("%s %s \n",FUNCNAME, tag(), 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().c_str())); + LOG(("%s %s \n",FUNCNAME, tag())); // 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().c_str())); + LOG(("%s %s \n",FUNCNAME, tag())); 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().c_str())); + LOG(("%s %s \n",FUNCNAME, tag())); // 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().c_str(), 'A' + index, state)); + LOG(("%s %s:%c %d \n",FUNCNAME, tag(), '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().c_str(), 'A' + index, state)); + //LOG(("Z80SCC \"%s\": %c : Interrupt Request %u\n", tag(), '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, std::string tag, device_t *owner, UINT32 clock) +z80scc_channel::z80scc_channel(const machine_config &mconfig, const char *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().c_str(), '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(), '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().c_str(), '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(), '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().c_str(), '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(), '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().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); + 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); } } @@ -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().c_str(), '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(), '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().c_str(), '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(), '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().c_str(), '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(), '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().c_str(), '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(), '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().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); + 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); } #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().c_str(), 'A' + m_index, data)); + LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data %c\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("%s(%d) \"%s\": %c \n", FUNCNAME, state, m_owner->tag(), '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().c_str())); + LOG(("%s %s\n",FUNCNAME, tag())); 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().c_str())); + LOG(("%s %s\n",FUNCNAME, tag())); 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().c_str(), __func__, 'A' + m_index, reg); + logerror("Z80SCC \"%s\" %s: %c : Unsupported RRx register:%02x\n", m_owner->tag(), __func__, 'A' + m_index, reg); } - //LOG(("Z80SCC \"%s\": %c : Register R%d read '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, reg, data)); + //LOG(("Z80SCC \"%s\": %c : Register R%d read '%02x'\n", m_owner->tag(), '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().c_str())); + LOG(("%s(%02x) %s",FUNCNAME, data, tag())); 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().c_str(), __func__, 'A' + m_index, __func__)); + LOG(("Z80SCC \"%s\" %s: %c : %s - Point High command\n", m_owner->tag(), __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().c_str(), __func__, 'A' + m_index, __func__)); + LOG(("Z80SCC \"%s\" %s: %c : %s - NULL command 2\n", m_owner->tag(), __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().c_str(), __func__, 'A' + m_index, __func__)); + LOG(("Z80SCC \"%s\" %s: %c : %s - Reset External/Status Interrupt\n", m_owner->tag(), __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().c_str(), __func__, 'A' + m_index)); + LOG(("Z80SCC \"%s\" %s: %c : Reset Highest IUS\n", m_owner->tag(), __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().c_str(), __func__, 'A' + m_index)); + LOG(("Z80SCC \"%s\" %s: %c : WR0_ERROR_RESET\n", m_owner->tag(), __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().c_str(), 'A' + m_index)); + LOG(("Z80SCC \"%s\" Channel %c : Null\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("Z80SCC \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag(), '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().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); + 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); 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().c_str(), 'A' + m_index, __func__)); + LOG(("Z80SCC \"%s\": %c : %s - Shift Left Addressing Mode - not implemented\n", m_owner->tag(), '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().c_str(), 'A' + m_index, __func__)); + LOG(("Z80SCC \"%s\": %c : %s - Shift Right Addressing Mode - not implemented\n", m_owner->tag(), 'A' + m_index, __func__)); break; default: break; - // LOG(("Z80SCC \"%s\": %c : %s - Null commands\n", m_owner->tag().c_str(), 'A' + m_index, __func__)); + // LOG(("Z80SCC \"%s\": %c : %s - Null commands\n", m_owner->tag(), '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().c_str(), 'A' + m_index, __func__, data)); + LOG(("%s(%02x) \"%s\": %c : %s - %02x\n", FUNCNAME, data, m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("%s(%d) \"%s\": %c : Transmit Buffer read %02x\n", FUNCNAME, data, m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - No reset %02x\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Channel B reset %02x\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Channel A reset %02x\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Device reset %02x\n", m_owner->tag(), '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().c_str(), 'A' + m_index, __func__, data)); + LOG(("Z80SCC \"%s\": %c : %s Misc Tx/Rx Control %02x - not implemented \n", m_owner->tag(), '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().c_str(), 'A' + m_index, __func__, data)); + LOG(("Z80SCC \"%s\": %c : %s Clock Mode Control %02x - not implemented \n", m_owner->tag(), '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().c_str(), '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(), '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().c_str(), '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(), '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().c_str(), 'A' + m_index, __func__, data)); + LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Null Command %02x\n", m_owner->tag(), '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().c_str(), 'A' + m_index, __func__)); + LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Enter Search Mode Command - not implemented\n", m_owner->tag(), '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().c_str(), 'A' + m_index, __func__)); + LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Reset Missing Clocks Command - not implemented\n", m_owner->tag(), '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().c_str(), 'A' + m_index, __func__)); + LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Disable DPLL Command - not implemented\n", m_owner->tag(), '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().c_str(), 'A' + m_index, __func__)); + LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Baudrate Generator Input DPLL Command - not implemented\n", m_owner->tag(), '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().c_str(), 'A' + m_index, __func__)); + LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits RTxC Input DPLL Command - not implemented\n", m_owner->tag(), '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().c_str(), 'A' + m_index, __func__)); + LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Set FM Mode Command - not implemented\n", m_owner->tag(), '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().c_str(), 'A' + m_index, __func__)); + LOG(("Z80SCC \"%s\": %c : %s Mics Control Bits Set NRZI Mode Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__)); break; default: - logerror("Z80SCC \"%s\": %c : %s Mics Control Bits command %02x - not implemented \n", m_owner->tag().c_str(), 'A' + m_index, __func__, data); + logerror("Z80SCC \"%s\": %c : %s Mics Control Bits command %02x - not implemented \n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + FUNCNAME, data, m_owner->tag(), '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().c_str(), 'A' + m_index, reg); + logerror("Z80SCC \"%s\": %c : Unsupported WRx register:%02x\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("%s \"%s\": %c : Data Register Read: \n", FUNCNAME, m_owner->tag(), '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().c_str(), 'A' + m_index, m_tx_data)); + LOG(("%s(%d) \"%s\": %c : Transmit Data Byte '%02x'\n", FUNCNAME, data, m_owner->tag(), '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().c_str(), 'A' + m_index, isascii(data) ? data : ' ', data)); + LOG(("%s(%d) \"%s\": %c : failed to send %c,(%02x)\n", FUNCNAME, data, m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80SCC \"%s\": %c : Receive Data Byte '%02x'\n", m_owner->tag(), '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().c_str(), __func__, 'A' + m_index, state)); + LOG(("Z80SCC \"%s\" %s: %c : CTS %u\n", m_owner->tag(), __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().c_str(), 'A' + m_index, state)); + LOG(("Z80SCC \"%s\": %c : DCD %u\n", m_owner->tag(), '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().c_str(), 'A' + m_index, state)); + LOG(("Z80SCC \"%s\": %c : RI %u\n", m_owner->tag(), '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().c_str(), 'A' + m_index, state)); + LOG(("Z80SCC \"%s\": %c : SYNC %u\n", m_owner->tag(), '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().c_str(), m_index + 'A')); + //LOG(("Z80SCC \"%s\": %c : Receiver Clock Pulse\n", m_owner->tag(), 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().c_str(), m_index + 'A')); + //LOG(("Z80SCC \"%s\": %c : Transmitter Clock Pulse\n", m_owner->tag(), 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().c_str(), '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(), '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 f5b6bebaf40..7f956ec9b74 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, std::string tag, device_t *owner, UINT32 clock); + z80scc_channel(const machine_config &mconfig, const char *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, 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); + 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); template static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast(device).m_out_txda_cb.set_callback(object); } template static devcb_base &set_out_dtra_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + scc8030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class scc80C30_device : public z80scc_device { public : - scc80C30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + scc80C30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class scc80230_device : public z80scc_device { public : - scc80230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + scc80230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class scc8530_device : public z80scc_device { public : - scc8530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + scc8530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class scc85C30_device : public z80scc_device { public : - scc85C30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + scc85C30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class scc85230_device : public z80scc_device { public : - scc85230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + scc85230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class scc85233_device : public z80scc_device { public : - scc85233_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + scc85233_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class scc8523L_device : public z80scc_device { public : - scc8523L_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + scc8523L_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // device type definition diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp index a83f235d4d6..64d9480dfbf 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +z80sio_device::z80sio_device(const machine_config &mconfig, const char *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().c_str())); + LOG(("%s \"%s\" \n", FUNCNAME, tag())); 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().c_str(), + LOG(("%s %s A:%d%d%d%d B:%d%d%d%d ",FUNCNAME, tag(), 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().c_str())); + LOG(("%s %s \n",FUNCNAME, tag())); // 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().c_str(), m_chanB->m_rr2)); + //LOG(("%s %s \n",FUNCNAME, tag(), 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().c_str())); + LOG(("%s %s \n",FUNCNAME, tag())); // 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().c_str())); + LOG(("%s %s \n",FUNCNAME, tag())); 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().c_str())); + LOG(("%s %s \n",FUNCNAME, tag())); // 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().c_str())); + LOG(("%s %s \n",FUNCNAME, tag())); #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().c_str())); + LOG(("%s %s \n",FUNCNAME, tag())); 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().c_str(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" )); + //LOG(("%s %s %c %s read\n",FUNCNAME, tag(), '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().c_str(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" )); + LOG(("%s %s %c %s write\n",FUNCNAME, tag(), '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().c_str(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" )); + //LOG(("%s %s %c %s read\n",FUNCNAME, tag(), '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().c_str(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" )); + LOG(("%s %s %c %s write\n",FUNCNAME, tag(), '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, std::string tag, device_t *owner, UINT32 clock) +z80sio_channel::z80sio_channel(const machine_config &mconfig, const char *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().c_str(), '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(), '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().c_str(), '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(), '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().c_str(), '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(), '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().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); + 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); } } @@ -636,10 +636,10 @@ void z80sio_channel::tra_callback() //------------------------------------------------- void z80sio_channel::tra_complete() { - LOG(("%s %s\n",FUNCNAME, tag().c_str())); + LOG(("%s %s\n",FUNCNAME, tag())); 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().c_str(), '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(), '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().c_str(), '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(), '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().c_str(), '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(), '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().c_str(), '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(), '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().c_str(), '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(), '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().c_str(), '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(), '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().c_str(), 'A' + m_index, data)); + LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data %02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), '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().c_str())); + LOG(("%s %s\n",FUNCNAME, tag())); 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().c_str(), 'A' + m_index)); + LOG(("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag(), '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().c_str(), 'A' + m_index)); - LOG(("%s() \"%s\" Channel %c \n", FUNCNAME, m_owner->tag().c_str(), 'A' + m_index)); + // 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)); 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().c_str())); + LOG(("%s %s\n",FUNCNAME, tag())); 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().c_str())); + LOG(("%s %s\n",FUNCNAME, tag())); 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().c_str())); + LOG(("%s %s\n",FUNCNAME, tag())); 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().c_str())); + LOG(("%s %s\n",FUNCNAME, tag())); 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().c_str())); + LOG(("%s %s\n",FUNCNAME, tag())); 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().c_str())); + LOG(("%s %s\n",FUNCNAME, tag())); // 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().c_str())); + //LOG(("%s %s\n",FUNCNAME, tag())); 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().c_str(), 'A' + m_index, reg); - LOG(("%s %s unsupported register:%02x\n",FUNCNAME, tag().c_str(), reg)); + 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)); } 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().c_str())); + LOG(("%s %s\n",FUNCNAME, tag())); switch (data & WR0_CRC_RESET_CODE_MASK) { case WR0_CRC_RESET_NULL: - LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_NULL\n", m_owner->tag().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_NULL\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_RX - not implemented\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_TX - not implemented\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_TX_UNDERRUN - not implemented\n", m_owner->tag(), '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().c_str(), '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(), '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().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : Null\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : Reset External/Status Interrupt\n", m_owner->tag(), 'A' + m_index)); break; case WR0_CHANNEL_RESET: // channel reset - LOG(("Z80SIO \"%s\" Channel %c : Channel Reset\n", m_owner->tag().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : Channel Reset\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag(), '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().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); + 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); break; case WR0_ERROR_RESET: // error reset - LOG(("Z80SIO \"%s\" Channel %c : Error Reset\n", m_owner->tag().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : Error Reset\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : Return from Interrupt\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data, WR0_REGISTER_MASK)); + LOG(("Z80SIO \"%s\" Channel %c : Unsupported WR0 command %02x mask %02x\n", m_owner->tag(), '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().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")); + 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")); switch (data & WR1_RX_INT_MODE_MASK) { case WR1_RX_INT_DISABLE: - LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag(), 'A' + m_index)); break; case WR1_RX_INT_FIRST: - LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters, Parity Affects Vector\n", m_owner->tag(), 'A' + m_index)); break; case WR1_RX_INT_ALL: - LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag().c_str(), 'A' + m_index)); + LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80SIO \"%s\" Channel %c : Interrupt Vector %02x\n", m_owner->tag(), '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().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())); + 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())); } void z80sio_channel::do_sioreg_wr4(UINT8 data) { m_wr4 = data; - 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())); + 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())); } void z80sio_channel::do_sioreg_wr5(UINT8 data) { m_wr5 = data; - 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)); + 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)); } void z80sio_channel::do_sioreg_wr6(UINT8 data) { - LOG(("Z80SIO \"%s\" Channel %c : Transmit Sync %02x\n", m_owner->tag().c_str(), 'A' + m_index, data)); + LOG(("Z80SIO \"%s\" Channel %c : Transmit Sync %02x\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80SIO \"%s\" Channel %c : Receive Sync %02x\n", m_owner->tag(), '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().c_str(), 'A' + m_index, reg); + logerror("Z80SIO \"%s\" Channel %c : Unsupported WRx register:%02x\n", m_owner->tag(), '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().c_str(), 'A' + m_index, data)); + LOG(("Z80SIO \"%s\" Channel %c : Data Register Read '%02x'\n", m_owner->tag(), '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().c_str(), 'A' + m_index, m_tx_data)); + LOG(("Z80SIO \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag(), '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().c_str(), 'A' + m_index)); + LOG(("%s(%02x) %s:%c\n",FUNCNAME, data, tag(), '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().c_str(), 'A' + m_index)); + LOG(("%s(%02x) %s:%c\n",FUNCNAME, state, tag(), '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().c_str(), 'A' + m_index, state)); + LOG(("Z80SIO \"%s\" Channel %c : DCD %u\n", m_owner->tag(), '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().c_str(), 'A' + m_index, state)); + LOG(("Z80SIO \"%s\" Channel %c : Sync %u\n", m_owner->tag(), '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().c_str(), m_index + 'A')); + //LOG(("Z80SIO \"%s\" Channel %c : Receiver Clock Pulse\n", m_owner->tag(), 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().c_str(), m_index + 'A')); + //LOG(("Z80SIO \"%s\" Channel %c : Transmitter Clock Pulse\n", m_owner->tag(), 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 b22c12e8275..3eac1e98d69 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, std::string tag, device_t *owner, UINT32 clock); + z80sio_channel(const machine_config &mconfig, const char *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, 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); + 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); template static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast(device).m_out_txda_cb.set_callback(object); } template static devcb_base &set_out_dtra_callback(device_t &device, _Object object) { return downcast(device).m_out_dtra_cb.set_callback(object); } diff --git a/src/devices/machine/z80sti.cpp b/src/devices/machine/z80sti.cpp index bdc4c1bfefa..e8900abd021 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, std::string tag, device_t *owner, UINT32 clock) +z80sti_device::z80sti_device(const machine_config &mconfig, const char *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().c_str(), state)); + LOG(("Z80STI '%s' Interrupt State: %u\n", tag(), state)); return state; } @@ -282,7 +282,7 @@ int z80sti_device::z80daisy_irq_ack() check_interrupts(); - LOG(("Z80STI '%s' Interrupt Acknowledge Vector: %02x\n", tag().c_str(), vector)); + LOG(("Z80STI '%s' Interrupt Acknowledge Vector: %02x\n", tag(), vector)); return vector; } @@ -302,7 +302,7 @@ void z80sti_device::z80daisy_irq_reti() { int i; - LOG(("Z80STI '%s' Return from Interrupt\n", tag().c_str())); + LOG(("Z80STI '%s' Return from Interrupt\n", tag())); // 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().c_str(), data)); + LOG(("Z80STI '%s' Sync Character Register: %x\n", tag(), data)); m_scr = data; break; case REGISTER_IR_TDDR: - LOG(("Z80STI '%s' Timer D Data Register: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' Timer D Data Register: %x\n", tag(), data)); m_tdr[TIMER_D] = data; break; case REGISTER_IR_TCDR: - LOG(("Z80STI '%s' Timer C Data Register: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' Timer C Data Register: %x\n", tag(), data)); m_tdr[TIMER_C] = data; break; case REGISTER_IR_AER: - LOG(("Z80STI '%s' Active Edge Register: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' Active Edge Register: %x\n", tag(), data)); m_aer = data; break; case REGISTER_IR_IERB: - LOG(("Z80STI '%s' Interrupt Enable Register B: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' Interrupt Enable Register B: %x\n", tag(), data)); m_ier = (m_ier & 0xff00) | data; check_interrupts(); break; case REGISTER_IR_IERA: - LOG(("Z80STI '%s' Interrupt Enable Register A: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' Interrupt Enable Register A: %x\n", tag(), data)); m_ier = (data << 8) | (m_ier & 0xff); check_interrupts(); break; case REGISTER_IR_DDR: - LOG(("Z80STI '%s' Data Direction Register: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' Data Direction Register: %x\n", tag(), 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().c_str(), tcc)); - LOG(("Z80STI '%s' Timer D Prescaler: %u\n", tag().c_str(), tdc)); + LOG(("Z80STI '%s' Timer C Prescaler: %u\n", tag(), tcc)); + LOG(("Z80STI '%s' Timer D Prescaler: %u\n", tag(), 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().c_str())); + LOG(("Z80STI '%s' Timer A Reset\n", tag())); 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().c_str())); + LOG(("Z80STI '%s' Timer B Reset\n", tag())); 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().c_str(), data)); + LOG(("Z80STI '%s' General Purpose I/O Register: %x\n", tag(), 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().c_str(), data)); + LOG(("Z80STI '%s' Interrupt Pending Register B: %x\n", tag(), 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().c_str(), data)); + LOG(("Z80STI '%s' Interrupt Pending Register A: %x\n", tag(), 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().c_str(), data)); + LOG(("Z80STI '%s' Interrupt In-Service Register B: %x\n", tag(), data)); m_isr &= (m_isr & 0xff00) | data; break; case REGISTER_ISRA: - LOG(("Z80STI '%s' Interrupt In-Service Register A: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' Interrupt In-Service Register A: %x\n", tag(), data)); m_isr &= (data << 8) | (m_isr & 0xff); break; case REGISTER_IMRB: - LOG(("Z80STI '%s' Interrupt Mask Register B: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' Interrupt Mask Register B: %x\n", tag(), 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().c_str(), data)); + LOG(("Z80STI '%s' Interrupt Mask Register A: %x\n", tag(), 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().c_str(), data & 0xe0)); - LOG(("Z80STI '%s' IR Address: %01x\n", tag().c_str(), data & 0x07)); + LOG(("Z80STI '%s' Interrupt Vector: %02x\n", tag(), data & 0xe0)); + LOG(("Z80STI '%s' IR Address: %01x\n", tag(), 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().c_str(), tac)); - LOG(("Z80STI '%s' Timer B Prescaler: %u\n", tag().c_str(), tbc)); + LOG(("Z80STI '%s' Timer A Prescaler: %u\n", tag(), tac)); + LOG(("Z80STI '%s' Timer B Prescaler: %u\n", tag(), 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().c_str(), data)); + LOG(("Z80STI '%s' Timer B Data Register: %x\n", tag(), data)); m_tdr[TIMER_B] = data; break; case REGISTER_TADR: - LOG(("Z80STI '%s' Timer A Data Register: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' Timer A Data Register: %x\n", tag(), data)); m_tdr[TIMER_A] = data; break; case REGISTER_UCR: - LOG(("Z80STI '%s' USART Control Register: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' USART Control Register: %x\n", tag(), data)); m_ucr = data; break; case REGISTER_RSR: - LOG(("Z80STI '%s' Receiver Status Register: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' Receiver Status Register: %x\n", tag(), data)); m_rsr = data; break; case REGISTER_TSR: - LOG(("Z80STI '%s' Transmitter Status Register: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' Transmitter Status Register: %x\n", tag(), data)); m_tsr = data; break; case REGISTER_UDR: - LOG(("Z80STI '%s' USART Data Register: %x\n", tag().c_str(), data)); + LOG(("Z80STI '%s' USART Data Register: %x\n", tag(), 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().c_str(), 'A' + index)); + //LOG(("Z80STI '%s' Timer %c Expired\n", tag(), '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().c_str(), 'A' + index)); + LOG(("Z80STI '%s' Interrupt Pending for Timer %c\n", tag(), '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().c_str(), bit)); + LOG(("Z80STI '%s' Edge Transition Detected on Bit: %u\n", tag(), bit)); if (m_ier & (1 << INT_LEVEL_GPIP[bit])) { - LOG(("Z80STI '%s' Interrupt Pending for P%u\n", tag().c_str(), bit)); + LOG(("Z80STI '%s' Interrupt Pending for P%u\n", tag(), bit)); take_interrupt(INT_LEVEL_GPIP[bit]); } diff --git a/src/devices/machine/z80sti.h b/src/devices/machine/z80sti.h index a41b1a78161..f0db981ac9e 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, std::string tag, device_t *owner, UINT32 clock); + z80sti_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast(device).m_out_int_cb.set_callback(object); } template static devcb_base &set_in_gpio_callback(device_t &device, _Object object) { return downcast(device).m_in_gpio_cb.set_callback(object); } diff --git a/src/devices/machine/z8536.cpp b/src/devices/machine/z8536.cpp index 02e027e404f..f10b1c8f97a 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().c_str(), state); + if (LOG) logerror("%s Z8536 '%s' Interrupt: %u\n", machine().describe_context(), tag(), 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().c_str()); + if (LOG) logerror("%s Z8536 '%s' Reset\n", machine().describe_context(), tag()); 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().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); + 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); } 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().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); + 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); } 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().c_str(), data); + if (LOG) logerror("%s Z8536 '%s' Port A Interrupt Vector: %02x\n", machine().describe_context(), tag(), 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().c_str(), data); + if (LOG) logerror("%s Z8536 '%s' Port B Interrupt Vector: %02x\n", machine().describe_context(), tag(), 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().c_str(), data); + if (LOG) logerror("%s Z8536 '%s' Counter/Timer Interrupt Vector: %02x\n", machine().describe_context(), tag(), 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().c_str(), data); + if (LOG) logerror("%s Z8536 '%s' Port C Data Path Polarity: %02x\n", machine().describe_context(), tag(), 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().c_str(), data); + if (LOG) logerror("%s Z8536 '%s' Port C Data Direction: %02x\n", machine().describe_context(), tag(), 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().c_str(), data); + if (LOG) logerror("%s Z8536 '%s' Port C Special I/O Control: %02x\n", machine().describe_context(), tag(), 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().c_str(), port, (data & PCS_IOE) ? 1 : 0); + if (LOG) logerror("%s Z8536 '%s' Port %c Interrupt on Error: %u\n", machine().describe_context(), tag(), 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().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; + 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; } 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().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); + 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); } 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().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; + 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; } // 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().c_str(), counter + 1, data); + if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Time Constant MSB: %02x\n", machine().describe_context(), tag(), 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().c_str(), counter + 1, data); + if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Time Constant LSB: %02x\n", machine().describe_context(), tag(), 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().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]); + 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]); } 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().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]); + 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]); if (pts == PTS_BIT) - logerror("%s Z8536 '%s' Port %c Latch on Pattern Match: %u\n", machine().describe_context(), tag().c_str(), port, (data & PMS_LPM) ? 1 : 0); + logerror("%s Z8536 '%s' Port %c Latch on Pattern Match: %u\n", machine().describe_context(), tag(), port, (data & PMS_LPM) ? 1 : 0); else - logerror("%s Z8536 '%s' Port %c Deskew Timer Enable: %u\n", machine().describe_context(), tag().c_str(), port, (data & PMS_DTE) ? 1 : 0); + logerror("%s Z8536 '%s' Port %c Deskew Timer Enable: %u\n", machine().describe_context(), tag(), 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().c_str(), BIT(offset, 3) ? 'B' : 'A', data); + if (LOG) logerror("%s Z8536 '%s' Port %c Data Path Polarity: %02x\n", machine().describe_context(), tag(), 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().c_str(), BIT(offset, 3) ? 'B' : 'A', data); + if (LOG) logerror("%s Z8536 '%s' Port %c Data Direction: %02x\n", machine().describe_context(), tag(), 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().c_str(), BIT(offset, 3) ? 'B' : 'A', data); + if (LOG) logerror("%s Z8536 '%s' Port %c Special I/O Control: %02x\n", machine().describe_context(), tag(), 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().c_str(), BIT(offset, 3) ? 'B' : 'A', data); + if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Polarity: %02x\n", machine().describe_context(), tag(), 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().c_str(), BIT(offset, 3) ? 'B' : 'A', data); + if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Transition: %02x\n", machine().describe_context(), tag(), 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().c_str(), BIT(offset, 3) ? 'B' : 'A', data); + if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Mask: %02x\n", machine().describe_context(), tag(), 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().c_str(), data, offset); + logerror("%s: Z8536 '%s' Unimplemented write %02x to register %u\n", machine().describe_context(), tag(), 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().c_str(), id + 1); + if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Interrupt Pending\n", machine().describe_context(), tag(), 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().c_str(), id + 1); + if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Terminal Count\n", machine().describe_context(), tag(), 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().c_str(), id + 1); + if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Trigger\n", machine().describe_context(), tag(), 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().c_str(), 'A' + port); + if (LOG) logerror("%s Z8536 '%s' Port %c Interrupt Pending\n", machine().describe_context(), tag(), '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().c_str(), 'A' + port, bit, state); + if (LOG) logerror("%s Z8536 '%s' Port %c Bit %u: %u\n", machine().describe_context(), tag(), '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, std::string tag, device_t *owner, UINT32 clock) : +z8536_device::z8536_device(const machine_config &mconfig, const char *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().c_str(), data); + if (LOG) logerror("%s Z8536 '%s' Interrupt Acknowledge: %02x\n", machine().describe_context(), tag(), 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 f007da8d374..45be2aab010 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, std::string tag, device_t *owner, UINT32 clock); + z8536_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_pa.set_callback(object); } diff --git a/src/devices/sound/2151intf.cpp b/src/devices/sound/2151intf.cpp index 4bbe2580d6c..e46eea7b4f6 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 - constructor //------------------------------------------------- -ym2151_device::ym2151_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2151_device::ym2151_device(const machine_config &mconfig, const char *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 e1f9bd90189..e14892e9867 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, std::string tag, device_t *owner, UINT32 clock); + ym2151_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irqhandler.set_callback(object); } diff --git a/src/devices/sound/2203intf.cpp b/src/devices/sound/2203intf.cpp index 3a1252015f1..8b1bada64ec 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2203_device::ym2203_device(const machine_config &mconfig, const char *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 6dee36ca7a3..d9c44c2f7c7 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, std::string tag, device_t *owner, UINT32 clock); + ym2203_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/2413intf.cpp b/src/devices/sound/2413intf.cpp index 4c501a02025..2010264313d 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2413_device::ym2413_device(const machine_config &mconfig, const char *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 cfab8b01018..6c188877000 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, std::string tag, device_t *owner, UINT32 clock); + ym2413_device(const machine_config &mconfig, const char *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 efc181382e2..ba6baba7bce 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2608_device::ym2608_device(const machine_config &mconfig, const char *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 3a9c115fe60..f827f998521 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, std::string tag, device_t *owner, UINT32 clock); + ym2608_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/2610intf.cpp b/src/devices/sound/2610intf.cpp index 004df9a8335..9111b03502c 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2610_device::ym2610_device(const machine_config &mconfig, const char *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, std::string 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, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2610b_device::ym2610b_device(const machine_config &mconfig, const char *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 cb7b1acbbc0..c4409e46f21 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, 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); + 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); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + ym2610b_device(const machine_config &mconfig, const char *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 0771157b56d..c606f4eaece 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2612_device::ym2612_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_irq_handler(*this) @@ -177,7 +177,7 @@ void ym2612_device::device_config_complete() const device_type YM3438 = &device_creator; -ym3438_device::ym3438_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym3438_device::ym3438_device(const machine_config &mconfig, const char *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 cb18940637f..0dc25ac5b25 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, 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); + 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); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + ym3438_device(const machine_config &mconfig, const char *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 ac8e8ee4917..d14497e672e 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymf262_device::ymf262_device(const machine_config &mconfig, const char *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 655dd2d45d8..7dcdbbec065 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, std::string tag, device_t *owner, UINT32 clock); + ymf262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/315-5641.cpp b/src/devices/sound/315-5641.cpp index dbc742b837c..df5341c7382 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega_315_5641_pcm_device::sega_315_5641_pcm_device(const machine_config &mconfig, const char *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 02045773cc4..49e068fb4ac 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, std::string tag, device_t *owner, UINT32 clock); + sega_315_5641_pcm_device(const machine_config &mconfig, const char *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 39c88db33a0..81ae14881f5 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym3526_device::ym3526_device(const machine_config &mconfig, const char *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 53a4c2a1f9d..20ef0876292 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, std::string tag, device_t *owner, UINT32 clock); + ym3526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/3812intf.cpp b/src/devices/sound/3812intf.cpp index 7a6fb09b4ee..192d5bba6c8 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym3812_device::ym3812_device(const machine_config &mconfig, const char *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 72c5f1b1a5a..a62c88302ab 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, std::string tag, device_t *owner, UINT32 clock); + ym3812_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/8950intf.cpp b/src/devices/sound/8950intf.cpp index d50b699b48f..4454b37f941 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +y8950_device::y8950_device(const machine_config &mconfig, const char *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 080bfe1c908..53a35111f77 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, std::string tag, device_t *owner, UINT32 clock); + y8950_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/aica.cpp b/src/devices/sound/aica.cpp index cbc15951a7a..524ef93d6bd 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +aica_device::aica_device(const machine_config &mconfig, const char *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 3f9544a5ce8..0494ecafad6 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, std::string tag, device_t *owner, UINT32 clock); + aica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_master(device_t &device) { downcast(device).m_master = true; } static void set_roffset(device_t &device, int roffset) { downcast(device).m_roffset = roffset; } diff --git a/src/devices/sound/amiga.cpp b/src/devices/sound/amiga.cpp index e17a329ae6f..d11e115a59e 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 - constructor //------------------------------------------------- -amiga_sound_device::amiga_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +amiga_sound_device::amiga_sound_device(const machine_config &mconfig, const char *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 b40e6b14b56..e93ff6a86a3 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, std::string tag, device_t *owner, UINT32 clock); + amiga_sound_device(const machine_config &mconfig, const char *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 e9572c37a57..c2692af9912 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 - constructor //------------------------------------------------- -asc_device::asc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +asc_device::asc_device(const machine_config &mconfig, const char *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 64bbe7e9572..ba45288888d 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, std::string tag, device_t *owner, UINT32 clock); + asc_device(const machine_config &mconfig, const char *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 8a0bbb1414b..c26af3aca19 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 - constructor //------------------------------------------------- -astrocade_device::astrocade_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +astrocade_device::astrocade_device(const machine_config &mconfig, const char *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 5bb9d6de5bd..96826a120c6 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, std::string tag, device_t *owner, UINT32 clock); + astrocade_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~astrocade_device() { } protected: diff --git a/src/devices/sound/awacs.cpp b/src/devices/sound/awacs.cpp index 1049c0f1308..4784616cdf6 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 - constructor //------------------------------------------------- -awacs_device::awacs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +awacs_device::awacs_device(const machine_config &mconfig, const char *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 14f85c86250..435508ef216 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, std::string tag, device_t *owner, UINT32 clock); + awacs_device(const machine_config &mconfig, const char *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 3b2a57bd318..cb1e1c98bcb 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().c_str()); + logerror("warning - write %02x to 8910 '%s' Port A\n",m_regs[AY_PORTA],tag()); } else { - logerror("warning: write to 8910 '%s' Port A set as input - ignored\n", tag().c_str()); + logerror("warning: write to 8910 '%s' Port A set as input - ignored\n",tag()); } 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().c_str()); + logerror("warning - write %02x to 8910 '%s' Port B\n",m_regs[AY_PORTB],tag()); } else { - logerror("warning: write to 8910 '%s' Port B set as input - ignored\n", tag().c_str()); + logerror("warning: write to 8910 '%s' Port B set as input - ignored\n",tag()); } 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().c_str(), name()); + fatalerror("Device '%s' is a %s and has no port A!", tag(), 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().c_str(), name()); + fatalerror("Device '%s' is a %s and has no port B!", tag(), 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().c_str()); + logerror("%s device '%s' using single output!\n", name(), tag()); 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().c_str()); + logerror("warning: read from 8910 '%s' Port A set as output\n",tag()); /* 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().c_str()); + logerror("%s: warning - read 8910 '%s' Port A\n",machine().describe_context(),tag()); break; case AY_PORTB: if ((m_regs[AY_ENABLE] & 0x80) != 0) - logerror("warning: read from 8910 '%s' Port B set as output\n", tag().c_str()); + logerror("warning: read from 8910 '%s' Port B set as output\n",tag()); 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().c_str()); + logerror("%s: warning - read 8910 '%s' Port B\n",machine().describe_context(),tag()); break; } @@ -1124,7 +1124,7 @@ WRITE8_MEMBER( ay8914_device::write ) const device_type AY8910 = &device_creator; -ay8910_device::ay8910_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ay8910_device::ay8910_device(const machine_config &mconfig, const char *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, std::string 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, std::string tag, device_t *owner, UINT32 clock, +ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, const char *name, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ay8912_device::ay8912_device(const machine_config &mconfig, const char *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, std::string tag, dev const device_type AY8913 = &device_creator; -ay8913_device::ay8913_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ay8913_device::ay8913_device(const machine_config &mconfig, const char *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, std::string tag, dev const device_type AY8914 = &device_creator; -ay8914_device::ay8914_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ay8914_device::ay8914_device(const machine_config &mconfig, const char *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, std::string tag, dev const device_type AY8930 = &device_creator; -ay8930_device::ay8930_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ay8930_device::ay8930_device(const machine_config &mconfig, const char *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, std::string tag, dev const device_type YM2149 = &device_creator; -ym2149_device::ym2149_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2149_device::ym2149_device(const machine_config &mconfig, const char *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, std::string tag, dev const device_type YM3439 = &device_creator; -ym3439_device::ym3439_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym3439_device::ym3439_device(const machine_config &mconfig, const char *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, std::string tag, dev const device_type YMZ284 = &device_creator; -ymz284_device::ymz284_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymz284_device::ymz284_device(const machine_config &mconfig, const char *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, std::string tag, dev const device_type YMZ294 = &device_creator; -ymz294_device::ymz294_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymz294_device::ymz294_device(const machine_config &mconfig, const char *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 853f40853ea..6fda797d679 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, 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, + 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, 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, std::string tag, device_t *owner, UINT32 clock); + ay8912_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ay8913_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ay8914_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ay8930_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ym2149_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ym3439_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ymz284_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ymz294_device(const machine_config &mconfig, const char *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 4275b7af205..e5c9362dc9f 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 - constructor //------------------------------------------------- -beep_device::beep_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +beep_device::beep_device(const machine_config &mconfig, const char *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 02f5301782b..68fddb54a29 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, std::string tag, device_t *owner, UINT32 clock); + beep_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~beep_device() { } protected: diff --git a/src/devices/sound/bsmt2000.cpp b/src/devices/sound/bsmt2000.cpp index 220ca635be3..2741f447fb5 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, std::string tag, device_t *owner, UINT32 clock) +bsmt2000_device::bsmt2000_device(const machine_config &mconfig, const char *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 f362928a94c..9c1470278b7 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, std::string tag, device_t *owner, UINT32 clock); + bsmt2000_device(const machine_config &mconfig, const char *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 22f6a3ff9c1..daaa33cd47e 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, std::string tag, device_t *owner, UINT32 clock) +c140_device::c140_device(const machine_config &mconfig, const char *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 b27a24290aa..d94818e9df7 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, std::string tag, device_t *owner, UINT32 clock); + c140_device(const machine_config &mconfig, const char *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 4638ceaffc4..2da83f0dd4d 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, std::string tag, device_t *owner, UINT32 clock) +c352_device::c352_device(const machine_config &mconfig, const char *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 0f150be41c2..d64917d3252 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, std::string tag, device_t *owner, UINT32 clock); + c352_device(const machine_config &mconfig, const char *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 ec9a0990c49..d484b8281c0 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c6280_device::c6280_device(const machine_config &mconfig, const char *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 9a92cbc3156..7b78f5efe0e 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, std::string tag, device_t *owner, UINT32 clock); + c6280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void set_devicecpu_tag(device_t &device, std::string tag) { downcast(device).m_cpudevice.set_tag(tag); } + static void set_devicecpu_tag(device_t &device, const char *tag) { downcast(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 96b96ef2baa..3223142a062 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cdda_device::cdda_device(const machine_config &mconfig, const char *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 e9619792f09..2d9b6d86584 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, std::string tag, device_t *owner, UINT32 clock); + cdda_device(const machine_config &mconfig, const char *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 257c4f43398..63515aa7c43 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 - constructor //------------------------------------------------- -cdp1863_device::cdp1863_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cdp1863_device::cdp1863_device(const machine_config &mconfig, const char *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 013cb9d7cd0..738d6368e5f 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, std::string tag, device_t *owner, UINT32 clock); + cdp1863_device(const machine_config &mconfig, const char *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 4da872409b6..9b1d1807d96 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 - constructor //------------------------------------------------- -cdp1864_device::cdp1864_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cdp1864_device::cdp1864_device(const machine_config &mconfig, const char *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 e0c3fc44d7e..b4a311caff0 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, std::string tag, device_t *owner, UINT32 clock); + cdp1864_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template void set_inlace_callback(_inlace inlace) { m_read_inlace.set_callback(inlace); } template 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 4db884823c8..5f70edc8cef 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, std::string tag, device_t *owner, UINT32 clock) : +cdp1869_device::cdp1869_device(const machine_config &mconfig, const char *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 fb630ef4479..23f538fb931 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, std::string tag, device_t *owner, UINT32 clock); + cdp1869_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_pal_ntsc_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_pal_ntsc.set_callback(object); } template static devcb_base &set_prd_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_prd.set_callback(object); } diff --git a/src/devices/sound/cem3394.cpp b/src/devices/sound/cem3394.cpp index 24768f21201..5d345fa6507 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 - constructor //------------------------------------------------- -cem3394_device::cem3394_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cem3394_device::cem3394_device(const machine_config &mconfig, const char *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 17d126e1e2f..88d2608bec1 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, std::string tag, device_t *owner, UINT32 clock); + cem3394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~cem3394_device() { } static void set_ext_input_callback(device_t &device, cem3394_ext_input_delegate callback) { downcast(device).m_ext_cb = callback; } diff --git a/src/devices/sound/dac.cpp b/src/devices/sound/dac.cpp index 166cad66794..d51b51c1410 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 - constructor //------------------------------------------------- -dac_device::dac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dac_device::dac_device(const machine_config &mconfig, const char *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 787f6ef6bc7..bd5bdf16d62 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, std::string tag, device_t *owner, UINT32 clock); + dac_device(const machine_config &mconfig, const char *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 4d20e4b5681..262e930bddf 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +digitalker_device::digitalker_device(const machine_config &mconfig, const char *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 9fc10414b16..7be2a733c56 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, std::string tag, device_t *owner, UINT32 clock); + digitalker_device(const machine_config &mconfig, const char *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 9098c43a3fc..92b00c30383 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().c_str(), log_num); + sprintf(m_name, "discrete_%s_%d.csv", m_device->tag(), 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().c_str(), log_num); + sprintf(m_name, "discrete_%s_%d.wav", m_device->tag(), 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 55326a0bd7e..22b5ebe942a 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, std::string tag, device_t *owner, UINT32 clock) +discrete_device::discrete_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, name, tag, owner, clock, "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, std::string tag, device_t *owner, UINT32 clock) +discrete_sound_device::discrete_sound_device(const machine_config &mconfig, const char *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().c_str()); + sprintf(name, "discrete%s.log", this->tag()); if (DISCRETE_DEBUGLOG) m_disclogfile = fopen(name, "w"); diff --git a/src/devices/sound/discrete.h b/src/devices/sound/discrete.h index a82f3c1b6db..e5145b39132 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, std::string tag, device_t *owner, UINT32 clock); + discrete_device(const machine_config &mconfig, device_type type, const char *name, const char *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, std::string tag, device_t *owner, UINT32 clock); + discrete_sound_device(const machine_config &mconfig, const char *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 769cfaf9f89..24e89835d06 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmadac_sound_device::dmadac_sound_device(const machine_config &mconfig, const char *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 9ec4c6afd21..6e0c4f47dd6 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, std::string tag, device_t *owner, UINT32 clock); + dmadac_sound_device(const machine_config &mconfig, const char *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 e1d25f9d72c..efe1abb405d 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, std::string tag, device_t *owner, UINT32 clock) +es1373_device::es1373_device(const machine_config &mconfig, const char *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(nullptr), + m_eslog(nullptr), m_tempCount(0), m_timer(nullptr), m_memory_space(nullptr), m_cpu_tag(nullptr), m_cpu(nullptr), m_irq_num(-1) { } -void es1373_device::set_irq_info(std::string tag, const int irq_num) +void es1373_device::set_irq_info(const char *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().c_str()); + logerror("%s: sound_stream_update DAC1 not implemented yet\n", tag()); } 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().c_str()); + logerror("%s: sound_stream_update Only SCTRL_16BIT_MONO recorded supported\n", tag()); } else { for (int i=0; i; -es5506_device::es5506_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +es5506_device::es5506_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +es5505_device::es5505_device(const machine_config &mconfig, const char *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 f9804a69647..4ccc9d2d3f6 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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() {} static void set_region0(device_t &device, const char *region0) { downcast(device).m_region0 = region0; } @@ -186,7 +186,7 @@ protected: class es5506_device : public es550x_device { public: - es5506_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + es5506_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + es5505_device(const machine_config &mconfig, const char *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 ff5de6f0239..e7fee35bbe8 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 - constructor //------------------------------------------------- -es8712_device::es8712_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +es8712_device::es8712_device(const machine_config &mconfig, const char *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().c_str(), m_start, m_end); + logerror("ES871295:'%s' requested to play invalid sample range %06x-%06x\n", tag(), m_start, m_end); if (m_playing) { diff --git a/src/devices/sound/es8712.h b/src/devices/sound/es8712.h index bceb9b16783..74e61d232dc 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, std::string tag, device_t *owner, UINT32 clock); + es8712_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~es8712_device() { } protected: diff --git a/src/devices/sound/esqpump.cpp b/src/devices/sound/esqpump.cpp index 59f8a0ec79a..496cc5c832a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +esq_5505_5510_pump::esq_5505_5510_pump(const machine_config &mconfig, const char *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 9381b6f270a..1fded404997 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, std::string tag, device_t *owner, UINT32 clock); + esq_5505_5510_pump(const machine_config &mconfig, const char *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 eeb12f1f896..cf37a4fd6d8 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 - constructor //------------------------------------------------- -filter_rc_device::filter_rc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +filter_rc_device::filter_rc_device(const machine_config &mconfig, const char *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 9f2f7fa570e..79c1abfa2ca 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, std::string tag, device_t *owner, UINT32 clock); + filter_rc_device(const machine_config &mconfig, const char *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 83260a4444d..e980b502b8e 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 - constructor //------------------------------------------------- -filter_volume_device::filter_volume_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +filter_volume_device::filter_volume_device(const machine_config &mconfig, const char *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 ac247bbe5ca..f9b090002c3 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, std::string tag, device_t *owner, UINT32 clock); + filter_volume_device(const machine_config &mconfig, const char *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 9202e35a7e9..6fe6b0de784 100644 --- a/src/devices/sound/gaelco.cpp +++ b/src/devices/sound/gaelco.cpp @@ -56,19 +56,21 @@ static wav_file* wavraw; // Raw waveform const device_type GAELCO_GAE1 = &device_creator; -gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, const char *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_snd_data(nullptr), + m_data_tag(nullptr) { } -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) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_stream(nullptr), - m_snd_data(nullptr) + m_snd_data(nullptr), + m_data_tag(nullptr) { } @@ -268,7 +270,7 @@ void gaelco_gae1_device::device_stop() const device_type GAELCO_CG1V = &device_creator; -gaelco_cg1v_device::gaelco_cg1v_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gaelco_cg1v_device::gaelco_cg1v_device(const machine_config &mconfig, const char *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 57695f1eb48..8c128ab4bdc 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, 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(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() { } - static void set_snd_data_tag(device_t &device, std::string tag) { downcast(device).m_data_tag = tag; } + static void set_snd_data_tag(device_t &device, const char *tag) { downcast(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(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 */ - std::string m_data_tag; + const char *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, std::string tag, device_t *owner, UINT32 clock); + gaelco_cg1v_device(const machine_config &mconfig, const char *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 256e9c427e8..5c291804a90 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +hc55516_device::hc55516_device(const machine_config &mconfig, const char *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, std::string tag, d m_leak(0) { } -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) +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) : 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc3417_device::mc3417_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc3418_device::mc3418_device(const machine_config &mconfig, const char *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 f676afec8ee..cabfa02e92a 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, 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(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() {} /* 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, std::string tag, device_t *owner, UINT32 clock); + mc3417_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mc3418_device(const machine_config &mconfig, const char *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 7e46107d84a..11dc147f0b0 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i5000snd_device::i5000snd_device(const machine_config &mconfig, const char *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 3fd00b6eeee..fce3659d072 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, std::string tag, device_t *owner, UINT32 clock); + i5000snd_device(const machine_config &mconfig, const char *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 4c5411d004f..f42d1ee52e2 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ics2115_device::ics2115_device(const machine_config &mconfig, const char *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 f8ac2f65a8e..ee6bab23934 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, std::string tag, device_t *owner, UINT32 clock); + ics2115_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } diff --git a/src/devices/sound/iremga20.cpp b/src/devices/sound/iremga20.cpp index 69e8ddaff4c..b913546337e 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 - constructor //------------------------------------------------- -iremga20_device::iremga20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iremga20_device::iremga20_device(const machine_config &mconfig, const char *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 259402fb696..1b6d73674e2 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, std::string tag, device_t *owner, UINT32 clock); + iremga20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~iremga20_device() { } protected: diff --git a/src/devices/sound/k005289.cpp b/src/devices/sound/k005289.cpp index f7f058a5d3b..b49d97b1555 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 - constructor //------------------------------------------------- -k005289_device::k005289_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k005289_device::k005289_device(const machine_config &mconfig, const char *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 4c00df74e8d..24f84638263 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, std::string tag, device_t *owner, UINT32 clock); + k005289_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k005289_device() { } protected: diff --git a/src/devices/sound/k007232.cpp b/src/devices/sound/k007232.cpp index 6b692db5297..cc25519e4b9 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k007232_device::k007232_device(const machine_config &mconfig, const char *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 7fc09ebcf30..31ab2f4f3a5 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, std::string tag, device_t *owner, UINT32 clock); + k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k007232_device() {} template static devcb_base &set_port_write_handler(device_t &device, _Object object) { return downcast(device).m_port_write_handler.set_callback(object); } diff --git a/src/devices/sound/k051649.cpp b/src/devices/sound/k051649.cpp index 6db3f94b83d..dde61572d44 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 - constructor //------------------------------------------------- -k051649_device::k051649_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k051649_device::k051649_device(const machine_config &mconfig, const char *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 09b156e7a1b..f5e4997f02c 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, std::string tag, device_t *owner, UINT32 clock); + k051649_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k051649_device() { } protected: diff --git a/src/devices/sound/k053260.cpp b/src/devices/sound/k053260.cpp index 8780a873e0b..f3ebc4b2445 100644 --- a/src/devices/sound/k053260.cpp +++ b/src/devices/sound/k053260.cpp @@ -73,9 +73,10 @@ const device_type K053260 = &device_creator; // k053260_device - constructor //------------------------------------------------- -k053260_device::k053260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k053260_device::k053260_device(const machine_config &mconfig, const char *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), @@ -92,7 +93,7 @@ k053260_device::k053260_device(const machine_config &mconfig, std::string tag, d void k053260_device::device_start() { - memory_region *ROM = (!m_rgnoverride.empty()) ? owner()->memregion(m_rgnoverride) : region(); + memory_region *ROM = (m_rgnoverride) ? 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 2aba303d873..ace87855740 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, std::string tag, device_t *owner, UINT32 clock); + k053260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k053260_device() { } - static void set_region_tag(device_t &device, std::string tag) { downcast(device).m_rgnoverride = tag; } + static void set_region_tag(device_t &device, const char *tag) { downcast(device).m_rgnoverride = tag; } DECLARE_READ8_MEMBER( main_read ); DECLARE_WRITE8_MEMBER( main_write ); @@ -55,7 +55,7 @@ protected: private: // configuration - std::string m_rgnoverride; + const char * m_rgnoverride; sound_stream * m_stream; UINT8 * m_rom; diff --git a/src/devices/sound/k054539.cpp b/src/devices/sound/k054539.cpp index 86d55ee7a95..5270f5b80d6 100644 --- a/src/devices/sound/k054539.cpp +++ b/src/devices/sound/k054539.cpp @@ -17,7 +17,7 @@ const device_type K054539 = &device_creator; #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -k054539_device::k054539_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k054539_device::k054539_device(const machine_config &mconfig, const char *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 27a78c0066a..fd196d306b8 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, std::string tag, device_t *owner, UINT32 clock); + k054539_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers static void set_analog_callback(device_t &device, k054539_cb_delegate callback) { downcast(device).m_apan_cb = callback; } diff --git a/src/devices/sound/k056800.cpp b/src/devices/sound/k056800.cpp index 6e4411f9bcf..beac3a67b73 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 - constructor //------------------------------------------------- -k056800_device::k056800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k056800_device::k056800_device(const machine_config &mconfig, const char *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 dbedadef4e9..8126fa6b868 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, std::string tag, device_t *owner, UINT32 clock); + k056800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_int_handler(device_t &device, _Object object) { return downcast(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 1d9a59b85f2..ca30c79e5fc 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 - constructor //------------------------------------------------- -l7a1045_sound_device::l7a1045_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +l7a1045_sound_device::l7a1045_sound_device(const machine_config &mconfig, const char *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 59ccce387aa..e97edefc814 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, std::string tag, device_t *owner, UINT32 clock); + l7a1045_sound_device(const machine_config &mconfig, const char *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 c03a7509f7e..f4007ea875d 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().c_str()); + if (LOG) logerror("LMC1992 '%s' Input Select : OPEN\n", tag()); } else { - if (LOG) logerror("LMC1992 '%s' Input Select : INPUT%u\n", tag().c_str(), data); + if (LOG) logerror("LMC1992 '%s' Input Select : INPUT%u\n", tag(), data); } m_input = data; break; case FUNCTION_BASS: - if (LOG) logerror("LMC1992 '%s' Bass : %i dB\n", tag().c_str(), -40 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Bass : %i dB\n", tag(), -40 + (data * 2)); m_bass = data; break; case FUNCTION_TREBLE: - if (LOG) logerror("LMC1992 '%s' Treble : %i dB\n", tag().c_str(), -40 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Treble : %i dB\n", tag(), -40 + (data * 2)); m_treble = data; break; case FUNCTION_VOLUME: - if (LOG) logerror("LMC1992 '%s' Volume : %i dB\n", tag().c_str(), -80 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Volume : %i dB\n", tag(), -80 + (data * 2)); m_volume = data; break; case FUNCTION_RIGHT_FRONT_FADER: - if (LOG) logerror("LMC1992 '%s' Right Front Fader : %i dB\n", tag().c_str(), -40 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Right Front Fader : %i dB\n", tag(), -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().c_str(), -40 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Left Front Fader : %i dB\n", tag(), -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().c_str(), -40 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Right Rear Fader : %i dB\n", tag(), -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().c_str(), -40 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Left Rear Fader : %i dB\n", tag(), -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, std::string tag, device_t *owner, UINT32 clock) +lmc1992_device::lmc1992_device(const machine_config &mconfig, const char *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 7fe0b9c00f6..198b8e46dd3 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, std::string tag, device_t *owner, UINT32 clock); + lmc1992_device(const machine_config &mconfig, const char *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 bee766e0695..7b081d0a4bf 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mas3507d_device::mas3507d_device(const machine_config &mconfig, const char *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 81e401bc4a5..1244f152ede 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, std::string tag, device_t *owner, UINT32 clock); + mas3507d_device(const machine_config &mconfig, const char *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 5e9e0cdff36..f7c31e96ea9 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +mos6560_device::mos6560_device(const machine_config &mconfig, const char *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, std::string tag, d { } -mos6561_device::mos6561_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos6561_device::mos6561_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mos656x_attack_ufo_device::mos656x_attack_ufo_device(const machine_config &mconfig, const char *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 202f71385b4..d84897027d5 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, 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); + 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); template static devcb_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_potx.set_callback(object); } template static devcb_base &set_poty_rd_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + mos6561_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mos656x_attack_ufo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/sound/mos6581.cpp b/src/devices/sound/mos6581.cpp index 163f337afeb..6f9a4ae24cb 100644 --- a/src/devices/sound/mos6581.cpp +++ b/src/devices/sound/mos6581.cpp @@ -37,7 +37,7 @@ const device_type MOS8580 = &device_creator; // mos6581_device - constructor //------------------------------------------------- -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) +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) : 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(); } -mos6581_device::mos6581_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos6581_device::mos6581_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mos8580_device::mos8580_device(const machine_config &mconfig, const char *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 8a4a859b321..f0e31e7dab0 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, 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(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(); template static devcb_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + mos8580_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/sound/mos7360.cpp b/src/devices/sound/mos7360.cpp index 103bc3a68db..6478d931111 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, std::string tag, device_t *owner, UINT32 clock) +mos7360_device::mos7360_device(const machine_config &mconfig, const char *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 aea354b8ce6..cba7b398762 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, std::string tag, device_t *owner, UINT32 clock); - mos7360_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + //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); template 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 fc88a05cceb..ae925a513b8 100644 --- a/src/devices/sound/msm5205.cpp +++ b/src/devices/sound/msm5205.cpp @@ -57,7 +57,7 @@ const device_type MSM5205 = &device_creator; const device_type MSM6585 = &device_creator; -msm5205_device::msm5205_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msm5205_device::msm5205_device(const machine_config &mconfig, const char *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, std::string tag, d { } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +msm6585_device::msm6585_device(const machine_config &mconfig, const char *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().c_str()); + logerror("error: msm5205_vclk_w() called with chip = '%s', but VCLK selected master mode\n", this->device().tag()); else { if (m_vclk != vclk) diff --git a/src/devices/sound/msm5205.h b/src/devices/sound/msm5205.h index 0c8283ebbc1..6730fea7b88 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, 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(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() {} static void set_prescaler_selector(device_t &device, int select) { downcast(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, std::string tag, device_t *owner, UINT32 clock); + msm6585_device(const machine_config &mconfig, const char *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 71a72d39e35..5d3f2ddf8b0 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msm5232_device::msm5232_device(const machine_config &mconfig, const char *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 f5486860f8a..5edb00b6cff 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, std::string tag, device_t *owner, UINT32 clock); + msm5232_device(const machine_config &mconfig, const char *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 f5967947d45..0ce61d419f7 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, std::string tag, device_t *owner, UINT32 clock) +multipcm_device::multipcm_device(const machine_config &mconfig, const char *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 db87d64b2cf..3abb6bd214e 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, std::string tag, device_t *owner, UINT32 clock); + multipcm_device(const machine_config &mconfig, const char *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 2cd62df8bd3..d544eb6e4ee 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_63701x_device::namco_63701x_device(const machine_config &mconfig, const char *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 70cc9df3c02..430406b3078 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, std::string tag, device_t *owner, UINT32 clock); + namco_63701x_device(const machine_config &mconfig, const char *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 69632ccf1fb..070ae056597 100644 --- a/src/devices/sound/namco.cpp +++ b/src/devices/sound/namco.cpp @@ -35,7 +35,7 @@ const device_type NAMCO = &device_creator; const device_type NAMCO_15XX = &device_creator; const device_type NAMCO_CUS30 = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +namco_device::namco_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +namco_15xx_device::namco_15xx_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +namco_cus30_device::namco_cus30_device(const machine_config &mconfig, const char *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 27cd8d85fef..e79484e4f4a 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + namco_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + namco_15xx_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + namco_cus30_device(const machine_config &mconfig, const char *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 c5edec692d4..3792311c77e 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nesapu_device::nesapu_device(const machine_config &mconfig, const char *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, std::string tag, dev } } -void nesapu_device::set_tag_memory(std::string tag) +void nesapu_device::set_tag_memory(const char *tag) { /* Initialize individual chips */ - if (!tag.empty()) + if (tag) (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 d158c39b830..6c1b51cc8fd 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, std::string tag, device_t *owner, UINT32 clock); + nesapu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~nesapu_device() {} - static void set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu_tag = tag; } - void set_tag_memory(std::string tag); + static void set_cpu_tag(device_t &device, const char *tag) { downcast(device).m_cpu_tag = tag; } + void set_tag_memory(const char *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; - std::string m_cpu_tag; + const char *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 4687b5f4944..3a21b1c6415 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nile_device::nile_device(const machine_config &mconfig, const char *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 4c9877d6a79..4265f439813 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, std::string tag, device_t *owner, UINT32 clock); + nile_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~nile_device() { } protected: diff --git a/src/devices/sound/okim6258.cpp b/src/devices/sound/okim6258.cpp index 898faee501c..e317696efa6 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 - constructor //------------------------------------------------- -okim6258_device::okim6258_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +okim6258_device::okim6258_device(const machine_config &mconfig, const char *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 49e67ae9f09..ecb5e8938c5 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, std::string tag, device_t *owner, UINT32 clock); + okim6258_device(const machine_config &mconfig, const char *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 bbee369c008..7e97d04e916 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, std::string tag, device_t *owner, UINT32 clock) +okim6295_device::okim6295_device(const machine_config &mconfig, const char *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().c_str(),m_command); + logerror("OKIM6295:'%s' requested to play invalid sample %02x\n",tag(),m_command); } } else { - logerror("OKIM6295:'%s' requested to play sample %02x on non-stopped voice\n", tag().c_str(),m_command); + logerror("OKIM6295:'%s' requested to play sample %02x on non-stopped voice\n",tag(),m_command); } } diff --git a/src/devices/sound/okim6295.h b/src/devices/sound/okim6295.h index b641c37a5a6..36be5b3a084 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, std::string tag, device_t *owner, UINT32 clock); + okim6295_device(const machine_config &mconfig, const char *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 89bb7661eb6..e4a74eefdb5 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +okim6376_device::okim6376_device(const machine_config &mconfig, const char *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().c_str(),m_nar)); + MSM6376LOG(("OKIM6376:'%s' NAR %x\n",tag(),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().c_str(),state)); + MSM6376LOG(("OKIM6376:'%s' CH2 %x\n",tag(),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().c_str())); + MSM6376LOG(("OKIM6376:'%s' Channel 1\n",tag())); 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().c_str())); + MSM6376LOG(("OKIM6376:'%s' Channel 0\n",tag())); 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().c_str(),state)); + MSM6376LOG(("OKIM6376:'%s' ST %x\n",tag(),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().c_str(),m_st_pulses)); + MSM6376LOG(("OKIM6376:'%s' ST pulses %x\n",tag(),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 4abf8245a3e..df5255291b1 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, std::string tag, device_t *owner, UINT32 clock); + okim6376_device(const machine_config &mconfig, const char *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 028aae5c157..cd89d77a3e0 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, std::string tag, device_t *owner, UINT32 clock) +okim9810_device::okim9810_device(const machine_config &mconfig, const char *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 ec6ee805f82..ea37366288e 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, std::string tag, device_t *owner, UINT32 clock); + okim9810_device(const machine_config &mconfig, const char *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 a93b70dfc94..84018534e46 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, std::string tag, device_t *owner, UINT32 clock) +ac97_device::ac97_device(const machine_config &mconfig, const char *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 e62b95ecab1..185a89084e2 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, std::string tag, device_t *owner, UINT32 clock); + ac97_device(const machine_config &mconfig, const char *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 e188cb44c35..b23980c8b05 100644 --- a/src/devices/sound/pokey.cpp +++ b/src/devices/sound/pokey.cpp @@ -177,7 +177,7 @@ const device_type POKEY = &device_creator; // okim9810_device - constructor //------------------------------------------------- -pokey_device::pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pokey_device::pokey_device(const machine_config &mconfig, const char *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().c_str(), pot, data)); + LOG(("POKEY '%s' read POT%d (final value) $%02x\n", tag(), pot, data)); } else { data = m_pot_counter; - LOG(("POKEY '%s' read POT%d (interpolated) $%02x\n", tag().c_str(), pot, data)); + LOG(("POKEY '%s' read POT%d (interpolated) $%02x\n", tag(), 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().c_str(), data)); + LOG(("POKEY '%s' ALLPOT internal $%02x (reset)\n", tag(), 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().c_str(), data)); + LOG(("%s: POKEY '%s' ALLPOT callback $%02x\n", machine().describe_context(), tag(), data)); } else { data = m_ALLPOT ^ 0xff; - LOG(("POKEY '%s' ALLPOT internal $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' ALLPOT internal $%02x\n", tag(), 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().c_str(), m_p9, data)); + LOG_RAND(("POKEY '%s' rand9[$%05x]: $%02x\n", tag(), m_p9, data)); } else { data = (m_poly17[m_p17] >> 8) & 0xff; - LOG_RAND(("POKEY '%s' rand17[$%05x]: $%02x\n", tag().c_str(), m_p17, data)); + LOG_RAND(("POKEY '%s' rand17[$%05x]: $%02x\n", tag(), 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().c_str(), data)); + LOG(("POKEY '%s' SERIN $%02x\n", tag(), 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().c_str(), data)); + LOG(("POKEY '%s' IRQST $%02x\n", tag(), data)); break; case SKSTAT_C: /* SKSTAT is also an active low input port */ data = m_SKSTAT ^ 0xff; - LOG(("POKEY '%s' SKSTAT $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' SKSTAT $%02x\n", tag(), data)); break; default: - LOG(("POKEY '%s' register $%02x\n", tag().c_str(), offset)); + LOG(("POKEY '%s' register $%02x\n", tag(), 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().c_str(), data)); + LOG_SOUND(("POKEY '%s' AUDF1 $%02x\n", tag(), data)); m_channel[CHAN1].m_AUDF = data; break; case AUDC1_C: - LOG_SOUND(("POKEY '%s' AUDC1 $%02x (%s)\n", tag().c_str(), data, audc2str(data))); + LOG_SOUND(("POKEY '%s' AUDC1 $%02x (%s)\n", tag(), data, audc2str(data))); m_channel[CHAN1].m_AUDC = data; break; case AUDF2_C: - LOG_SOUND(("POKEY '%s' AUDF2 $%02x\n", tag().c_str(), data)); + LOG_SOUND(("POKEY '%s' AUDF2 $%02x\n", tag(), data)); m_channel[CHAN2].m_AUDF = data; break; case AUDC2_C: - LOG_SOUND(("POKEY '%s' AUDC2 $%02x (%s)\n", tag().c_str(), data, audc2str(data))); + LOG_SOUND(("POKEY '%s' AUDC2 $%02x (%s)\n", tag(), data, audc2str(data))); m_channel[CHAN2].m_AUDC = data; break; case AUDF3_C: - LOG_SOUND(("POKEY '%s' AUDF3 $%02x\n", tag().c_str(), data)); + LOG_SOUND(("POKEY '%s' AUDF3 $%02x\n", tag(), data)); m_channel[CHAN3].m_AUDF = data; break; case AUDC3_C: - LOG_SOUND(("POKEY '%s' AUDC3 $%02x (%s)\n", tag().c_str(), data, audc2str(data))); + LOG_SOUND(("POKEY '%s' AUDC3 $%02x (%s)\n", tag(), data, audc2str(data))); m_channel[CHAN3].m_AUDC = data; break; case AUDF4_C: - LOG_SOUND(("POKEY '%s' AUDF4 $%02x\n", tag().c_str(), data)); + LOG_SOUND(("POKEY '%s' AUDF4 $%02x\n", tag(), data)); m_channel[CHAN4].m_AUDF = data; break; case AUDC4_C: - LOG_SOUND(("POKEY '%s' AUDC4 $%02x (%s)\n", tag().c_str(), data, audc2str(data))); + LOG_SOUND(("POKEY '%s' AUDC4 $%02x (%s)\n", tag(), 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().c_str(), data, audctl2str(data))); + LOG_SOUND(("POKEY '%s' AUDCTL $%02x (%s)\n", tag(), data, audctl2str(data))); m_AUDCTL = data; break; case STIMER_C: - LOG_TIMER(("POKEY '%s' STIMER $%02x\n", tag().c_str(), data)); + LOG_TIMER(("POKEY '%s' STIMER $%02x\n", tag(), 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().c_str(), data)); + LOG(("POKEY '%s' SKREST $%02x\n", tag(), data)); m_SKSTAT &= ~(SK_FRAME|SK_OVERRUN|SK_KBERR); break; case POTGO_C: - LOG(("POKEY '%s' POTGO $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' POTGO $%02x\n", tag(), data)); pokey_potgo(); break; case SEROUT_C: - LOG(("POKEY '%s' SEROUT $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' SEROUT $%02x\n", tag(), 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().c_str(), data)); + LOG(("POKEY '%s' IRQEN $%02x\n", tag(), 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().c_str(), data)); + LOG(("POKEY '%s' SKCTL $%02x\n", tag(), 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().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), 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().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), 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().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), 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().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), 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().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), 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().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), 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().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), 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().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), 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().c_str(), j, rTot / (rTot+pull_up)*4.75)); + LOG(("%s: %3d - %4.3f\n", tag(), 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 ed625974f2c..f555ae4b5b0 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, std::string tag, device_t *owner, UINT32 clock); + pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_pot0_r_callback(device_t &device, _Object object) { return downcast(device).m_pot0_r_cb.set_callback(object); } template static devcb_base &set_pot1_r_callback(device_t &device, _Object object) { return downcast(device).m_pot1_r_cb.set_callback(object); } diff --git a/src/devices/sound/qs1000.cpp b/src/devices/sound/qs1000.cpp index 688e6097b94..a892945adad 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, std::string tag, device_t *owner, UINT32 clock) +qs1000_device::qs1000_device(const machine_config &mconfig, const char *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 d1a3388fa84..1543a01b057 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, std::string tag, device_t *owner, UINT32 clock); + qs1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_external_rom(device_t &device, bool external_rom) { downcast(device).m_external_rom = external_rom; } template static devcb_base &set_in_p1_callback(device_t &device, _Object object) { return downcast(device).m_in_p1_cb.set_callback(object); } diff --git a/src/devices/sound/qsound.cpp b/src/devices/sound/qsound.cpp index 0cb335fdce6..cc5fc28560a 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, std::string tag, device_t *owner, UINT32 clock) +qsound_device::qsound_device(const machine_config &mconfig, const char *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 18ddb71dc2a..cd90136238e 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, std::string tag, device_t *owner, UINT32 clock); + qsound_device(const machine_config &mconfig, const char *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 8477fa6ae53..ad381817ccf 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 - constructor //------------------------------------------------- -rf5c400_device::rf5c400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rf5c400_device::rf5c400_device(const machine_config &mconfig, const char *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 d84df4bfb33..fd04b788f93 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, std::string tag, device_t *owner, UINT32 clock); + rf5c400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~rf5c400_device() { } protected: diff --git a/src/devices/sound/rf5c68.cpp b/src/devices/sound/rf5c68.cpp index 28e95a6cfb9..8b5273bf5c4 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 - constructor //------------------------------------------------- -rf5c68_device::rf5c68_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rf5c68_device::rf5c68_device(const machine_config &mconfig, const char *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 ed948d8f474..b8ebe577e0e 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, std::string tag, device_t *owner, UINT32 clock); + rf5c68_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~rf5c68_device() { } static void set_end_callback(device_t &device, rf5c68_sample_end_cb_delegate callback) { downcast(device).m_sample_end_cb = callback; } diff --git a/src/devices/sound/s14001a.cpp b/src/devices/sound/s14001a.cpp index 4100a9c3dcc..f806ba3c358 100644 --- a/src/devices/sound/s14001a.cpp +++ b/src/devices/sound/s14001a.cpp @@ -570,7 +570,7 @@ void s14001a_device::set_volume(int volume) const device_type S14001A = &device_creator; -s14001a_device::s14001a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s14001a_device::s14001a_device(const machine_config &mconfig, const char *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 3ade4bb0d1e..5c7b2ad379b 100644 --- a/src/devices/sound/s14001a.h +++ b/src/devices/sound/s14001a.h @@ -19,7 +19,7 @@ class s14001a_device : public device_t, public device_sound_interface { public: - s14001a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + s14001a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s14001a_device() {} // static configuration helpers diff --git a/src/devices/sound/saa1099.cpp b/src/devices/sound/saa1099.cpp index 2665a52db88..22ec858a36c 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 - constructor //------------------------------------------------- -saa1099_device::saa1099_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saa1099_device::saa1099_device(const machine_config &mconfig, const char *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().c_str()); + logerror("%s: (SAA1099 '%s') Unknown register selected\n", machine().describe_context(), tag()); } 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().c_str()); + logerror("%s: (SAA1099 '%s') -reg 0x1c- Chip reset\n", machine().describe_context(), tag()); 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().c_str(), reg, data); + logerror("%s: (SAA1099 '%s') Unknown operation (reg:%02x, data:%02x)\n", machine().describe_context(), tag(), reg, data); } } diff --git a/src/devices/sound/saa1099.h b/src/devices/sound/saa1099.h index 04420ffd968..b2c67e66edd 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, std::string tag, device_t *owner, UINT32 clock); + saa1099_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~saa1099_device() { } protected: diff --git a/src/devices/sound/samples.cpp b/src/devices/sound/samples.cpp index e7100d1f054..7a756dbb0fe 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 - constructors //------------------------------------------------- -samples_device::samples_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +samples_device::samples_device(const machine_config &mconfig, const char *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, std::string tag, d { } -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) +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) : 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().c_str(), samplename); + logerror("%s: Sample '%s' NOT FOUND\n", tag(), samplename); ok = false; } } diff --git a/src/devices/sound/samples.h b/src/devices/sound/samples.h index 7d42a2f0f0c..f1512853a6a 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, std::string tag, device_t *owner, UINT32 clock); + samples_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers static void static_set_channels(device_t &device, UINT8 channels) { downcast(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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); // device-level overrides virtual void device_start() override; diff --git a/src/devices/sound/sb0400.cpp b/src/devices/sound/sb0400.cpp index 1670f810a3a..343cb6aecaa 100644 --- a/src/devices/sound/sb0400.cpp +++ b/src/devices/sound/sb0400.cpp @@ -7,7 +7,7 @@ const device_type SB0400 = &device_creator; DEVICE_ADDRESS_MAP_START(map, 32, sb0400_device) ADDRESS_MAP_END -sb0400_device::sb0400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sb0400_device::sb0400_device(const machine_config &mconfig, const char *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 46a8581625e..a83ce69dbd8 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, std::string tag, device_t *owner, UINT32 clock); + sb0400_device(const machine_config &mconfig, const char *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 ba529bf5901..7a20010714d 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +scsp_device::scsp_device(const machine_config &mconfig, const char *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 (tag()==":scsp" || tag()==":scsp1") + if (strcmp(tag(), ":scsp") == 0 || strcmp(tag(), ":scsp1") == 0) { m_Master=1; } diff --git a/src/devices/sound/scsp.h b/src/devices/sound/scsp.h index dd65dd25497..981936f37db 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, std::string tag, device_t *owner, UINT32 clock); + scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_roffset(device_t &device, int roffset) { downcast(device).m_roffset = roffset; } template static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } diff --git a/src/devices/sound/segapcm.cpp b/src/devices/sound/segapcm.cpp index bbd6799bf6a..555ee019b16 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 - constructor //------------------------------------------------- -segapcm_device::segapcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segapcm_device::segapcm_device(const machine_config &mconfig, const char *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 3d47b20758d..48474134b46 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, std::string tag, device_t *owner, UINT32 clock); + segapcm_device(const machine_config &mconfig, const char *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 e331b530bf1..ba31190b5ce 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sn76477_device::sn76477_device(const machine_config &mconfig, const char *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().c_str(), m_enable, desc[m_enable])); + LOG(1, ("SN76477 '%s': Enable line (9): %d [%s]\n", tag(), 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().c_str(), m_mixer_mode, desc[m_mixer_mode])); + LOG(1, ("SN76477 '%s': Mixer mode (25-27): %d [%s]\n", tag(), 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().c_str(), m_envelope_mode, desc[m_envelope_mode])); + LOG(1, ("SN76477 '%s': Envelope mode (1,28): %d [%s]\n", tag(), 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().c_str(), m_vco_mode, desc[m_vco_mode])); + LOG(1, ("SN76477 '%s': VCO mode (22): %d [%s]\n", tag(), 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().c_str(), 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(), 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().c_str())); + LOG(1, ("SN76477 '%s': One-shot time (23,24): N/A\n", tag())); } } else { - LOG(1, ("SN76477 '%s': One-shot time (23,24): External (cap = %.2fV)\n", tag().c_str(), m_one_shot_cap_voltage)); + LOG(1, ("SN76477 '%s': One-shot time (23,24): External (cap = %.2fV)\n", tag(), 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().c_str(), 1 / (charging_time + discharging_time))); + LOG(1, ("SN76477 '%s': SLF frequency (20,21): %.2f Hz\n", tag(), 1 / (charging_time + discharging_time))); } else { - LOG(1, ("SN76477 '%s': SLF frequency (20,21): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': SLF frequency (20,21): N/A\n", tag())); } } else { - LOG(1, ("SN76477 '%s': SLF frequency (20,21): External (cap = %.2fV)\n", tag().c_str(), m_slf_cap_voltage)); + LOG(1, ("SN76477 '%s': SLF frequency (20,21): External (cap = %.2fV)\n", tag(), m_slf_cap_voltage)); } } void sn76477_device::log_vco_pitch_voltage() { - LOG(1, ("SN76477 '%s': VCO pitch voltage (19): %.2fV\n", tag().c_str(), m_pitch_voltage)); + LOG(1, ("SN76477 '%s': VCO pitch voltage (19): %.2fV\n", tag(), m_pitch_voltage)); } void sn76477_device::log_vco_duty_cycle() { - LOG(1, ("SN76477 '%s': VCO duty cycle (16,19): %.0f%%\n", tag().c_str(), compute_vco_duty_cycle() * 100.0)); + LOG(1, ("SN76477 '%s': VCO duty cycle (16,19): %.0f%%\n", tag(), 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().c_str(), min_freq, max_freq)); + LOG(1, ("SN76477 '%s': VCO frequency (17,18): %.2f Hz - %.1f Hz\n", tag(), min_freq, max_freq)); } else { - LOG(1, ("SN76477 '%s': VCO frequency (17,18): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': VCO frequency (17,18): N/A\n", tag())); } } else { - LOG(1, ("SN76477 '%s': VCO frequency (17,18): External (cap = %.2fV)\n", tag().c_str(), m_vco_cap_voltage)); + LOG(1, ("SN76477 '%s': VCO frequency (17,18): External (cap = %.2fV)\n", tag(), 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().c_str(), + LOG(1, ("SN76477 '%s': VCO ext. voltage (16): %.2fV (%.2f Hz)\n", tag(), 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().c_str(), m_vco_voltage)); + LOG(1, ("SN76477 '%s': VCO ext. voltage (16): %.2fV (saturated, no output)\n", tag(), 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().c_str())); + LOG(1, ("SN76477 '%s': Noise gen frequency (4): External\n", tag())); } else { if (compute_noise_gen_freq() > 0) { - LOG(1, ("SN76477 '%s': Noise gen frequency (4): %d Hz\n", tag().c_str(), compute_noise_gen_freq())); + LOG(1, ("SN76477 '%s': Noise gen frequency (4): %d Hz\n", tag(), compute_noise_gen_freq())); } else { - LOG(1, ("SN76477 '%s': Noise gen frequency (4): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': Noise gen frequency (4): N/A\n", tag())); } } } @@ -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().c_str(), 1 / (charging_time + discharging_time))); + LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): %.0f Hz\n", tag(), 1 / (charging_time + discharging_time))); } else { - LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): Very Large (Filtering Disabled)\n", tag().c_str())); + LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): Very Large (Filtering Disabled)\n", tag())); } } else { - LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): N/A\n", tag())); } } else { - LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): External (cap = %.2fV)\n", tag().c_str(), m_noise_filter_cap)); + LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): External (cap = %.2fV)\n", tag(), 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().c_str(), AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_charging_rate()))); + LOG(1, ("SN76477 '%s': Attack time (8,10): %.4f sec\n", tag(), AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_charging_rate()))); } else { - LOG(1, ("SN76477 '%s': Attack time (8,10): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': Attack time (8,10): N/A\n", tag())); } } else { - LOG(1, ("SN76477 '%s': Attack time (8,10): External (cap = %.2fV)\n", tag().c_str(), m_attack_decay_cap_voltage)); + LOG(1, ("SN76477 '%s': Attack time (8,10): External (cap = %.2fV)\n", tag(), 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().c_str(), AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_discharging_rate()))); + LOG(1, ("SN76477 '%s': Decay time (7,8): %.4f sec\n", tag(), AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_discharging_rate()))); } else { - LOG(1, ("SN76477 '%s': Decay time (8,10): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': Decay time (8,10): N/A\n", tag())); } } else { - LOG(1, ("SN76477 '%s': Decay time (7, 8): External (cap = %.2fV)\n", tag().c_str(), m_attack_decay_cap_voltage)); + LOG(1, ("SN76477 '%s': Decay time (7, 8): External (cap = %.2fV)\n", tag(), 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().c_str(), + tag(), 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().c_str()); + sprintf(wav_file_name, LOG_WAV_FILE_NAME, tag()); m_file = wav_open(wav_file_name, m_our_sample_rate, 2); - LOG(1, ("SN76477 '%s': Logging output: %s\n", tag().c_str(), wav_file_name)); + LOG(1, ("SN76477 '%s': Logging output: %s\n", tag(), wav_file_name)); } diff --git a/src/devices/sound/sn76477.h b/src/devices/sound/sn76477.h index a614ad07715..6c582c74b09 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, std::string tag, device_t *owner, UINT32 clock); + sn76477_device(const machine_config &mconfig, const char *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 79546e16be8..f39fc04bc38 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, - std::string tag, int feedbackmask, int noisetap1, int noisetap2, bool negate, bool stereo, int clockdivider, int sega, + const char *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, std::string tag, device_t *owner, UINT32 clock) +sn76496_device::sn76496_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +u8106_device::u8106_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +y2404_device::y2404_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sn76489_device::sn76489_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sn76489a_device::sn76489a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sn76494_device::sn76494_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sn94624_device::sn94624_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ncr7496_device::ncr7496_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +gamegear_device::gamegear_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +segapsg_device::segapsg_device(const machine_config &mconfig, const char *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 f7f9bea7714..28a685959ad 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, std::string tag, + 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, 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, std::string tag, device_t *owner, UINT32 clock); + sn76496_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + u8106_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + y2404_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sn76489_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sn76489a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sn76494_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sn94624_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ncr7496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // Verified by Justin Kerk class gamegear_device : public sn76496_base_device { public: - gamegear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gamegear_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + segapsg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; #endif /* __SN76496_H__ */ diff --git a/src/devices/sound/snkwave.cpp b/src/devices/sound/snkwave.cpp index 2bbf95abd26..79a6ed1bcb4 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 - constructor //------------------------------------------------- -snkwave_device::snkwave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +snkwave_device::snkwave_device(const machine_config &mconfig, const char *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 de5248e115e..07c45c96134 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, std::string tag, device_t *owner, UINT32 clock); + snkwave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~snkwave_device() { } protected: diff --git a/src/devices/sound/sp0250.cpp b/src/devices/sound/sp0250.cpp index fa9b0bc1d52..004cd6d6921 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sp0250_device::sp0250_device(const machine_config &mconfig, const char *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 8bc6cdc8ca9..ab3b11220ff 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, std::string tag, device_t *owner, UINT32 clock); + sp0250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~sp0250_device() {} template static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast(device).m_drq.set_callback(object); } diff --git a/src/devices/sound/sp0256.cpp b/src/devices/sound/sp0256.cpp index 24ad62d68cb..f009516a807 100644 --- a/src/devices/sound/sp0256.cpp +++ b/src/devices/sound/sp0256.cpp @@ -95,7 +95,7 @@ const device_type SP0256 = &device_creator; // LIVE DEVICE //************************************************************************** -sp0256_device::sp0256_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sp0256_device::sp0256_device(const machine_config &mconfig, const char *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 9d0756a5ae3..c7215cb4e6c 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, std::string tag, device_t *owner, UINT32 clock); + sp0256_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~sp0256_device() { } template static devcb_base &set_data_request_callback(device_t &device, _Object object) { return downcast(device).m_drq_cb.set_callback(object); } diff --git a/src/devices/sound/speaker.cpp b/src/devices/sound/speaker.cpp index 4f2fd4bd8e9..7872351a0e3 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +speaker_sound_device::speaker_sound_device(const machine_config &mconfig, const char *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 65c0ba87a69..8b2bce895d0 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, std::string tag, device_t *owner, UINT32 clock); + speaker_sound_device(const machine_config &mconfig, const char *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 619e060237a..3686fab3f9d 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, std::string tag, device_t *owner, UINT32 clock) : +spu_device::spu_device(const machine_config &mconfig, const char *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 0009f05ddb5..6381464c7cd 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, std::string tag, device_t *owner, UINT32 clock); + spu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/st0016.cpp b/src/devices/sound/st0016.cpp index a59bff84496..59a2c3bdc7d 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 - constructor //------------------------------------------------- -st0016_device::st0016_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +st0016_device::st0016_device(const machine_config &mconfig, const char *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 b1fd2a1f6cd..6eb9f521ef6 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, std::string tag, device_t *owner, UINT32 clock); + st0016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~st0016_device() { } template static devcb_base &set_soundram_callback(device_t &device, _Object object) { return downcast(device).m_ram_read_cb.set_callback(object); } diff --git a/src/devices/sound/t6721a.cpp b/src/devices/sound/t6721a.cpp index e53c5d25973..d5c48f89e4b 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 - constructor //------------------------------------------------- -t6721a_device::t6721a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +t6721a_device::t6721a_device(const machine_config &mconfig, const char *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 10a20e0e774..51f952cdf80 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, std::string tag, device_t *owner, UINT32 clock); + t6721a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template 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 cac62a8275d..25303ec4f1b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +t6w28_device::t6w28_device(const machine_config &mconfig, const char *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 8e56377e612..7e3cc39f7e4 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, std::string tag, device_t *owner, UINT32 clock); + t6w28_device(const machine_config &mconfig, const char *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 1c30765b90f..06759146d93 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc8830f_device::tc8830f_device(const machine_config &mconfig, const char *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 bda1674cf9a..655e83167a6 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, std::string tag, device_t *owner, UINT32 clock); + tc8830f_device(const machine_config &mconfig, const char *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 903f96fa51b..a16fe0698dc 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 - constructor //------------------------------------------------- -tia_device::tia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tia_device::tia_device(const machine_config &mconfig, const char *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 5f9aff57e39..37d9f276459 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, std::string tag, device_t *owner, UINT32 clock); + tia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tia_device() { } protected: diff --git a/src/devices/sound/tms3615.cpp b/src/devices/sound/tms3615.cpp index 3201e3addcb..a37cc81a654 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 - constructor //------------------------------------------------- -tms3615_device::tms3615_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms3615_device::tms3615_device(const machine_config &mconfig, const char *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 1cbbb698301..c63ef18e7c3 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, std::string tag, device_t *owner, UINT32 clock); + tms3615_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tms3615_device() { } protected: diff --git a/src/devices/sound/tms36xx.cpp b/src/devices/sound/tms36xx.cpp index 10eac82aa38..d8052d7651a 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 - constructor //------------------------------------------------- -tms36xx_device::tms36xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms36xx_device::tms36xx_device(const machine_config &mconfig, const char *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 565f84918a6..8bb13316771 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, std::string tag, device_t *owner, UINT32 clock); + tms36xx_device(const machine_config &mconfig, const char *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 3d6c8520083..724e2b02c98 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5110_device::tms5110_device(const machine_config &mconfig, const char *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, std::string tag, d { } -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) +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) : 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5100_device::tms5100_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tmc0281_device::tmc0281_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5100a_device::tms5100a_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tmc0281d_device::tmc0281d_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cd2801_device::cd2801_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cd2802_device::cd2802_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5110a_device::tms5110a_device(const machine_config &mconfig, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m58817_device::m58817_device(const machine_config &mconfig, const char *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, std::string tag, dev const device_type TMSPROM = &device_creator; -tmsprom_device::tmsprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tmsprom_device::tmsprom_device(const machine_config &mconfig, const char *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 cd08726663e..6dd6c707fff 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, 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); + 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); template static devcb_base &set_m0_callback(device_t &device, _Object object) { return downcast(device).m_m0_cb.set_callback(object); } template static devcb_base &set_m1_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + tms5100_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tmc0281_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tms5100a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tmc0281d_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cd2801_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cd2802_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tms5110a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m58817_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tmsprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_region(device_t &device, const char *region) { downcast(device).m_prom_region = region; } static void set_rom_size(device_t &device, UINT32 rom_size) { downcast(device).m_rom_size = rom_size; } diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp index f5b2fd9c202..ac512ffb004 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.empty()) + if (m_speechrom_tag) { m_speechrom = siblingdevice( m_speechrom_tag ); if( !m_speechrom ) { - throw new emu_fatalerror("Error: %s '%s' can't find speechrom '%s'\n", shortname(), tag().c_str(), m_speechrom_tag.c_str() ); + throw new emu_fatalerror("Error: %s '%s' can't find speechrom '%s'\n", shortname(), tag(), m_speechrom_tag ); } } else @@ -1904,7 +1904,7 @@ void tms5220_device::set_frequency(int frequency) const device_type TMS5220C = &device_creator; -tms5220c_device::tms5220c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5220c_device::tms5220c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5220_device(mconfig, TMS5220C, "TMS5220C", tag, owner, clock, "tms5220c", __FILE__) { } @@ -1912,19 +1912,21 @@ tms5220c_device::tms5220c_device(const machine_config &mconfig, std::string tag, const device_type TMS5220 = &device_creator; -tms5220_device::tms5220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5220_device::tms5220_device(const machine_config &mconfig, const char *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_readyq_handler(*this), + m_speechrom_tag(nullptr) { } -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) +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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_irq_handler(*this), - m_readyq_handler(*this) + m_readyq_handler(*this), + m_speechrom_tag(nullptr) { } @@ -1941,7 +1943,7 @@ void tms5220_device::device_config_complete() const device_type CD2501E = &device_creator; -cd2501e_device::cd2501e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cd2501e_device::cd2501e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5220_device(mconfig, CD2501E, "CD2501E", tag, owner, clock, "cd2501e", __FILE__) { } @@ -1949,7 +1951,7 @@ cd2501e_device::cd2501e_device(const machine_config &mconfig, std::string tag, d const device_type TMS5200 = &device_creator; -tms5200_device::tms5200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5200_device::tms5200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5220_device(mconfig, TMS5200, "TMS5200", tag, owner, clock, "tms5200", __FILE__) { } @@ -1957,7 +1959,7 @@ tms5200_device::tms5200_device(const machine_config &mconfig, std::string tag, d const device_type CD2501ECD = &device_creator; -cd2501ecd_device::cd2501ecd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cd2501ecd_device::cd2501ecd_device(const machine_config &mconfig, const char *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 b5dbf271afd..2f764eecb80 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, 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); + 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); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } template static devcb_base &set_readyq_handler(device_t &device, _Object object) { return downcast(device).m_readyq_handler.set_callback(object); } - static void set_speechrom_tag(device_t &device, std::string _tag) { downcast(device).m_speechrom_tag = _tag; } + static void set_speechrom_tag(device_t &device, const char *_tag) { downcast(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; - std::string m_speechrom_tag; + const char *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, std::string tag, device_t *owner, UINT32 clock); + tms5220c_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cd2501e_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + tms5200_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + cd2501ecd_device(const machine_config &mconfig, const char *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 b28d2ec098d..ccb07e56dc7 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, std::string tag, device_t *owner, UINT32 clock) +upd7752_device::upd7752_device(const machine_config &mconfig, const char *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 b652e23ec28..d801cef0bbe 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, std::string tag, device_t *owner, UINT32 clock); + upd7752_device(const machine_config &mconfig, const char *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 bd4c60afd01..a7e0491687f 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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd7759_device::upd7759_device(const machine_config &mconfig, const char *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, std::string 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, const char *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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd7756_device::upd7756_device(const machine_config &mconfig, const char *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 a624c51fcdd..637732b22fa 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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() {} template static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast(device).m_drqcallback.set_callback(object); } @@ -109,8 +109,8 @@ protected: class upd7759_device : public upd775x_device { public: - 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); + 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); enum { @@ -130,7 +130,7 @@ public: class upd7756_device : public upd775x_device { public: - upd7756_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + upd7756_device(const machine_config &mconfig, const char *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 672546fe41c..836a0de7eac 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vlm5030_device::vlm5030_device(const machine_config &mconfig, const char *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 e0b5a2b5508..cf2c620f13f 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, std::string tag, device_t *owner, UINT32 clock); + vlm5030_device(const machine_config &mconfig, const char *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 19543687604..d77b3669aa0 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, std::string tag, device_t *owner, UINT32 clock) +votrax_sc01_device::votrax_sc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VOTRAX_SC01, "Votrax SC-01", 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 70ebaf6a75c..540f2b5feb1 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, std::string tag, device_t *owner, UINT32 clock); + votrax_sc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_request_callback(device_t &device, _Object object) { return downcast(device).m_request_cb.set_callback(object); } diff --git a/src/devices/sound/vrc6.cpp b/src/devices/sound/vrc6.cpp index 46247931aa9..c3673afc2b3 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 - constructor //------------------------------------------------- -vrc6snd_device::vrc6snd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vrc6snd_device::vrc6snd_device(const machine_config &mconfig, const char *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 8f640f4c6d0..ba4bf2026bb 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, std::string tag, device_t *owner, UINT32 clock); + vrc6snd_device(const machine_config &mconfig, const char *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 67aafd60f47..7226f35d304 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 - constructor //------------------------------------------------- -vrender0_device::vrender0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vrender0_device::vrender0_device(const machine_config &mconfig, const char *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 d0f9292d552..490e1ff617b 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, std::string tag, device_t *owner, UINT32 clock); + vrender0_device(const machine_config &mconfig, const char *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 dc2285eaaef..650389b332e 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +wave_device::wave_device(const machine_config &mconfig, const char *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 e357713b3df..fde443b90e4 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, std::string tag, device_t *owner, UINT32 clock); + wave_device(const machine_config &mconfig, const char *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 a2ec042eb98..8a599027c24 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +x1_010_device::x1_010_device(const machine_config &mconfig, const char *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 f8ee7edb343..d5c3c075d02 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, std::string tag, device_t *owner, UINT32 clock); + x1_010_device(const machine_config &mconfig, const char *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 ec6f8c64469..14dd53be324 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymf271_device::ymf271_device(const machine_config &mconfig, const char *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 c63f27f8794..b4fbcead1af 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, std::string tag, device_t *owner, UINT32 clock); + ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/ymf278b.cpp b/src/devices/sound/ymf278b.cpp index d2837cab5dd..af186ff0100 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymf278b_device::ymf278b_device(const machine_config &mconfig, const char *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 9c8b1d371d6..6c750fcfd91 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, std::string tag, device_t *owner, UINT32 clock); + ymf278b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/ymz280b.cpp b/src/devices/sound/ymz280b.cpp index 1c9d7b56098..02c0283b4ae 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymz280b_device::ymz280b_device(const machine_config &mconfig, const char *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 1a987f70984..44cd6e16665 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, std::string tag, device_t *owner, UINT32 clock); + ymz280b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/ymz770.cpp b/src/devices/sound/ymz770.cpp index aa380501ddc..6456c346ffd 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 - constructor //------------------------------------------------- -ymz770_device::ymz770_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymz770_device::ymz770_device(const machine_config &mconfig, const char *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 92fa8c808b9..ddcd72e7bfa 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, std::string tag, device_t *owner, UINT32 clock); + ymz770_device(const machine_config &mconfig, const char *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 7f335b13c68..805acd892cc 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 - constructor //------------------------------------------------- -zsg2_device::zsg2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +zsg2_device::zsg2_device(const machine_config &mconfig, const char *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 5886878eb51..c88e2c60cc5 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, std::string tag, device_t *owner, UINT32 clock); + zsg2_device(const machine_config &mconfig, const char *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 90f3eae1fa1..399f48e9b26 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, std::string tag, device_t *owner, UINT32 clock) +sega315_5124_device::sega315_5124_device(const machine_config &mconfig, const char *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, std::str } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +sega315_5246_device::sega315_5246_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sega315_5378_device::sega315_5378_device(const machine_config &mconfig, const char *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().c_str(), reg_num, m_addr & 0xff); + //logerror("%s: %s: setting register %x to %02x\n", machine().describe_context(), tag(), 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 8d54f34a2e4..9c2f2484209 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, 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); + 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); static void set_signal_type(device_t &device, bool is_pal) { downcast(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, std::string tag, device_t *owner, UINT32 clock); + sega315_5246_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sega315_5378_device(const machine_config &mconfig, const char *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 d123db5a236..22b63f36d5b 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega315_5313_device::sega315_5313_device(const machine_config &mconfig, const char *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, std::str // palette device //------------------------------------------------- -void sega315_5313_device::static_set_palette_tag(device_t &device, std::string tag) +void sega315_5313_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/devices/video/315_5313.h b/src/devices/video/315_5313.h index 266e413f4c8..d7ca05ee2e6 100644 --- a/src/devices/video/315_5313.h +++ b/src/devices/video/315_5313.h @@ -192,14 +192,14 @@ typedef device_delegate md_32x_scanline_helper_delegate; class sega315_5313_device : public sega315_5124_device { public: - sega315_5313_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega315_5313_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_sndirqline_callback(device_t &device, _Object object) { return downcast(device).m_sndirqline_callback.set_callback(object); } template static devcb_base &set_lv6irqline_callback(device_t &device, _Object object) { return downcast(device).m_lv6irqline_callback.set_callback(object); } template static devcb_base &set_lv4irqline_callback(device_t &device, _Object object) { return downcast(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, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); static void set_md_32x_scanline(device_t &device, md_32x_scanline_delegate callback) { downcast(device).m_32x_scanline_func = callback; } static void set_md_32x_interrupt(device_t &device, md_32x_interrupt_delegate callback) { downcast(device).m_32x_interrupt_func = callback; } diff --git a/src/devices/video/bufsprite.h b/src/devices/video/bufsprite.h index 1b110733c30..3a75f5a14f6 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, std::string tag, device_t *owner, UINT32 clock) + buffered_spriteram_device(const machine_config &mconfig, device_type type, const char *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 { public: // construction - buffered_spriteram8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) + buffered_spriteram8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : buffered_spriteram_device(mconfig, BUFFERED_SPRITERAM8, tag, owner, clock) { } }; @@ -113,7 +113,7 @@ class buffered_spriteram16_device : public buffered_spriteram_device { public: // construction - buffered_spriteram16_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) + buffered_spriteram16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : buffered_spriteram_device(mconfig, BUFFERED_SPRITERAM16, tag, owner, clock) { } }; @@ -124,7 +124,7 @@ class buffered_spriteram32_device : public buffered_spriteram_device { public: // construction - buffered_spriteram32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) + buffered_spriteram32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : buffered_spriteram_device(mconfig, BUFFERED_SPRITERAM32, tag, owner, clock) { } }; @@ -135,7 +135,7 @@ class buffered_spriteram64_device : public buffered_spriteram_device { public: // construction - buffered_spriteram64_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) + buffered_spriteram64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : buffered_spriteram_device(mconfig, BUFFERED_SPRITERAM64, tag, owner, clock) { } }; diff --git a/src/devices/video/cdp1861.cpp b/src/devices/video/cdp1861.cpp index 8f020d7f3d1..a02309decca 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 - constructor //------------------------------------------------- -cdp1861_device::cdp1861_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cdp1861_device::cdp1861_device(const machine_config &mconfig, const char *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 11aa46ceb70..08b76bd59cc 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, std::string tag, device_t *owner, UINT32 clock); + cdp1861_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_dma_out_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_dma_out.set_callback(object); } diff --git a/src/devices/video/cdp1862.cpp b/src/devices/video/cdp1862.cpp index aa3ddbe9d59..e75cb66c888 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, std::string tag, device_t *owner, UINT32 clock) +cdp1862_device::cdp1862_device(const machine_config &mconfig, const char *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 9e1198453d5..36e04689500 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, std::string tag, device_t *owner, UINT32 clock); + cdp1862_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_rd_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_rd.set_callback(object); } template static devcb_base &set_bd_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_bd.set_callback(object); } diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp index 89a356148af..f7950c879a9 100644 --- a/src/devices/video/clgd542x.cpp +++ b/src/devices/video/clgd542x.cpp @@ -41,17 +41,17 @@ const device_type CIRRUS_GD5428 = &device_creator; const device_type CIRRUS_GD5430 = &device_creator; -cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +cirrus_gd5430_device::cirrus_gd5430_device(const machine_config &mconfig, const char *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 03ebe0d206a..ba9b442b360 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + cirrus_gd5430_device(const machine_config &mconfig, const char *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 33aa1888535..84ec673ec8b 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().c_str()); + if (LOG) logerror("CRT9007 '%s' INT 1\n", tag()); 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().c_str(), y, x, m_cblank); + if (LOG) logerror("CRT9007 '%s' y %03u x %04u : CBLANK %u\n", tag(), 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().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); + // 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); //} //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, std::string tag, device_t *owner, UINT32 clock) : +crt9007_t::crt9007_t(const machine_config &mconfig, const char *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().c_str(), y, x, m_hs); + if (LOG) logerror("CRT9007 '%s' y %03u x %04u : HS %u\n", tag(), 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().c_str(), y, x, m_vs); + if (LOG) logerror("CRT9007 '%s' y %03u x %04u : VS %u\n", tag(), 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().c_str(), y, x, m_vlt); + if (LOG) logerror("CRT9007 '%s' y %03u x %04u : VLT %u\n", tag(), 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().c_str(), y, x, param); + if (LOG) logerror("CRT9007 '%s' y %03u x %04u : CURS %u\n", tag(), 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().c_str(), y, x, m_drb); + if (LOG) logerror("CRT9007 '%s' y %03u x %04u : DRB %u\n", tag(), 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().c_str()); + if (LOG) logerror("CRT9007 '%s' DMAR 1\n", tag()); 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().c_str()); + if (LOG) logerror("CRT9007 '%s' Start\n", tag()); m_disp = 1; break; case 0x16: - if (LOG) logerror("CRT9007 '%s' Reset\n", tag().c_str()); + if (LOG) logerror("CRT9007 '%s' Reset\n", tag()); 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().c_str()); + if (LOG) logerror("CRT9007 '%s' INT 0\n", tag()); 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().c_str(), offset); + logerror("CRT9007 '%s' Read from Invalid Register: %02x!\n", tag(), 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().c_str(), CHARACTERS_PER_HORIZONTAL_PERIOD); + if (LOG) logerror("CRT9007 '%s' Characters per Horizontal Period: %u\n", tag(), CHARACTERS_PER_HORIZONTAL_PERIOD); break; case 0x01: recompute_parameters(); - if (LOG) logerror("CRT9007 '%s' Characters per Data Row: %u\n", tag().c_str(), CHARACTERS_PER_DATA_ROW); + if (LOG) logerror("CRT9007 '%s' Characters per Data Row: %u\n", tag(), CHARACTERS_PER_DATA_ROW); break; case 0x02: recompute_parameters(); - if (LOG) logerror("CRT9007 '%s' Horizontal Delay: %u\n", tag().c_str(), HORIZONTAL_DELAY); + if (LOG) logerror("CRT9007 '%s' Horizontal Delay: %u\n", tag(), HORIZONTAL_DELAY); break; case 0x03: recompute_parameters(); - if (LOG) logerror("CRT9007 '%s' Horizontal Sync Width: %u\n", tag().c_str(), HORIZONTAL_SYNC_WIDTH); + if (LOG) logerror("CRT9007 '%s' Horizontal Sync Width: %u\n", tag(), HORIZONTAL_SYNC_WIDTH); break; case 0x04: recompute_parameters(); - if (LOG) logerror("CRT9007 '%s' Vertical Sync Width: %u\n", tag().c_str(), VERTICAL_SYNC_WIDTH); + if (LOG) logerror("CRT9007 '%s' Vertical Sync Width: %u\n", tag(), VERTICAL_SYNC_WIDTH); break; case 0x05: recompute_parameters(); - if (LOG) logerror("CRT9007 '%s' Vertical Delay: %u\n", tag().c_str(), VERTICAL_DELAY); + if (LOG) logerror("CRT9007 '%s' Vertical Delay: %u\n", tag(), VERTICAL_DELAY); break; case 0x06: recompute_parameters(); if (LOG) { - 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); + 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); } break; case 0x07: recompute_parameters(); - if (LOG) logerror("CRT9007 '%s' Visible Data Rows per Frame: %u\n", tag().c_str(), VISIBLE_DATA_ROWS_PER_FRAME); + if (LOG) logerror("CRT9007 '%s' Visible Data Rows per Frame: %u\n", tag(), VISIBLE_DATA_ROWS_PER_FRAME); break; case 0x08: recompute_parameters(); - if (LOG) logerror("CRT9007 '%s' Scan Lines per Data Row: %u\n", tag().c_str(), SCAN_LINES_PER_DATA_ROW); + if (LOG) logerror("CRT9007 '%s' Scan Lines per Data Row: %u\n", tag(), SCAN_LINES_PER_DATA_ROW); break; case 0x09: recompute_parameters(); - if (LOG) logerror("CRT9007 '%s' Scan Lines per Frame: %u\n", tag().c_str(), SCAN_LINES_PER_FRAME); + if (LOG) logerror("CRT9007 '%s' Scan Lines per Frame: %u\n", tag(), SCAN_LINES_PER_FRAME); break; case 0x0a: if (LOG) { - 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); + 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); } break; case 0x0b: if (LOG) { - 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"); + 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"); } break; @@ -808,8 +808,8 @@ WRITE8_MEMBER( crt9007_t::write ) case 0x0d: if (LOG) { - 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); + logerror("CRT9007 '%s' Table Start Register: %04x\n", tag(), TABLE_START); + logerror("CRT9007 '%s' Address Mode: %u\n", tag(), 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().c_str(), AUXILIARY_ADDRESS_1); - logerror("CRT9007 '%s' Row Attributes: %u\n", tag().c_str(), ROW_ATTRIBUTES_1); + logerror("CRT9007 '%s' Auxialiary Address Register 1: %04x\n", tag(), AUXILIARY_ADDRESS_1); + logerror("CRT9007 '%s' Row Attributes: %u\n", tag(), ROW_ATTRIBUTES_1); } break; case 0x10: - if (LOG) logerror("CRT9007 '%s' Sequential Break Register 1: %u\n", tag().c_str(), SEQUENTIAL_BREAK_1); + if (LOG) logerror("CRT9007 '%s' Sequential Break Register 1: %u\n", tag(), SEQUENTIAL_BREAK_1); break; case 0x11: - if (LOG) logerror("CRT9007 '%s' Data Row Start Register: %u\n", tag().c_str(), DATA_ROW_START); + if (LOG) logerror("CRT9007 '%s' Data Row Start Register: %u\n", tag(), DATA_ROW_START); break; case 0x12: - if (LOG) logerror("CRT9007 '%s' Data Row End/Sequential Break Register 2: %u\n", tag().c_str(), SEQUENTIAL_BREAK_2); + if (LOG) logerror("CRT9007 '%s' Data Row End/Sequential Break Register 2: %u\n", tag(), 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().c_str(), AUXILIARY_ADDRESS_2); - logerror("CRT9007 '%s' Row Attributes: %u\n", tag().c_str(), ROW_ATTRIBUTES_2); + logerror("CRT9007 '%s' Auxiliary Address Register 2: %04x\n", tag(), AUXILIARY_ADDRESS_2); + logerror("CRT9007 '%s' Row Attributes: %u\n", tag(), ROW_ATTRIBUTES_2); } break; case 0x15: - if (LOG) logerror("CRT9007 '%s' Start\n", tag().c_str()); + if (LOG) logerror("CRT9007 '%s' Start\n", tag()); m_disp = 1; break; case 0x16: - if (LOG) logerror("CRT9007 '%s' Reset\n", tag().c_str()); + if (LOG) logerror("CRT9007 '%s' Reset\n", tag()); device_reset(); break; case 0x17: if (LOG) { - 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); + 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); } break; case 0x18: - if (LOG) logerror("CRT9007 '%s' Vertical Cursor Register: %u\n", tag().c_str(), VERTICAL_CURSOR); + if (LOG) logerror("CRT9007 '%s' Vertical Cursor Register: %u\n", tag(), VERTICAL_CURSOR); break; case 0x19: - if (LOG) logerror("CRT9007 '%s' Horizontal Cursor Register: %u\n", tag().c_str(), HORIZONTAL_CURSOR); + if (LOG) logerror("CRT9007 '%s' Horizontal Cursor Register: %u\n", tag(), HORIZONTAL_CURSOR); break; case 0x1a: if (LOG) { - 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); + 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); } break; default: - logerror("CRT9007 '%s' Write to Invalid Register: %02x!\n", tag().c_str(), offset); + logerror("CRT9007 '%s' Write to Invalid Register: %02x!\n", tag(), 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().c_str(), state); + if (LOG) logerror("CRT9007 '%s' ACK: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("CRT9007 '%s' LPSTB: %u\n", tag(), state); if (!m_lpstb && state) { diff --git a/src/devices/video/crt9007.h b/src/devices/video/crt9007.h index 68e4efaa36b..8a812a73899 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, std::string tag, device_t *owner, UINT32 clock); + crt9007_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_character_width(device_t &device, int value) { downcast(device).m_hpixels_per_column = value; } diff --git a/src/devices/video/crt9021.cpp b/src/devices/video/crt9021.cpp index 026ea9e2f06..d72baff2b2b 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 - constructor //------------------------------------------------- -crt9021_t::crt9021_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +crt9021_t::crt9021_t(const machine_config &mconfig, const char *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().c_str(), state); + if (LOG) logerror("CRT9021 '%s' LD/SH: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("CRT9021 '%s' VSYNC: %u\n", tag(), state); } diff --git a/src/devices/video/crt9021.h b/src/devices/video/crt9021.h index 56bb5f06ad6..7d38f207d3e 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, std::string tag, device_t *owner, UINT32 clock); + crt9021_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_display_callback(device_t &device, crt9021_draw_character_delegate callback) { downcast(device).m_display_cb = callback; } diff --git a/src/devices/video/crt9212.cpp b/src/devices/video/crt9212.cpp index 4b75ce1a647..0535afa169b 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 - constructor //------------------------------------------------- -crt9212_t::crt9212_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +crt9212_t::crt9212_t(const machine_config &mconfig, const char *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 1d90dc778b2..011cc8467a8 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, std::string tag, device_t *owner, UINT32 clock); + crt9212_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_wen2(device_t &device, int state) { downcast(device).m_wen2 = state; } diff --git a/src/devices/video/crtc_ega.cpp b/src/devices/video/crtc_ega.cpp index 846c99653eb..0841adcc69a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +crtc_ega_device::crtc_ega_device(const machine_config &mconfig, const char *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 df15956b2f6..0030d865d76 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, std::string tag, device_t *owner, UINT32 clock); + crtc_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_res_out_de_callback(device_t &device, _Object object) { return downcast(device).m_res_out_de_cb.set_callback(object); } diff --git a/src/devices/video/dl1416.cpp b/src/devices/video/dl1416.cpp index 722ced731fe..b017e9994e1 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, std::string 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, 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_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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dl1416b_device::dl1416b_device(const machine_config &mconfig, const char *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, std::string tag, d const device_type DL1416T = &device_creator; -dl1416t_device::dl1416t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dl1416t_device::dl1416t_device(const machine_config &mconfig, const char *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 00cb4e4f574..e3526bd95be 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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() {} template static devcb_base &set_update_handler(device_t &device, _Object object) { return downcast(device).m_update.set_callback(object); } @@ -61,7 +61,7 @@ private: class dl1416b_device : public dl1416_device { public: - dl1416b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dl1416b_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + dl1416t_device(const machine_config &mconfig, const char *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 b084a9861fa..16dee4e420f 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, std::string tag, device_t *owner, UINT32 clock) : +dm9368_device::dm9368_device(const machine_config &mconfig, const char *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().c_str()); + if (LOG) logerror("DM9368 '%s' Blanked Rippling Zero\n", tag()); // blank rippling 0 m_rbo = 0; } else { - if (LOG) logerror("DM9368 '%s' Output Data: %u = %02x\n", tag().c_str(), a, m_segment_data[a]); + if (LOG) logerror("DM9368 '%s' Output Data: %u = %02x\n", tag(), 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 d19f231bd1f..23f34de94ad 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, std::string tag, device_t *owner, UINT32 clock); + dm9368_device(const machine_config &mconfig, const char *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 8b5bf0f71c1..39654a32ba9 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, std::string tag, device_t *owner, UINT32 clock) +ef9340_1_device::ef9340_1_device(const machine_config &mconfig, const char *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 1d6bb673d1c..d92cbb5cf54 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, std::string tag, device_t *owner, UINT32 clock); + ef9340_1_device(const machine_config &mconfig, const char *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 667eba7680c..a46e32a34b7 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, std::string tag, device_t *owner, UINT32 clock) : +ef9345_device::ef9345_device(const machine_config &mconfig, const char *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, std::string tag, dev // palette device //------------------------------------------------- -void ef9345_device::static_set_palette_tag(device_t &device, std::string tag) +void ef9345_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/devices/video/ef9345.h b/src/devices/video/ef9345.h index f59a2879d8d..9179e01ab03 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, std::string tag, device_t *owner, UINT32 clock); + ef9345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); // device interface DECLARE_READ8_MEMBER( data_r ); diff --git a/src/devices/video/ef9365.cpp b/src/devices/video/ef9365.cpp index fec07e62eb8..f923cfd0813 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, std::string tag, device_t *owner, UINT32 clock) : +ef9365_device::ef9365_device(const machine_config &mconfig, const char *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, std::string tag, dev // palette device //------------------------------------------------- -void ef9365_device::static_set_palette_tag(device_t &device, std::string tag) +void ef9365_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(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 = 0; + int busy_cycles; m_state = 0; if( ( cmd>>4 ) == 0 ) diff --git a/src/devices/video/ef9365.h b/src/devices/video/ef9365.h index 2ce2464e055..e29b3adca33 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, std::string tag, device_t *owner, UINT32 clock); + ef9365_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *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 static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/video/epic12.cpp b/src/devices/video/epic12.cpp index 6cfa0be16be..fa168e5ac36 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +epic12_device::epic12_device(const machine_config &mconfig, const char *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 0da6757c6c1..5e6301b44f8 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, std::string tag, device_t *owner, UINT32 clock); + epic12_device(const machine_config &mconfig, const char *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 cfb46649a93..d75232808e9 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(const machine_config &mconfig, device_type type, const char *name, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +fixedfreq_device::fixedfreq_device(const machine_config &mconfig, const char *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 fb7b6ae3ec9..38fde1c5f3b 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, 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); + 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); // inline configuration helpers static void set_minitor_clock(device_t &device, UINT32 clock) { downcast(device).m_monitor_clock = clock; } diff --git a/src/devices/video/gf4500.cpp b/src/devices/video/gf4500.cpp index fcbe22103a6..d4b7e86f056 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gf4500_device::gf4500_device(const machine_config &mconfig, const char *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 806c15a60d3..aa8bf8ebf63 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, std::string tag, device_t *owner, UINT32 clock); + gf4500_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~gf4500_device() {} diff --git a/src/devices/video/gf7600gs.cpp b/src/devices/video/gf7600gs.cpp index f6aaed137b4..85b6b2f06da 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, std::string tag, device_t *owner, UINT32 clock) +geforce_7600gs_device::geforce_7600gs_device(const machine_config &mconfig, const char *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 84cd37ffa59..ddd36edae40 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, std::string tag, device_t *owner, UINT32 clock); + geforce_7600gs_device(const machine_config &mconfig, const char *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 4a6838f5d55..1e0d7cbb0d8 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, std::string tag, device_t *owner, UINT32 clock) +h63484_device::h63484_device(const machine_config &mconfig, const char *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().c_str(), m_ar + value); + logerror("HD63484 '%s': Address Register overflows 0x%02x\n", tag(), 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().c_str(), area, x, y); + logerror("HD63484 '%s': unsupported area detection %x (%d %d)\n", tag(), 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': \n", tag().c_str(), m_cr); - printf("H63484 '%s' Invalid Command Byte %02x\n", tag().c_str(), m_cr); + if (CMD_LOG) logerror("HD63484 '%s': \n", tag(), m_cr); + printf("H63484 '%s' Invalid Command Byte %02x\n", tag(), 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().c_str(), m_pr[0], m_pr[1]); + if (CMD_LOG) logerror("HD63484 '%s': ORG 0x%04x, 0x%04x\n", tag(), 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().c_str(), m_cr & 0x1f, m_pr[0]); + if (CMD_LOG) logerror("HD63484 '%s': WPR (%d) 0x%04x\n", tag(), 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().c_str(), m_cr & 0x1f); + if (CMD_LOG) logerror("HD63484 '%s': RPR (%d)\n", tag(), 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().c_str(), m_cr & 0x0f, m_pr[0]); + if (CMD_LOG) logerror("HD63484 '%s': WPTN (%d) %d", tag(), m_cr & 0x0f, m_pr[0]); int pra = m_cr & 0xf; for(int i=0; i> 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().c_str(), m_pr[0]); + if (CMD_LOG) logerror("HD63484 '%s': WT 0x%04x\n", tag(), 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().c_str(), m_cr & 0x03, m_pr[0]); + if (CMD_LOG) logerror("HD63484 '%s': MOD (%d) 0x%04x\n", tag(), 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().c_str(), 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(), 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().c_str(), m_pr[0], (INT16)m_pr[1], (INT16)m_pr[2]); + logerror("HD63484 '%s': CLR 0x%04x, %d, %d\n", tag(), 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().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]); + 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]); else - 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]); + 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]); } 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().c_str(), 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(), 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().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]); + 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]); 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().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]); + 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]); 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().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]); + 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]); for (int i=0; i> 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(), 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().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]); + 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]); 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().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]); + 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]); 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().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]); + 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]); 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().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]); + 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]); 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().c_str(), 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(), 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().c_str(), (m_cr >> 5) & 0x07, (m_cr >> 3) & 0x03, (m_cr >> 0) & 0x07); + if (CMD_LOG) logerror("HD63484 '%s': DOT (%d, %d, %d)\n", tag(), (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().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]); + 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]); 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().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]); + 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]); command_gcpy_exec(); command_end_seq(); diff --git a/src/devices/video/h63484.h b/src/devices/video/h63484.h index d8319bcd3df..8cf169fe751 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, std::string tag, device_t *owner, UINT32 clock); + h63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_display_callback(device_t &device, h63484_display_delegate callback) { downcast(device).m_display_cb = callback; } diff --git a/src/devices/video/hd44102.cpp b/src/devices/video/hd44102.cpp index b76ee9f8f04..e9a1a9d014d 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, std::string tag, device_t *owner, UINT32 clock) +hd44102_device::hd44102_device(const machine_config &mconfig, const char *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().c_str()); + if (LOG) logerror("HD44102 '%s' Display Off\n", tag()); m_status |= STATUS_DISPLAY_OFF; break; case CONTROL_DISPLAY_ON: - if (LOG) logerror("HD44102 '%s' Display On\n", tag().c_str()); + if (LOG) logerror("HD44102 '%s' Display On\n", tag()); m_status &= ~STATUS_DISPLAY_OFF; break; case CONTROL_COUNT_DOWN_MODE: - if (LOG) logerror("HD44102 '%s' Count Down Mode\n", tag().c_str()); + if (LOG) logerror("HD44102 '%s' Count Down Mode\n", tag()); m_status &= ~STATUS_COUNT_UP; break; case CONTROL_COUNT_UP_MODE: - if (LOG) logerror("HD44102 '%s' Count Up Mode\n", tag().c_str()); + if (LOG) logerror("HD44102 '%s' Count Up Mode\n", tag()); 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().c_str(), x); + if (LOG) logerror("HD44102 '%s' Display Start Page %u\n", tag(), x); m_page = x; } else if (y > 49) { - logerror("HD44102 '%s' Invalid Address X %u Y %u (%02x)!\n", tag().c_str(), data, x, y); + logerror("HD44102 '%s' Invalid Address X %u Y %u (%02x)!\n", tag(), data, x, y); } else { - if (LOG) logerror("HD44102 '%s' Address X %u Y %u (%02x)\n", tag().c_str(), data, x, y); + if (LOG) logerror("HD44102 '%s' Address X %u Y %u (%02x)\n", tag(), data, x, y); m_x = x; m_y = y; diff --git a/src/devices/video/hd44102.h b/src/devices/video/hd44102.h index 9e263c43975..fb3ef81fceb 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, std::string tag, device_t *owner, UINT32 clock); + hd44102_device(const machine_config &mconfig, const char *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 8e8a7aff87d..8b30b0afd9b 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 - constructor //------------------------------------------------- -hd44352_device::hd44352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock): +hd44352_device::hd44352_device(const machine_config &mconfig, const char *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 77f86be828a..dda32fa7111 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, std::string tag, device_t *owner, UINT32 clock); + hd44352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_on_callback(device_t &device, _Object object) { return downcast(device).m_on_cb.set_callback(object); } diff --git a/src/devices/video/hd44780.cpp b/src/devices/video/hd44780.cpp index 765270f1a5e..00c75e3cd2a 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, std::string tag, device_t *owner, UINT32 clock) : +hd44780_device::hd44780_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, HD44780, "HD44780 A00", tag, owner, clock, "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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_pixel_update_func(nullptr) { } -ks0066_f05_device::ks0066_f05_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +ks0066_f05_device::ks0066_f05_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : hd44780_device(mconfig, KS0066_F05, "KS0066 F05", tag, owner, clock, "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().c_str(), m_lines, m_chars); + fatalerror("%s: use a custom callback for this LCD configuration (%d x %d)\n", tag(), 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().c_str(), m_ac); + if (LOG) logerror("HD44780 '%s': set DDRAM address %x\n", tag(), 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().c_str(), m_ac); + if (LOG) logerror("HD44780 '%s': set CGRAM address %x\n", tag(), 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().c_str()); + logerror("HD44780 '%s': function set cannot be executed after other instructions unless the interface data length is changed\n", tag()); 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().c_str(), 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(), 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().c_str(), BIT(m_ir, 3) ? "display" : "cursor", direction); + if (LOG) logerror("HD44780 '%s': %s shift %d\n", tag(), 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().c_str(), m_display_on, m_cursor_on, m_blink_on); + if (LOG) logerror("HD44780 '%s': display %d, cursor %d, blink %d\n", tag(), 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().c_str(), m_direction, m_shift_on); + if (LOG) logerror("HD44780 '%s': entry mode set: direction %d, shift %d\n", tag(), m_direction, m_shift_on); } else if (BIT(m_ir, 1)) { // return home - if (LOG) logerror("HD44780 '%s': return home\n", tag().c_str()); + if (LOG) logerror("HD44780 '%s': return home\n", tag()); 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().c_str()); + if (LOG) logerror("HD44780 '%s': clear display\n", tag()); 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().c_str(), data); + logerror("HD44780 '%s': Ignoring data write %02x due of busy flag\n", tag(), 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().c_str(), 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(), 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().c_str(), m_active_ram == DDRAM ? "DD" : "CG", m_ac, data); + if (LOG) logerror("HD44780 '%s': %sRAM read %x %c\n", tag(), 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 81191315e41..637056d9505 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, 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); + 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); // static configuration helpers static void static_set_lcd_size(device_t &device, int _lines, int _chars) { hd44780_device &dev=downcast(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, std::string tag, device_t *owner, UINT32 clock); + ks0066_f05_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // device type definition diff --git a/src/devices/video/hd61830.cpp b/src/devices/video/hd61830.cpp index 541dbfbfebe..d60354ef8a8 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, std::string tag, device_t *owner, UINT32 clock) : +hd61830_device::hd61830_device(const machine_config &mconfig, const char *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().c_str(), m_bf ? "busy" : "ready"); + if (LOG) logerror("HD61830 '%s' Status Read: %s\n", tag(), 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().c_str(), m_dor); + if (LOG) logerror("HD61830 '%s' Display Data Read %02x\n", tag(), 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().c_str(), data); + logerror("HD61830 '%s' Ignoring data write %02x due to business\n", tag(), data); return; } @@ -249,12 +249,12 @@ WRITE8_MEMBER( hd61830_device::data_w ) if (LOG) { - 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"); + 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"); } 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().c_str(), m_hp); - if (LOG) logerror("HD61830 '%s' Vertical Character Pitch: %u\n", tag().c_str(), m_vp); + 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); break; case INSTRUCTION_NUMBER_OF_CHARACTERS: m_hn = (data & 0x7f) + 1; - if (LOG) logerror("HD61830 '%s' Number of Characters: %u\n", tag().c_str(), m_hn); + if (LOG) logerror("HD61830 '%s' Number of Characters: %u\n", tag(), 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().c_str(), m_nx); + if (LOG) logerror("HD61830 '%s' Number of Time Divisions: %u\n", tag(), m_nx); break; case INSTRUCTION_CURSOR_POSITION: m_cp = (data & 0x7f) + 1; - if (LOG) logerror("HD61830 '%s' Cursor Position: %u\n", tag().c_str(), m_cp); + if (LOG) logerror("HD61830 '%s' Cursor Position: %u\n", tag(), 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().c_str(), m_dsa); + if (LOG) logerror("HD61830 '%s' Display Start Address Low %04x\n", tag(), 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().c_str(), m_dsa); + if (LOG) logerror("HD61830 '%s' Display Start Address High %04x\n", tag(), 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().c_str(), data, m_cac); + if (LOG) logerror("HD61830 '%s' Cursor Address Low %02x: %04x\n", tag(), 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().c_str(), data, m_cac); + if (LOG) logerror("HD61830 '%s' Cursor Address High %02x: %04x\n", tag(), 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().c_str(), 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(), 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().c_str(), bit + 1, m_cac); + if (LOG) logerror("HD61830 '%s' Clear Bit %u at %04x\n", tag(), 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().c_str(), bit + 1, m_cac); + if (LOG) logerror("HD61830 '%s' Set Bit %u at %04x\n", tag(), 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().c_str(), m_ir); + logerror("HD61830 '%s' Illegal Instruction %02x!\n", tag(), m_ir); return; } diff --git a/src/devices/video/hd61830.h b/src/devices/video/hd61830.h index 999d17b9506..5e060fe9539 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, std::string tag, device_t *owner, UINT32 clock); + hd61830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_rd_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_rd.set_callback(object); } diff --git a/src/devices/video/hd63484.cpp b/src/devices/video/hd63484.cpp index 710907a722e..9dab25d3669 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +hd63484_device::hd63484_device(const machine_config &mconfig, const char *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 811d615ca05..aca908fe008 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, std::string tag, device_t *owner, UINT32 clock); + hd63484_device(const machine_config &mconfig, const char *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 59a5b12688e..513b028336f 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, std::string tag, device_t *owner, UINT32 clock) +hd66421_device::hd66421_device(const machine_config &mconfig, const char *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 b1393586647..e02382f4fac 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, std::string tag, device_t *owner, UINT32 clock); + hd66421_device(const machine_config &mconfig, const char *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 b112fec6c09..2e2c4e60b6a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +huc6202_device::huc6202_device(const machine_config &mconfig, const char *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 fafc3fdb571..c9920bd333e 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, std::string tag, device_t *owner, UINT32 clock); + huc6202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_next_pixel_0_callback(device_t &device, _Object object) { return downcast(device).m_next_pixel_0_cb.set_callback(object); } template static devcb_base &set_time_til_next_event_0_callback(device_t &device, _Object object) { return downcast(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 e9beca35ed4..ca9a9b0510d 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +huc6260_device::huc6260_device(const machine_config &mconfig, const char *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 dfaab084fed..85552fbd265 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, std::string tag, device_t *owner, UINT32 clock); + huc6260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_next_pixel_data_callback(device_t &device, _Object object) { return downcast(device).m_next_pixel_data_cb.set_callback(object); } template static devcb_base &set_time_til_next_event_callback(device_t &device, _Object object) { return downcast(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 35ea2a8fea1..69caa26008e 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +huc6261_device::huc6261_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, HUC6261, "HuC6261", tag, owner, clock, "huc6261", __FILE__), - 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) + 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) { // 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.empty() ); - assert( !m_huc6270_b_tag.empty() ); + assert( m_huc6270_a_tag != nullptr ); + assert( m_huc6270_b_tag != nullptr ); m_timer = timer_alloc(); m_huc6270_a = machine().device(m_huc6270_a_tag); diff --git a/src/devices/video/huc6261.h b/src/devices/video/huc6261.h index 9089c94e15e..ab04cd01c22 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, std::string tag, device_t *owner, UINT32 clock); + huc6261_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void set_vdc1_tag(device_t &device, std::string tag) { downcast(device).m_huc6270_a_tag = tag; } - static void set_vdc2_tag(device_t &device, std::string tag) { downcast(device).m_huc6270_b_tag = tag; } + static void set_vdc1_tag(device_t &device, const char *tag) { downcast(device).m_huc6270_a_tag = tag; } + static void set_vdc2_tag(device_t &device, const char *tag) { downcast(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: - std::string m_huc6270_a_tag; - std::string m_huc6270_b_tag; + const char *m_huc6270_a_tag; + const char *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 8ee3a9e5ae5..42527fbcf16 100644 --- a/src/devices/video/huc6270.cpp +++ b/src/devices/video/huc6270.cpp @@ -96,7 +96,7 @@ const device_type HUC6270 = &device_creator; const UINT8 huc6270_device::vram_increments[4] = { 1, 32, 64, 128 }; -huc6270_device::huc6270_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +huc6270_device::huc6270_device(const machine_config &mconfig, const char *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 145bfdf4e62..fdaca3b4f5c 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, std::string tag, device_t *owner, UINT32 clock); + huc6270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_vram_size(device_t &device, UINT32 vram_size) { downcast(device).m_vram_size = vram_size; } template static devcb_base &set_irq_changed_callback(device_t &device, _Object object) { return downcast(device).m_irq_changed_cb.set_callback(object); } diff --git a/src/devices/video/huc6272.cpp b/src/devices/video/huc6272.cpp index da336a21383..f76dd257d7f 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, std::string tag, device_t *owner, UINT32 clock) +huc6272_device::huc6272_device(const machine_config &mconfig, const char *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 73d6cbaf059..27bd14636e2 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, std::string tag, device_t *owner, UINT32 clock); + huc6272_device(const machine_config &mconfig, const char *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 ab44e6f197a..8adb5b5ed15 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, std::string tag, device_t *owner, UINT32 clock) +i8244_device::i8244_device(const machine_config &mconfig, const char *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, std::string tag, devic } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +i8245_device::i8245_device(const machine_config &mconfig, const char *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 cb3cbaff7ca..b946f7bd2c0 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, 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); + 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); // static configuration helpers static void set_screen_tag(device_t &device, const char *screen_tag) { downcast(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, std::string tag, device_t *owner, UINT32 clock); + i8245_device(const machine_config &mconfig, const char *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 1450abc9112..d344c7006ef 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, std::string tag, device_t *owner, UINT32 clock) : +i82730_device::i82730_device(const machine_config &mconfig, const char *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_program(nullptr), + m_cpu_tag(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, std::string tag, dev // set_cpu_tag - set cpu we are attached to //------------------------------------------------- -void i82730_device::set_cpu_tag(device_t &device, device_t *owner, std::string tag) +void i82730_device::set_cpu_tag(device_t &device, device_t *owner, const char *tag) { i82730_device &dev = dynamic_cast(device); dev.m_cpu_tag = tag; diff --git a/src/devices/video/i82730.h b/src/devices/video/i82730.h index 363a059c582..97d9bd70b0d 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, std::string tag, device_t *owner, UINT32 clock); + i82730_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // callbacks template static devcb_base &set_sint_handler(device_t &device, _Object object) { return downcast(device).m_sint_handler.set_callback(object); } // inline configuration - static void set_cpu_tag(device_t &device, device_t *owner, std::string tag); + static void set_cpu_tag(device_t &device, device_t *owner, const char *tag); static void set_update_row_callback(device_t &device, i82730_update_row_delegate callback) { downcast(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; - std::string m_cpu_tag; + const char *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 00fd3432083..433f222cb92 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 - constructor //------------------------------------------------- -i8275_device::i8275_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +i8275_device::i8275_device(const machine_config &mconfig, const char *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().c_str(), y, x); + //if (LOG) logerror("I8275 '%s' y %u x %u HRTC 1\n", tag(), y, x); m_write_hrtc(1); break; case TIMER_DRQ_ON: - //if (LOG) logerror("I8275 '%s' y %u x %u DRQ 1\n", tag().c_str(), y, x); + //if (LOG) logerror("I8275 '%s' y %u x %u DRQ 1\n", tag(), 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().c_str(), y, x); + //if (LOG) logerror("I8275 '%s' y %u x %u HRTC 0\n", tag(), y, x); m_write_hrtc(0); if (m_scanline == 0) { - //if (LOG) logerror("I8275 '%s' y %u x %u VRTC 0\n", tag().c_str(), y, x); + //if (LOG) logerror("I8275 '%s' y %u x %u VRTC 0\n", tag(), 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().c_str(), y, x); + //if (LOG) logerror("I8275 '%s' y %u x %u DMA Underrun\n", tag(), 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().c_str(), y, x); + //if (LOG) logerror("I8275 '%s' y %u x %u IRQ 1\n", tag(), 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().c_str(), y, x); + //if (LOG) logerror("I8275 '%s' y %u x %u VRTC 1\n", tag(), 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().c_str()); + //if (LOG) logerror("I8275 '%s' IRQ 0\n", tag()); 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().c_str(), data); + if (LOG) logerror("I8275 '%s' Command %02x\n", tag(), data); switch (data >> 5) { case CMD_RESET: - if (LOG) logerror("I8275 '%s' Reset\n", tag().c_str()); + if (LOG) logerror("I8275 '%s' Reset\n", tag()); m_status &= ~ST_IE; - if (LOG) logerror("I8275 '%s' IRQ 0\n", tag().c_str()); + if (LOG) logerror("I8275 '%s' IRQ 0\n", tag()); 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().c_str(), DMA_BURST_COUNT, DMA_BURST_SPACE); + if (LOG) logerror("I8275 '%s' Start Display %u %u\n", tag(), 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().c_str()); + if (LOG) logerror("I8275 '%s' Stop Display\n", tag()); m_status &= ~ST_VE; break; case CMD_READ_LIGHT_PEN: - if (LOG) logerror("I8275 '%s' Read Light Pen\n", tag().c_str()); + if (LOG) logerror("I8275 '%s' Read Light Pen\n", tag()); 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().c_str()); + if (LOG) logerror("I8275 '%s' Load Cursor\n", tag()); 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().c_str()); + if (LOG) logerror("I8275 '%s' Enable Interrupt\n", tag()); m_status |= ST_IE; break; case CMD_DISABLE_INTERRUPT: - if (LOG) logerror("I8275 '%s' Disable Interrupt\n", tag().c_str()); + if (LOG) logerror("I8275 '%s' Disable Interrupt\n", tag()); m_status &= ~ST_IE; break; case CMD_PRESET_COUNTERS: - if (LOG) logerror("I8275 '%s' Preset Counters\n", tag().c_str()); + if (LOG) logerror("I8275 '%s' Preset Counters\n", tag()); m_scanline = 0; break; } } else { - if (LOG) logerror("I8275 '%s' Parameter %02x\n", tag().c_str(), data); + if (LOG) logerror("I8275 '%s' Parameter %02x\n", tag(), 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().c_str(), 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(), 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 a8a9a01e74b..04a726f54ab 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, std::string tag, device_t *owner, UINT32 clock); + i8275_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_character_width(device_t &device, int value) { downcast(device).m_hpixels_per_column = value; } static void static_set_display_callback(device_t &device, i8275_draw_character_delegate callback) { downcast(device).m_display_cb = callback; } diff --git a/src/devices/video/m50458.cpp b/src/devices/video/m50458.cpp index db67b778dc9..38e5eeb6e9a 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, std::string tag, device_t *owner, UINT32 clock) +m50458_device::m50458_device(const machine_config &mconfig, const char *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 e7078c659f2..9744ff6d361 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, std::string tag, device_t *owner, UINT32 clock); + m50458_device(const machine_config &mconfig, const char *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 e5207a7659a..b65590b6db8 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, std::string tag, device_t *owner, UINT32 clock) +mb90082_device::mb90082_device(const machine_config &mconfig, const char *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 5c1ae0b7c83..61d6cc17a7a 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, std::string tag, device_t *owner, UINT32 clock); + mb90082_device(const machine_config &mconfig, const char *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 dded0e09735..eda7751a768 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; // palette device //------------------------------------------------- -void mb_vcu_device::static_set_palette_tag(device_t &device, std::string tag) +void mb_vcu_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(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, std::string tag, device_t *owner, UINT32 clock) +mb_vcu_device::mb_vcu_device(const machine_config &mconfig, const char *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 5634d90a672..e5fe1b2e62e 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, std::string tag, device_t *owner, UINT32 clock); + mb_vcu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_palette_tag(device_t &device, std::string tag); - static void set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu.set_tag(tag); } + static void static_set_palette_tag(device_t &device, const char *tag); + static void set_cpu_tag(device_t &device, const char *tag) { downcast(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 ac0f8de8046..827854b0824 100644 --- a/src/devices/video/mc6845.cpp +++ b/src/devices/video/mc6845.cpp @@ -89,7 +89,7 @@ const device_type MOS8568 = &device_creator; #define ATTR_ALTERNATE_CHARSET BIT(attr, 7) -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +mc6845_device::mc6845_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +r6545_1_device::r6545_1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +h46505_device::h46505_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mc6845_1_device::mc6845_1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd6845_device::hd6845_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +c6545_1_device::c6545_1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sy6545_1_device::sy6545_1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +sy6845e_device::sy6845e_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +hd6345_device::hd6345_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ams40041_device::ams40041_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ams40489_device::ams40489_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +mos8563_device::mos8563_device(const machine_config &mconfig, const char *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, std::string tag, d } -mos8568_device::mos8568_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos8568_device::mos8568_device(const machine_config &mconfig, const char *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 8eb450a4957..9bad2348640 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, 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); + 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); static void set_show_border_area(device_t &device, bool show) { downcast(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, std::string tag, device_t *owner, UINT32 clock); + mc6845_1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + r6545_1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + c6545_1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + h46505_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + hd6845_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sy6545_1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sy6845e_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + hd6345_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ams40041_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + ams40489_device(const machine_config &mconfig, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + mos8568_device(const machine_config &mconfig, const char *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 5297a549ef1..ec072c6e206 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, std::string tag, device_t *owner, UINT32 clock, +mc6847_friend_device::mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, const char *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, std::string 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, const char *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().c_str(), ARTIFACTING_TAG); + snprintf(port_name, ARRAY_LENGTH(port_name), "%s:%s", device->tag(), ARTIFACTING_TAG); m_config = device->ioport(port_name); } @@ -1769,7 +1769,7 @@ const device_type M5C6847P1 = &device_creator; // mc6847_ntsc_device //------------------------------------------------- -mc6847_ntsc_device::mc6847_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc6847_ntsc_device::mc6847_ntsc_device(const machine_config &mconfig, const char *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, std::strin // mc6847_pal_device //------------------------------------------------- -mc6847_pal_device::mc6847_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc6847_pal_device::mc6847_pal_device(const machine_config &mconfig, const char *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, std::string // mc6847y_ntsc_device //------------------------------------------------- -mc6847y_ntsc_device::mc6847y_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc6847y_ntsc_device::mc6847y_ntsc_device(const machine_config &mconfig, const char *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, std::str // mc6847y_pal_device //------------------------------------------------- -mc6847y_pal_device::mc6847y_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc6847y_pal_device::mc6847y_pal_device(const machine_config &mconfig, const char *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, std::strin // mc6847t1_ntsc_device //------------------------------------------------- -mc6847t1_ntsc_device::mc6847t1_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc6847t1_ntsc_device::mc6847t1_ntsc_device(const machine_config &mconfig, const char *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, std::s // mc6847t1_pal_device //------------------------------------------------- -mc6847t1_pal_device::mc6847t1_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc6847t1_pal_device::mc6847t1_pal_device(const machine_config &mconfig, const char *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, std::str // s68047_device //------------------------------------------------- -s68047_device::s68047_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s68047_device::s68047_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +m5c6847p1_device::m5c6847p1_device(const machine_config &mconfig, const char *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 46489296677..ac8279080e0 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(device).m_charrom_cb = callback; } protected: - mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, + mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock); + mc6847_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class mc6847_pal_device : public mc6847_base_device { public: - mc6847_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mc6847_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class mc6847y_ntsc_device : public mc6847_base_device { public: - mc6847y_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mc6847y_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class mc6847y_pal_device : public mc6847_base_device { public: - mc6847y_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mc6847y_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class mc6847t1_ntsc_device : public mc6847_base_device { public: - mc6847t1_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mc6847t1_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class mc6847t1_pal_device : public mc6847_base_device { public: - mc6847t1_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mc6847t1_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class s68047_device : public mc6847_base_device { public: - s68047_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + s68047_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + m5c6847p1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/video/mos6566.cpp b/src/devices/video/mos6566.cpp index bc98816dd20..f6b9ca75a62 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, std::string tag, device_t *owner, UINT32 clock) +mos6566_device::mos6566_device(const machine_config &mconfig, const char *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, std::string tag, d { } -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +mos6567_device::mos6567_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +mos8562_device::mos8562_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mos8564_device::mos8564_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mos6569_device::mos6569_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +mos8565_device::mos8565_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +mos8566_device::mos8566_device(const machine_config &mconfig, const char *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 c6d7f68eb95..c913b5ad98c 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, 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); + 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); - static void static_set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu.set_tag(tag); } + static void static_set_cpu_tag(device_t &device, const char *tag) { downcast(device).m_cpu.set_tag(tag); } template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_ba_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_ba.set_callback(object); } template static devcb_base &set_aec_wr_callback(device_t &device, _Object object) { return downcast(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, 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); + 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); }; @@ -385,7 +385,7 @@ class mos8562_device : public mos6567_device { public: // construction/destruction - mos8562_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mos8562_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mos8564_device(const machine_config &mconfig, const char *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, 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); + 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); // 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, std::string tag, device_t *owner, UINT32 clock); + mos8565_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + mos8566_device(const machine_config &mconfig, const char *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 eb73cae37a4..efa82d7c119 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) : +msm6222b_device::msm6222b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSM6222B, "msm6222b-xx", tag, owner, clock, "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, std::string tag, device_t *owner, UINT32 clock) : +msm6222b_01_device::msm6222b_01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : msm6222b_device(mconfig, MSM6222B_01, "msm6222b-01", tag, owner, clock, "msm6222b", __FILE__) { } diff --git a/src/devices/video/msm6222b.h b/src/devices/video/msm6222b.h index cc83e0727f0..d86bcd63629 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + msm6222b_01_device(const machine_config &mconfig, const char *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 2967693ba4c..6ae565cce9f 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, std::string tag, device_t *owner, UINT32 clock) : +msm6255_device::msm6255_device(const machine_config &mconfig, const char *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 9a56caccaf2..c686656988f 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, std::string tag, device_t *owner, UINT32 clock); + msm6255_device(const machine_config &mconfig, const char *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 3046612e10a..7710e3402c3 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; const device_type IBM8514A = &device_creator; const device_type MACH8 = &device_creator; -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) +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) : 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, std::string tag, device_t *owner, UINT32 clock) +vga_device::vga_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +tseng_vga_device::tseng_vga_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +s3_vga_device::s3_vga_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +gamtor_vga_device::gamtor_vga_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +ati_vga_device::ati_vga_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +ibm8514a_device::ibm8514a_device(const machine_config &mconfig, const char *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, std::string 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, const char *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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) +mach8_device::mach8_device(const machine_config &mconfig, const char *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 750180ffea3..9c729ba7a6e 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); 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, 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); + 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); - void set_vga(std::string tag) { m_vga_tag.assign(tag); } + void set_vga(const char* tag) { m_vga_tag.assign(tag); } void set_vga_owner() { m_vga = dynamic_cast(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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + tseng_vga_device(const machine_config &mconfig, const char *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, 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); + 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); 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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + gamtor_vga_device(const machine_config &mconfig, const char *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 ae780ec8237..1caf2a92284 100644 --- a/src/devices/video/psx.cpp +++ b/src/devices/video/psx.cpp @@ -22,7 +22,7 @@ const device_type CXD8561BQ = &device_creator; const device_type CXD8561CQ = &device_creator; const device_type CXD8654Q = &device_creator; -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) : +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) : 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, std::string tag, device_t *owner, UINT32 clock) +cxd8514q_device::cxd8514q_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cxd8538q_device::cxd8538q_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cxd8561q_device::cxd8561q_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cxd8561bq_device::cxd8561bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : psxgpu_device(mconfig, CXD8561BQ, "CXD8561BQ", tag, owner, clock, "cxd8561bq", __FILE__) { } -cxd8561cq_device::cxd8561cq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cxd8561cq_device::cxd8561cq_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +cxd8654q_device::cxd8654q_device(const machine_config &mconfig, const char *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 a19138bb509..ae96761cb02 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + cxd8514q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class cxd8538q_device : public psxgpu_device { public: // construction/destruction - cxd8538q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cxd8538q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class cxd8561q_device : public psxgpu_device { public: // construction/destruction - cxd8561q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cxd8561q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class cxd8561bq_device : public psxgpu_device { public: // construction/destruction - cxd8561bq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cxd8561bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class cxd8561cq_device : public psxgpu_device { public: // construction/destruction - cxd8561cq_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cxd8561cq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class cxd8654q_device : public psxgpu_device { public: // construction/destruction - cxd8654q_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cxd8654q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; #endif diff --git a/src/devices/video/ramdac.cpp b/src/devices/video/ramdac.cpp index 881870763f4..b05cccfa10b 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 - constructor //------------------------------------------------- -ramdac_device::ramdac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ramdac_device::ramdac_device(const machine_config &mconfig, const char *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, std::string tag, dev // palette device //------------------------------------------------- -void ramdac_device::static_set_palette_tag(device_t &device, std::string tag) +void ramdac_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/devices/video/ramdac.h b/src/devices/video/ramdac.h index 749e6af2860..a006312c59f 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, std::string tag, device_t *owner, UINT32 clock); + ramdac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); static void set_split_read(device_t &device, int split) { downcast(device).m_split_read_reg = split; } // I/O operations diff --git a/src/devices/video/saa5050.cpp b/src/devices/video/saa5050.cpp index 40d87bdb656..071fbf52ec9 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, std::string 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, 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_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, std::string tag, device_t *owner, UINT32 clock) : +saa5050_device::saa5050_device(const machine_config &mconfig, const char *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, std::string tag, d { } -saa5051_device::saa5051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saa5051_device::saa5051_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saa5050_device(mconfig, SAA5051, "SAA5051", tag, owner, clock, "saa5051", __FILE__) { } -saa5052_device::saa5052_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saa5052_device::saa5052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saa5050_device(mconfig, SAA5052, "SAA5052", tag, owner, clock, "saa5052", __FILE__) { } -saa5053_device::saa5053_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saa5053_device::saa5053_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saa5050_device(mconfig, SAA5053, "SAA5053", tag, owner, clock, "saa5053", __FILE__) { } -saa5054_device::saa5054_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saa5054_device::saa5054_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saa5050_device(mconfig, SAA5054, "SAA5054", tag, owner, clock, "saa5054", __FILE__) { } -saa5055_device::saa5055_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saa5055_device::saa5055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saa5050_device(mconfig, SAA5055, "SAA5055", tag, owner, clock, "saa5055", __FILE__) { } -saa5056_device::saa5056_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saa5056_device::saa5056_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : saa5050_device(mconfig, SAA5056, "SAA5056", tag, owner, clock, "saa5056", __FILE__) { } -saa5057_device::saa5057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saa5057_device::saa5057_device(const machine_config &mconfig, const char *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 bda63c98a8d..30b1e8b0e4a 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, 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); + 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); static void static_set_screen_size(device_t &device, int cols, int rows, int size) { downcast(device).m_cols = cols; downcast(device).m_rows = rows; downcast(device).m_size = size; } @@ -169,7 +169,7 @@ class saa5051_device : public saa5050_device { public: // construction/destruction - saa5051_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saa5051_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + saa5052_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + saa5053_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + saa5054_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + saa5055_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + saa5056_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + saa5057_device(const machine_config &mconfig, const char *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 4f81a0b86a1..d653b8aef1c 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, std::string tag, device_t *owner, UINT32 clock) +scn2674_device::scn2674_device(const machine_config &mconfig, const char *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 862c65656f6..6c4f5361525 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, std::string tag, device_t *owner, UINT32 clock); + scn2674_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); typedef device_delegate draw_character_delegate; diff --git a/src/devices/video/sed1200.cpp b/src/devices/video/sed1200.cpp index 94706dccde6..06cd7ba7e83 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock) : +sed1200d0a_device::sed1200d0a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sed1200_device(mconfig, SED1200D0A, "sed1200d-0a", tag, owner, clock, "sed1200", __FILE__) { } -sed1200f0a_device::sed1200f0a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +sed1200f0a_device::sed1200f0a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sed1200_device(mconfig, SED1200F0A, "sed1200f-0a", tag, owner, clock, "sed1200", __FILE__) { } -sed1200d0b_device::sed1200d0b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +sed1200d0b_device::sed1200d0b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sed1200_device(mconfig, SED1200D0B, "sed1200d-0b", tag, owner, clock, "sed1200", __FILE__) { } -sed1200f0b_device::sed1200f0b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +sed1200f0b_device::sed1200f0b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sed1200_device(mconfig, SED1200F0B, "sed1200f-0b", tag, owner, clock, "sed1200", __FILE__) { } diff --git a/src/devices/video/sed1200.h b/src/devices/video/sed1200.h index fe647b6e9e6..c39f223e331 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sed1200_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); void control_w(UINT8 data); UINT8 control_r(); @@ -54,7 +54,7 @@ private: class sed1200d0a_device : public sed1200_device { public: - sed1200d0a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sed1200d0a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sed1200f0a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sed1200d0b_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + sed1200f0b_device(const machine_config &mconfig, const char *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 89c3be91289..d368c38b1f2 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, std::string tag, device_t *owner, UINT32 clock) +sed1330_device::sed1330_device(const machine_config &mconfig, const char *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().c_str(), m_bf ? "busy" : "ready"); + if (LOG) logerror("SED1330 '%s' Status Read: %s\n", tag(), 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().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; + 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; } } 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().c_str(), data, m_csr); + if (LOG) logerror("SED1330 '%s' Memory Read %02x from %04x\n", tag(), 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().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"); + 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"); } break; @@ -322,29 +322,29 @@ WRITE8_MEMBER( sed1330_device::data_w ) if (LOG) { - 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"); + 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"); } break; case 2: m_fy = (data & 0x0f) + 1; - if (LOG) logerror("SED1330 '%s' Vertical Character Size: %u\n", tag().c_str(), m_fy); + if (LOG) logerror("SED1330 '%s' Vertical Character Size: %u\n", tag(), m_fy); break; case 3: m_cr = data + 1; - if (LOG) logerror("SED1330 '%s' Visible Characters Per Line: %u\n", tag().c_str(), m_cr); + if (LOG) logerror("SED1330 '%s' Visible Characters Per Line: %u\n", tag(), m_cr); break; case 4: m_tcr = data + 1; - if (LOG) logerror("SED1330 '%s' Total Characters Per Line: %u\n", tag().c_str(), m_tcr); + if (LOG) logerror("SED1330 '%s' Total Characters Per Line: %u\n", tag(), m_tcr); break; case 5: m_lf = data + 1; - if (LOG) logerror("SED1330 '%s' Frame Height: %u\n", tag().c_str(), m_lf); + if (LOG) logerror("SED1330 '%s' Frame Height: %u\n", tag(), 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().c_str(), m_ap); + if (LOG) logerror("SED1330 '%s' Virtual Screen Width: %u\n", tag(), m_ap); break; default: - logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data); + logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), 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().c_str(), BIT(data, 0) ? "enabled" : "disabled"); + logerror("SED1330 '%s' Display: %s\n", tag(), BIT(data, 0) ? "enabled" : "disabled"); switch (m_fc) { - 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; + 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; } switch (m_fp & 0x03) { - 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; + 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; } switch ((m_fp >> 2) & 0x03) { - 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; + 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; } switch ((m_fp >> 4) & 0x03) { - 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; + 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; } } 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().c_str(), m_sad1); + if (LOG) logerror("SED1330 '%s' Display Page 1 Start Address: %04x\n", tag(), m_sad1); break; case 2: m_sl1 = data + 1; - if (LOG) logerror("SED1330 '%s' Display Block 1 Screen Lines: %u\n", tag().c_str(), m_sl1); + if (LOG) logerror("SED1330 '%s' Display Block 1 Screen Lines: %u\n", tag(), 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().c_str(), m_sad2); + if (LOG) logerror("SED1330 '%s' Display Page 2 Start Address: %04x\n", tag(), m_sad2); break; case 5: m_sl2 = data + 1; - if (LOG) logerror("SED1330 '%s' Display Block 2 Screen Lines: %u\n", tag().c_str(), m_sl2); + if (LOG) logerror("SED1330 '%s' Display Block 2 Screen Lines: %u\n", tag(), 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().c_str(), m_sad3); + if (LOG) logerror("SED1330 '%s' Display Page 3 Start Address: %04x\n", tag(), 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().c_str(), m_sad4); + if (LOG) logerror("SED1330 '%s' Display Page 4 Start Address: %04x\n", tag(), m_sad4); break; default: - logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data); + logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), 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().c_str(), m_crx); + if (LOG) logerror("SED1330 '%s' Horizontal Cursor Size: %u\n", tag(), 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().c_str(), m_cry); - logerror("SED1330 '%s' Cursor Shape: %s\n", tag().c_str(), BIT(data, 7) ? "Block" : "Underscore"); + logerror("SED1330 '%s' Vertical Cursor Location: %u\n", tag(), m_cry); + logerror("SED1330 '%s' Cursor Shape: %s\n", tag(), BIT(data, 7) ? "Block" : "Underscore"); } break; default: - logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data); + logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), 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().c_str(), m_sag); + if (LOG) logerror("SED1330 '%s' Character Generator RAM Start Address: %04x\n", tag(), m_sag); break; default: - logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data); + logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), data); } break; case INSTRUCTION_HDOT_SCR: m_hdotscr = data & 0x07; - if (LOG) logerror("SED1330 '%s' Horizontal Dot Scroll: %u\n", tag().c_str(), m_hdotscr); + if (LOG) logerror("SED1330 '%s' Horizontal Dot Scroll: %u\n", tag(), 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().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; + 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; } - 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); + 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); } 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().c_str(), m_csr); + if (LOG) logerror("SED1330 '%s' Cursor Address %04x\n", tag(), m_csr); break; default: - logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag().c_str(), data); + logerror("SED1330 '%s' Invalid parameter byte %02x\n", tag(), 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().c_str(), 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(), 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().c_str(), m_ir); + logerror("SED1330 '%s' Unsupported instruction %02x\n", tag(), m_ir); } m_pbc++; diff --git a/src/devices/video/sed1330.h b/src/devices/video/sed1330.h index 10ccaf8e98c..5b6cbc19521 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, std::string tag, device_t *owner, UINT32 clock); + sed1330_device(const machine_config &mconfig, const char *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 e2781a5b5e6..d868600595c 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 - constructor //------------------------------------------------- -sed1520_device::sed1520_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +sed1520_device::sed1520_device(const machine_config &mconfig, const char *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().c_str(), data); + logerror("%s: invalid SED1520 command: %x\n", tag(), data); } READ8_MEMBER(sed1520_device::status_read) diff --git a/src/devices/video/sed1520.h b/src/devices/video/sed1520.h index 0b12aaa0107..654fd010060 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, std::string tag, device_t *owner, UINT32 clock); + sed1520_device(const machine_config &mconfig, const char *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(device).m_screen_update_func = _cb; } diff --git a/src/devices/video/snes_ppu.cpp b/src/devices/video/snes_ppu.cpp index affb98e931e..7fdd700278c 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 - constructor //------------------------------------------------- -snes_ppu_device::snes_ppu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +snes_ppu_device::snes_ppu_device(const machine_config &mconfig, const char *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 1725d5af556..68634c5db60 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, std::string tag, device_t *owner, UINT32 clock); + snes_ppu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers template static devcb_base &static_set_open_bus_callback(device_t &device, _Object object) { return downcast(device).m_openbus_cb.set_callback(object); } diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp index c2121268633..a98dc8fe709 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().c_str(), space.device().safe_pc(), offset*2); + printf ("cpu %s (PC=%08X) VDP1: Read from Registers, Offset %04x\n", space.device().tag(), space.device().safe_pc(), offset*2); break; } diff --git a/src/devices/video/t6a04.cpp b/src/devices/video/t6a04.cpp index e88b99866fb..71b8e89d3bb 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, std::string tag, device_t *owner, UINT32 clock) : +t6a04_device::t6a04_device(const machine_config &mconfig, const char *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 add9bd6665d..70d2c938855 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, std::string tag, device_t *owner, UINT32 clock); + t6a04_device(const machine_config &mconfig, const char *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 2dabafdf8ed..ba518e6a6ac 100644 --- a/src/devices/video/tea1002.cpp +++ b/src/devices/video/tea1002.cpp @@ -49,7 +49,7 @@ const device_type TEA1002 = &device_creator; // paula_device - constructor //------------------------------------------------- -tea1002_device::tea1002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +tea1002_device::tea1002_device(const machine_config &mconfig, const char *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 c7a42f3aa0e..b06d798b720 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, std::string tag, device_t *owner, UINT32 clock); + tea1002_device(const machine_config &mconfig, const char *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 e3d68c71ee0..b695ce08ed7 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 - constructor //------------------------------------------------- -tlc34076_device::tlc34076_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tlc34076_device::tlc34076_device(const machine_config &mconfig, const char *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 caca2e4f9ef..cd66143d9b7 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, std::string tag, device_t *owner, UINT32 clock); + tlc34076_device(const machine_config &mconfig, const char *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 84f61eb1ec8..8d535b2951a 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms34061_device::tms34061_device(const machine_config &mconfig, const char *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 5454646b76e..814bf8b39c8 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, std::string tag, device_t *owner, UINT32 clock); + tms34061_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_rowshift(device_t &device, UINT8 rowshift) { downcast(device).m_rowshift = rowshift; } static void set_vram_size(device_t &device, UINT32 vramsize) { downcast(device).m_vramsize = vramsize; } diff --git a/src/devices/video/tms3556.cpp b/src/devices/video/tms3556.cpp index d85c35dd075..716b1c0269d 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, std::string tag, device_t *owner, UINT32 clock) +tms3556_device::tms3556_device(const machine_config &mconfig, const char *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 de4d1ec47ea..d367a3efc48 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, std::string tag, device_t *owner, UINT32 clock); + tms3556_device(const machine_config &mconfig, const char *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 e75594d13e7..4b6f82e18b8 100644 --- a/src/devices/video/tms9927.cpp +++ b/src/devices/video/tms9927.cpp @@ -34,37 +34,39 @@ const device_type CRT5027 = &device_creator; const device_type CRT5037 = &device_creator; const device_type CRT5057 = &device_creator; -tms9927_device::tms9927_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms9927_device::tms9927_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_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, std::string tag, device_t *owner, UINT32 clock) +crt5027_device::crt5027_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms9927_device(mconfig, CRT5027, "CRT5027", tag, owner, clock, "crt5027", __FILE__) { } -crt5037_device::crt5037_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +crt5037_device::crt5037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms9927_device(mconfig, CRT5037, "CRT5037", tag, owner, clock, "crt5037", __FILE__) { } -crt5057_device::crt5057_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +crt5057_device::crt5057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms9927_device(mconfig, CRT5057, "CRT5057", tag, owner, clock, "crt5057", __FILE__) { } @@ -83,7 +85,7 @@ void tms9927_device::device_start() m_clock = clock(); /* get the self-load PROM */ - if (!m_selfload_region.empty()) + if (m_selfload_region != nullptr) { 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 4ed6f2f236c..40181d16cbc 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, 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(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() {} template static devcb_base &set_vsyn_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_vsyn.set_callback(object); } static void set_char_width(device_t &device, int pixels) { downcast(device).m_hpixels_per_column = pixels; } - static void set_region_tag(device_t &device, std::string tag) { downcast(device).m_selfload_region = tag; } + static void set_region_tag(device_t &device, const char *tag) { downcast(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 */ - std::string m_selfload_region; /* name of the region with self-load data */ + const char *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, std::string tag, device_t *owner, UINT32 clock); + crt5027_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + crt5037_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + crt5057_device(const machine_config &mconfig, const char *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 a5c77b83dcf..ba7a40a4b6e 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, std::string 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, const char *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, std::string tag, device_t *owner, UINT32 clock ) +tms9928a_device::tms9928a_device( const machine_config &mconfig, const char *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, std::string tag // static_set_addrmap(*this, AS_DATA, ADDRESS_MAP_NAME(memmap)); } -tms9129_device::tms9129_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms9129_device::tms9129_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms9918_device::tms9918_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms9918a_device::tms9918a_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms9118_device::tms9118_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms9128_device::tms9128_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms9929_device::tms9929_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +tms9929a_device::tms9929a_device(const machine_config &mconfig, const char *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().c_str(), reg, (int)val); + if (TRACE_REG) logerror("TMS9928A('%s'): Reg %d = %02xh\n", tag(), 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().c_str(), modes[m_mode]); + if (TRACE_MODE) logerror("TMS9928A('%s'): %s\n", tag(), 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().c_str(), modes[m_mode]); + if (TRACE_MODE) logerror("TMS9928A('%s'): %s\n", tag(), 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 82798ea7318..8107a1b0d62 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, 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); + 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); static void set_vram_size(device_t &device, int vram_size) { downcast(device).m_vram_size = vram_size; } template static devcb_base &set_out_int_line_callback(device_t &device, _Object object) { return downcast(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, std::string tag, device_t *owner, UINT32 clock); + tms9918_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms9918a_device : public tms9928a_device { public: - tms9918a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms9918a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms9118_device : public tms9928a_device { public: - tms9118_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms9118_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms9128_device : public tms9928a_device { public: - tms9128_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms9128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms9929_device : public tms9928a_device { public: - tms9929_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms9929_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms9929a_device : public tms9928a_device { public: - tms9929a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms9929a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class tms9129_device : public tms9928a_device { public: - tms9129_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms9129_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/video/upd3301.cpp b/src/devices/video/upd3301.cpp index e94a4a2044b..8370f52c85c 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 - constructor //------------------------------------------------- -upd3301_device::upd3301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +upd3301_device::upd3301_device(const machine_config &mconfig, const char *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().c_str(), param); + if (LOG) logerror("UPD3301 '%s' HRTC: %u\n", tag(), 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().c_str(), param); + if (LOG) logerror("UPD3301 '%s' VRTC: %u\n", tag(), 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().c_str(), m_dma_mode ? "character" : "burst"); - if (LOG) logerror("UPD3301 '%s' H: %u\n", tag().c_str(), m_h); + 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); break; case 1: m_b = ((data >> 6) + 1) * 16; m_l = (data & 0x3f) + 1; - 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); + if (LOG) logerror("UPD3301 '%s' B: %u\n", tag(), m_b); + if (LOG) logerror("UPD3301 '%s' L: %u\n", tag(), 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().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); + 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); break; case 3: m_v = (data >> 5) + 1; m_z = (data & 0x1f) + 2; - 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); + if (LOG) logerror("UPD3301 '%s' V: %u\n", tag(), m_v); + if (LOG) logerror("UPD3301 '%s' Z: %u\n", tag(), 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().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); + 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); 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().c_str(), m_cx); + if (LOG) logerror("UPD3301 '%s' CX: %u\n", tag(), m_cx); break; case 1: m_cy = data & 0x3f; - if (LOG) logerror("UPD3301 '%s' CY: %u\n", tag().c_str(), m_cy); + if (LOG) logerror("UPD3301 '%s' CY: %u\n", tag(), 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().c_str(), data); + if (LOG) logerror("UPD3301 '%s' Invalid Parameter Byte %02x!\n", tag(), 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().c_str()); + if (LOG) logerror("UPD3301 '%s' Reset\n", tag()); m_mode = MODE_RESET; set_display(0); set_interrupt(0); break; case COMMAND_START_DISPLAY: - if (LOG) logerror("UPD3301 '%s' Start Display\n", tag().c_str()); + if (LOG) logerror("UPD3301 '%s' Start Display\n", tag()); set_display(1); reset_counters(); break; case COMMAND_SET_INTERRUPT_MASK: - if (LOG) logerror("UPD3301 '%s' Set Interrupt Mask\n", tag().c_str()); + if (LOG) logerror("UPD3301 '%s' Set Interrupt Mask\n", tag()); m_me = BIT(data, 0); m_mn = BIT(data, 1); - 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); + if (LOG) logerror("UPD3301 '%s' ME: %u\n", tag(), m_me); + if (LOG) logerror("UPD3301 '%s' MN: %u\n", tag(), m_mn); break; case COMMAND_READ_LIGHT_PEN: - if (LOG) logerror("UPD3301 '%s' Read Light Pen\n", tag().c_str()); + if (LOG) logerror("UPD3301 '%s' Read Light Pen\n", tag()); m_mode = MODE_READ_LIGHT_PEN; break; case COMMAND_LOAD_CURSOR_POSITION: - if (LOG) logerror("UPD3301 '%s' Load Cursor Position\n", tag().c_str()); + if (LOG) logerror("UPD3301 '%s' Load Cursor Position\n", tag()); m_mode = MODE_LOAD_CURSOR_POSITION; m_cm = BIT(data, 0); - if (LOG) logerror("UPD3301 '%s' CM: %u\n", tag().c_str(), m_cm); + if (LOG) logerror("UPD3301 '%s' CM: %u\n", tag(), m_cm); break; case COMMAND_RESET_INTERRUPT: - if (LOG) logerror("UPD3301 '%s' Reset Interrupt\n", tag().c_str()); + if (LOG) logerror("UPD3301 '%s' Reset Interrupt\n", tag()); set_interrupt(0); break; case COMMAND_RESET_COUNTERS: - if (LOG) logerror("UPD3301 '%s' Reset Counters\n", tag().c_str()); + if (LOG) logerror("UPD3301 '%s' Reset Counters\n", tag()); 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().c_str(), state); + if (LOG) logerror("UPD3301 '%s' Interrupt: %u\n", tag(), 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().c_str(), state); + if (LOG) logerror("UPD3301 '%s' DRQ: %u\n", tag(), 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().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); + 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); } 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 857e91946d7..0507eb25e6c 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, std::string tag, device_t *owner, UINT32 clock); + upd3301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_character_width(device_t &device, int value) { downcast(device).m_width = value; } static void static_set_display_callback(device_t &device, upd3301_draw_character_delegate callback) { downcast(device).m_display_cb = callback; } diff --git a/src/devices/video/upd7220.cpp b/src/devices/video/upd7220.cpp index f1368f08624..23548f1ecd7 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().c_str(), horiz_pix_total, vert_pix_total, 1 / ATTOSECONDS_TO_DOUBLE(refresh))); + LOG(("uPD7220 '%s' Screen: %u x %u @ %f Hz\n", tag(), 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, std::string tag, device_t *owner, UINT32 clock) : +upd7220_device::upd7220_device(const machine_config &mconfig, const char *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().c_str(), m_cr); + logerror("uPD7220 '%s' Invalid Command Byte %02x\n", tag(), m_cr); break; case COMMAND_5A: if (m_param_ptr == 4) - logerror("uPD7220 '%s' Undocumented Command 0x5A Executed %02x %02x %02x\n", tag().c_str(),m_pr[1],m_pr[2],m_pr[3] ); + logerror("uPD7220 '%s' Undocumented Command 0x5A Executed %02x %02x %02x\n", tag(),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().c_str())); + LOG(("uPD7220 '%s' RESET\n", tag())); 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().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)); + 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)); recompute_parameters(); break; @@ -1167,16 +1167,16 @@ void upd7220_device::process_fifo() m_pitch = m_aw; - 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)); + 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)); 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().c_str(), m_m)); + LOG(("uPD7220 '%s' M: %u\n", tag(), 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().c_str(), m_lr)); - LOG(("uPD7220 '%s' DC: %u\n", tag().c_str(), m_dc)); + LOG(("uPD7220 '%s' LR: %u\n", tag(), m_lr)); + LOG(("uPD7220 '%s' DC: %u\n", tag(), 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().c_str(), m_ctop)); - LOG(("uPD7220 '%s' SC: %u\n", tag().c_str(), m_sc)); + LOG(("uPD7220 '%s' CTOP: %u\n", tag(), m_ctop)); + LOG(("uPD7220 '%s' SC: %u\n", tag(), 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().c_str(), m_br)); - LOG(("uPD7220 '%s' CBOT: %u\n", tag().c_str(), m_cbot)); + LOG(("uPD7220 '%s' BR: %u\n", tag(), m_br)); + LOG(("uPD7220 '%s' CBOT: %u\n", tag(), m_cbot)); } break; case COMMAND_START: /* start display & end idle mode */ m_de = 1; - //LOG(("uPD7220 '%s' DE: 1\n", tag().c_str())); + //LOG(("uPD7220 '%s' DE: 1\n", tag())); break; case COMMAND_BCTRL: /* display blanking control */ m_de = m_cr & 0x01; - //LOG(("uPD7220 '%s' DE: %u\n", tag().c_str(), m_de)); + //LOG(("uPD7220 '%s' DE: %u\n", tag(), 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().c_str(), m_gchr)); - LOG(("uPD7220 '%s' DISP: %01x\n", tag().c_str(), m_disp)); + LOG(("uPD7220 '%s' GCHR: %01x\n", tag(), m_gchr)); + LOG(("uPD7220 '%s' DISP: %01x\n", tag(), 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().c_str(), m_ead)); + LOG(("uPD7220 '%s' EAD: %06x\n", tag(), m_ead)); if(m_param_ptr == 4) { m_dad = m_pr[3] >> 4; - LOG(("uPD7220 '%s' DAD: %01x\n", tag().c_str(), m_dad)); + LOG(("uPD7220 '%s' DAD: %01x\n", tag(), 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().c_str(), m_ra_addr, data)); + LOG(("uPD7220 '%s' RA%u: %02x\n", tag(), 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().c_str(), m_pitch)); + LOG(("uPD7220 '%s' PITCH: %u\n", tag(), 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().c_str(), m_mask)); + LOG(("uPD7220 '%s' MASK: %04x\n", tag(), 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().c_str(),m_figs.m_figure_type); + logerror("uPD7220 '%s' Unimplemented command FIGD %02x\n", tag(),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().c_str(),m_figs.m_figure_type); + logerror("uPD7220 '%s' Unimplemented command GCHRD %02x\n", tag(),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().c_str()); + logerror("uPD7220 '%s' Unimplemented command DMAR\n", tag()); break; case COMMAND_DMAW: /* DMA write request */ - logerror("uPD7220 '%s' Unimplemented command DMAW\n", tag().c_str()); + logerror("uPD7220 '%s' Unimplemented command DMAW\n", tag()); 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().c_str(), state)); + //LOG(("uPD7220 '%s' External Synchronization: %u\n", tag(), 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().c_str())); + LOG(("uPD7220 '%s' Invalid Display Mode!\n", tag())); } } return 0; diff --git a/src/devices/video/upd7220.h b/src/devices/video/upd7220.h index 239ca5b67ec..dbde33a93f8 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, std::string tag, device_t *owner, UINT32 clock); + upd7220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_display_pixels_callback(device_t &device, upd7220_display_pixels_delegate callback) { downcast(device).m_display_cb = callback; } static void static_set_draw_text_callback(device_t &device, upd7220_draw_text_delegate callback) { downcast(device).m_draw_text_cb = callback; } diff --git a/src/devices/video/upd7227.cpp b/src/devices/video/upd7227.cpp index 3d36e9652af..99800496a28 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, std::string tag, device_t *owner, UINT32 clock) +upd7227_device::upd7227_device(const machine_config &mconfig, const char *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 6889b3f72ae..681f63a7c17 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, std::string tag, device_t *owner, UINT32 clock); + upd7227_device(const machine_config &mconfig, const char *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 1ef39a39279..38adc1e58aa 100644 --- a/src/devices/video/v9938.cpp +++ b/src/devices/video/v9938.cpp @@ -88,7 +88,7 @@ const device_type V9938 = &device_creator; const device_type V9958 = &device_creator; -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) +v99x8_device::v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, name, 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, std::string tag, device_t *owner, UINT32 clock) +v9938_device::v9938_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock) +v9958_device::v9958_device(const machine_config &mconfig, const char *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 583df876df5..c2f9d356666 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, std::string tag, device_t *owner, UINT32 clock); + v99x8_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock); public: template void set_interrupt_callback(_irq irq) { @@ -277,7 +277,7 @@ protected: class v9938_device : public v99x8_device { public: - v9938_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v9938_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + v9958_device(const machine_config &mconfig, const char *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 3d911940860..8df490408f8 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(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vic3_device::vic3_device(const machine_config &mconfig, const char *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 23f7f680e47..b4b179d43d5 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, std::string tag, device_t *owner, UINT32 clock); + vic3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~vic3_device() {} - static void static_set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu.set_tag(tag); } + static void static_set_cpu_tag(device_t &device, const char *tag) { downcast(device).m_cpu.set_tag(tag); } static void set_vic3_type(device_t &device, vic3_type type) { downcast(device).m_type = type; } template static devcb_base &set_dma_read_callback(device_t &device, _Object object) { return downcast(device).m_dma_read_cb.set_callback(object); } template static devcb_base &set_dma_read_color_callback(device_t &device, _Object object) { return downcast(device).m_dma_read_color_cb.set_callback(object); } diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp index 060ab9736cc..07a3c06f815 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.empty()); - assert(!m_cputag.empty()); + assert(m_screen != nullptr); + assert(m_cputag != nullptr); assert(m_fbmem > 0); /* store a pointer back to the device */ @@ -5831,11 +5831,13 @@ static void dump_rasterizer_stats(voodoo_state *v) } } -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) +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) : 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) { @@ -5883,7 +5885,7 @@ void voodoo_device::device_stop() const device_type VOODOO_1 = &device_creator; -voodoo_1_device::voodoo_1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +voodoo_1_device::voodoo_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : voodoo_device(mconfig, VOODOO_1, "3dfx Voodoo Graphics", tag, owner, clock, "voodoo_1", __FILE__) { } @@ -5900,7 +5902,7 @@ void voodoo_1_device::device_start() const device_type VOODOO_2 = &device_creator; -voodoo_2_device::voodoo_2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +voodoo_2_device::voodoo_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : voodoo_device(mconfig, VOODOO_2, "3dfx Voodoo 2", tag, owner, clock, "voodoo_2", __FILE__) { } @@ -5917,12 +5919,12 @@ void voodoo_2_device::device_start() const device_type VOODOO_BANSHEE = &device_creator; -voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, const char *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, std::string 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, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : voodoo_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -5939,7 +5941,7 @@ void voodoo_banshee_device::device_start() const device_type VOODOO_3 = &device_creator; -voodoo_3_device::voodoo_3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +voodoo_3_device::voodoo_3_device(const machine_config &mconfig, const char *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 9a61385046d..3d92f17f86a 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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + 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(); static void static_set_fbmem(device_t &device, int value) { downcast(device).m_fbmem = value; } static void static_set_tmumem(device_t &device, int value1, int value2) { downcast(device).m_tmumem0 = value1; downcast(device).m_tmumem1 = value2; } - static void static_set_screen_tag(device_t &device, std::string tag) { downcast(device).m_screen = tag; } - static void static_set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cputag = tag; } + static void static_set_screen_tag(device_t &device, const char *tag) { downcast(device).m_screen = tag; } + static void static_set_cpu_tag(device_t &device, const char *tag) { downcast(device).m_cputag = tag; } template static devcb_base &static_set_vblank_callback(device_t &device, _Object object) { return downcast(device).m_vblank.set_callback(object); } template static devcb_base &static_set_stall_callback(device_t &device, _Object object) { return downcast(device).m_stall.set_callback(object); } @@ -92,8 +92,8 @@ public: UINT8 m_fbmem; UINT8 m_tmumem0; UINT8 m_tmumem1; - std::string m_screen; - std::string m_cputag; + const char * m_screen; + const char * 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, std::string tag, device_t *owner, UINT32 clock); + voodoo_1_device(const machine_config &mconfig, const char *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, std::string tag, device_t *owner, UINT32 clock); + voodoo_2_device(const machine_config &mconfig, const char *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, 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); + 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); 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, std::string tag, device_t *owner, UINT32 clock); + voodoo_3_device(const machine_config &mconfig, const char *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 2f292af5d49..7570a007efb 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, std::string tag, device_t *owner, UINT32 clock) +voodoo_pci_device::voodoo_pci_device(const machine_config &mconfig, const char *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(std::string _cpu_tag) +void voodoo_pci_device::set_cpu_tag(const char *_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().c_str()); + logerror("%s: map_extra\n", this->tag()); // 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().c_str(), 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(), 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 d7047b84873..93621cd0fa6 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, std::string tag, device_t *owner, UINT32 clock); + voodoo_pci_device(const machine_config &mconfig, const char *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(std::string tag); + void set_cpu_tag(const char *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 m_voodoo; static int m_type; int m_fbmem, m_tmumem0, m_tmumem1; - std::string m_cpu_tag; + const char *m_cpu_tag; UINT32 m_pcictrl_reg[0x10]; DECLARE_ADDRESS_MAP(voodoo_reg_map, 32); diff --git a/src/emu/addrmap.cpp b/src/emu/addrmap.cpp index 0403008b110..2ae44142ac1 100644 --- a/src/emu/addrmap.cpp +++ b/src/emu/addrmap.cpp @@ -36,6 +36,8 @@ address_map_entry::address_map_entry(device_t &device, address_map &map, offs_t m_addrend((map.m_globalmask == 0) ? end : end & map.m_globalmask), m_addrmirror(0), m_addrmask(0), + m_share(nullptr), + m_region(nullptr), m_rgnoffs(0), m_submap_bits(0), m_memory(nullptr), @@ -64,7 +66,7 @@ void address_map_entry::set_mask(offs_t _mask) // retrieve a submap from a device //------------------------------------------------- -void address_map_entry::set_submap(std::string tag, address_map_delegate func, int bits, UINT64 mask) +void address_map_entry::set_submap(const char *tag, address_map_delegate func, int bits, UINT64 mask) { if(!bits) bits = m_map.m_databits; @@ -335,12 +337,12 @@ address_map::address_map(device_t &device, address_spacenum spacenum) // get our memory interface const device_memory_interface *memintf; if (!device.interface(memintf)) - throw emu_fatalerror("No memory interface defined for device '%s'\n", device.tag().c_str()); + throw emu_fatalerror("No memory interface defined for device '%s'\n", device.tag()); // and then the configuration for the current address space const address_space_config *spaceconfig = memintf->space_config(spacenum); if (spaceconfig == nullptr) - throw emu_fatalerror("No memory address space configuration found for device '%s', space %d\n", device.tag().c_str(), spacenum); + throw emu_fatalerror("No memory address space configuration found for device '%s', space %d\n", device.tag(), spacenum); // construct the internal device map (first so it takes priority) if (spaceconfig->m_internal_map != nullptr) @@ -676,14 +678,14 @@ void address_map::map_validity_check(validity_checker &valid, const device_t &de osd_printf_error("Wrong %s memory read handler start = %08x, end = %08x ALIGN = %d\n", spaceconfig.m_name, entry->m_addrstart, entry->m_addrend, alignunit); // if this is a program space, auto-assign implicit ROM entries - if (entry->m_read.m_type == AMH_ROM && entry->m_region.empty()) + if (entry->m_read.m_type == AMH_ROM && entry->m_region == nullptr) { entry->m_region = device.tag(); entry->m_rgnoffs = entry->m_addrstart; } // if this entry references a memory region, validate it - if (!entry->m_region.empty() && entry->m_share.empty()) + if (entry->m_region != nullptr && entry->m_share == nullptr) { // make sure we can resolve the full path to the region bool found = false; @@ -699,21 +701,21 @@ void address_map::map_validity_check(validity_checker &valid, const device_t &de // verify the address range is within the region's bounds offs_t length = ROMREGION_GETLENGTH(romp); if (entry->m_rgnoffs + (byteend - bytestart + 1) > length) - osd_printf_error("%s space memory map entry %X-%X extends beyond region '%s' size (%X)\n", spaceconfig.m_name, entry->m_addrstart, entry->m_addrend, entry->m_region.c_str(), length); + osd_printf_error("%s space memory map entry %X-%X extends beyond region '%s' size (%X)\n", spaceconfig.m_name, entry->m_addrstart, entry->m_addrend, entry->m_region, length); found = true; } } // error if not found if (!found) - osd_printf_error("%s space memory map entry %X-%X references non-existant region '%s'\n", spaceconfig.m_name, entry->m_addrstart, entry->m_addrend, entry->m_region.c_str()); + osd_printf_error("%s space memory map entry %X-%X references non-existant region '%s'\n", spaceconfig.m_name, entry->m_addrstart, entry->m_addrend, entry->m_region); } // make sure all devices exist if (entry->m_read.m_type == AMH_DEVICE_DELEGATE) { // extract the device tag from the proto-delegate - std::string devtag; + const char *devtag = nullptr; switch (entry->m_read.m_bits) { case 8: devtag = entry->m_rproto8.device_name(); break; @@ -723,12 +725,12 @@ void address_map::map_validity_check(validity_checker &valid, const device_t &de } if (entry->m_devbase.subdevice(devtag) == nullptr) osd_printf_error("%s space memory map entry reads from nonexistant device '%s'\n", spaceconfig.m_name, - !devtag.empty() ? devtag.c_str() : ""); + devtag != nullptr ? devtag : ""); } if (entry->m_write.m_type == AMH_DEVICE_DELEGATE) { // extract the device tag from the proto-delegate - std::string devtag; + const char *devtag = nullptr; switch (entry->m_write.m_bits) { case 8: devtag = entry->m_wproto8.device_name(); break; @@ -738,15 +740,15 @@ void address_map::map_validity_check(validity_checker &valid, const device_t &de } if (entry->m_devbase.subdevice(devtag) == nullptr) osd_printf_error("%s space memory map entry writes to nonexistant device '%s'\n", spaceconfig.m_name, - !devtag.empty() ? devtag.c_str() : ""); + devtag != nullptr ? devtag : ""); } if (entry->m_setoffsethd.m_type == AMH_DEVICE_DELEGATE) { // extract the device tag from the proto-delegate - std::string devtag = entry->m_soproto.device_name(); + const char *devtag = entry->m_soproto.device_name(); if (entry->m_devbase.subdevice(devtag) == nullptr) osd_printf_error("%s space memory map entry references nonexistant device '%s'\n", spaceconfig.m_name, - !devtag.empty() ? devtag.c_str() : ""); + devtag != nullptr ? devtag : ""); } // make sure ports exist @@ -756,10 +758,10 @@ void address_map::map_validity_check(validity_checker &valid, const device_t &de // validate bank and share tags if (entry->m_read.m_type == AMH_BANK) - valid.validate_tag(entry->m_read.m_tag.c_str()); + valid.validate_tag(entry->m_read.m_tag); if (entry->m_write.m_type == AMH_BANK) - valid.validate_tag(entry->m_write.m_tag.c_str()); - if (!entry->m_share.empty()) - valid.validate_tag(entry->m_share.c_str()); + valid.validate_tag(entry->m_write.m_tag); + if (entry->m_share != nullptr) + valid.validate_tag(entry->m_share); } } diff --git a/src/emu/addrmap.h b/src/emu/addrmap.h index 3586d5f486f..492ad21b03b 100644 --- a/src/emu/addrmap.h +++ b/src/emu/addrmap.h @@ -55,13 +55,14 @@ public: : m_type(AMH_NONE), m_bits(0), m_mask(0), - m_name(nullptr) { } + m_name(nullptr), + m_tag(nullptr) { } map_handler_type m_type; // type of the handler UINT8 m_bits; // width of the handler in bits, or 0 for default UINT64 m_mask; // mask for which lanes apply const char * m_name; // name of the handler - std::string m_tag; // tag for I/O ports and banks + const char * m_tag; // tag for I/O ports and banks }; @@ -82,27 +83,27 @@ public: void set_mirror(offs_t _mirror) { m_addrmirror = _mirror; } void set_read_type(map_handler_type _type) { m_read.m_type = _type; } void set_write_type(map_handler_type _type) { m_write.m_type = _type; } - void set_region(std::string tag, offs_t offset) { m_region = tag; m_rgnoffs = offset; } - void set_share(std::string tag) { m_share = tag; } + void set_region(const char *tag, offs_t offset) { m_region = tag; m_rgnoffs = offset; } + void set_share(const char *tag) { m_share = tag; } // mask setting void set_mask(offs_t _mask); // I/O port configuration - void set_read_port(std::string tag) { m_read.m_type = AMH_PORT; m_read.m_tag = tag; } - void set_write_port(std::string tag) { m_write.m_type = AMH_PORT; m_write.m_tag = tag; } - void set_readwrite_port(std::string tag) { set_read_port(tag); set_write_port(tag); } + void set_read_port(const char *tag) { m_read.m_type = AMH_PORT; m_read.m_tag = tag; } + void set_write_port(const char *tag) { m_write.m_type = AMH_PORT; m_write.m_tag = tag; } + void set_readwrite_port(const char *tag) { set_read_port(tag); set_write_port(tag); } // memory bank configuration - void set_read_bank(std::string tag) { m_read.m_type = AMH_BANK; m_read.m_tag = tag; } - void set_write_bank(std::string tag) { m_write.m_type = AMH_BANK; m_write.m_tag = tag; } - void set_readwrite_bank(std::string tag) { set_read_bank(tag); set_write_bank(tag); } + void set_read_bank(const char *tag) { m_read.m_type = AMH_BANK; m_read.m_tag = tag; } + void set_write_bank(const char *tag) { m_write.m_type = AMH_BANK; m_write.m_tag = tag; } + void set_readwrite_bank(const char *tag) { set_read_bank(tag); set_write_bank(tag); } // set offset handler (only one version, since there is no data width to consider) void set_handler(setoffset_delegate func); // submap referencing - void set_submap(std::string tag, address_map_delegate func, int bits, UINT64 mask); + void set_submap(const char *tag, address_map_delegate func, int bits, UINT64 mask); // public state address_map_entry * m_next; // pointer to the next entry @@ -117,8 +118,8 @@ public: map_handler_data m_read; // data for read handler map_handler_data m_write; // data for write handler map_handler_data m_setoffsethd; // data for setoffset handler - std::string m_share; // tag of a shared memory block - std::string m_region; // tag of region containing the memory backing this entry + const char * m_share; // tag of a shared memory block + const char * m_region; // tag of region containing the memory backing this entry offs_t m_rgnoffs; // offset within the region // handlers diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp index c5607c11d6a..aa224126a60 100644 --- a/src/emu/clifront.cpp +++ b/src/emu/clifront.cpp @@ -247,7 +247,7 @@ int cli_frontend::execute(int argc, char **argv) } catch (add_exception &aex) { - osd_printf_error("Tag '%s' already exists in tagged_list\n", aex.tag().c_str()); + osd_printf_error("Tag '%s' already exists in tagged_list\n", aex.tag()); m_result = MAMERR_FATALERROR; } catch (std::exception &ex) @@ -553,7 +553,7 @@ int cli_frontend::compare_devices(const void *i1, const void *i2) { device_t *dev1 = *(device_t **)i1; device_t *dev2 = *(device_t **)i2; - return dev1->tag()!=dev2->tag(); + return strcmp(dev1->tag(), dev2->tag()); } void cli_frontend::listdevices(const char *gamename) @@ -586,28 +586,27 @@ void cli_frontend::listdevices(const char *gamename) for (auto device : device_list) { // extract the tag, stripping the leading colon - std::string tag = device->tag(); - if (tag[0] == ':') - tag = tag.erase(0, 1); + const char *tag = device->tag(); + if (*tag == ':') + tag++; // determine the depth int depth = 1; - if (tag.empty()) + if (*tag == 0) { tag = ""; depth = 0; } else { - const char *tag_c = tag.c_str(); - for (const char *c = tag_c; *c != 0; c++) + for (const char *c = tag; *c != 0; c++) if (*c == ':') { - tag_c = c + 1; + tag = c + 1; depth++; } } - printf(" %*s%-*s %s", depth * 2, "", 30 - depth * 2, tag.c_str(), device->name()); + printf(" %*s%-*s %s", depth * 2, "", 30 - depth * 2, tag, device->name()); // add more information UINT32 clock = device->clock(); @@ -652,7 +651,7 @@ void cli_frontend::listslots(const char *gamename) { if (slot->fixed()) continue; // output the line, up to the list of extensions - printf("%-13s%-10s ", first ? drivlist.driver().name : "", std::string(slot->device().tag()).erase(0,1).c_str()); + printf("%-13s%-10s ", first ? drivlist.driver().name : "", slot->device().tag()+1); bool first_option = true; diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp index 6020e779acd..4558413b2c3 100644 --- a/src/emu/debug/debugcmd.cpp +++ b/src/emu/debug/debugcmd.cpp @@ -603,7 +603,7 @@ int debug_command_parameter_cpu_space(running_machine &machine, const char *para /* fetch the space pointer */ if (!cpu->memory().has_space(spacenum)) { - debug_console_printf(machine, "No matching memory space found for CPU '%s'\n", cpu->tag().c_str()); + debug_console_printf(machine, "No matching memory space found for CPU '%s'\n", cpu->tag()); return FALSE; } result = &cpu->memory().space(spacenum); @@ -1013,7 +1013,7 @@ static void execute_focus(running_machine &machine, int ref, int params, const c for (device_execute_interface *exec = iter.first(); exec != nullptr; exec = iter.next()) if (&exec->device() != cpu) exec->device().debug()->ignore(true); - debug_console_printf(machine, "Now focused on CPU '%s'\n", cpu->tag().c_str()); + debug_console_printf(machine, "Now focused on CPU '%s'\n", cpu->tag()); } @@ -1036,9 +1036,9 @@ static void execute_ignore(running_machine &machine, int ref, int params, const if (!exec->device().debug()->observing()) { if (buffer.empty()) - strprintf(buffer, "Currently ignoring device '%s'", exec->device().tag().c_str()); + strprintf(buffer, "Currently ignoring device '%s'", exec->device().tag()); else - strcatprintf(buffer, ", '%s'", exec->device().tag().c_str()); + strcatprintf(buffer, ", '%s'", exec->device().tag()); } /* special message for none */ @@ -1076,7 +1076,7 @@ static void execute_ignore(running_machine &machine, int ref, int params, const } devicelist[paramnum]->debug()->ignore(true); - debug_console_printf(machine, "Now ignoring device '%s'\n", devicelist[paramnum]->tag().c_str()); + debug_console_printf(machine, "Now ignoring device '%s'\n", devicelist[paramnum]->tag()); } } } @@ -1101,9 +1101,9 @@ static void execute_observe(running_machine &machine, int ref, int params, const if (exec->device().debug()->observing()) { if (buffer.empty()) - strprintf(buffer, "Currently observing CPU '%s'", exec->device().tag().c_str()); + strprintf(buffer, "Currently observing CPU '%s'", exec->device().tag()); else - strcatprintf(buffer, ", '%s'", exec->device().tag().c_str()); + strcatprintf(buffer, ", '%s'", exec->device().tag()); } /* special message for none */ @@ -1126,7 +1126,7 @@ static void execute_observe(running_machine &machine, int ref, int params, const for (int paramnum = 0; paramnum < params; paramnum++) { devicelist[paramnum]->debug()->ignore(false); - debug_console_printf(machine, "Now observing device '%s'\n", devicelist[paramnum]->tag().c_str()); + debug_console_printf(machine, "Now observing device '%s'\n", devicelist[paramnum]->tag()); } } } @@ -1324,7 +1324,7 @@ static void execute_bplist(running_machine &machine, int ref, int params, const for (device_t *device = iter.first(); device != nullptr; device = iter.next()) if (device->debug()->breakpoint_first() != nullptr) { - debug_console_printf(machine, "Device '%s' breakpoints:\n", device->tag().c_str()); + debug_console_printf(machine, "Device '%s' breakpoints:\n", device->tag()); /* loop over the breakpoints */ for (device_debug::breakpoint *bp = device->debug()->breakpoint_first(); bp != nullptr; bp = bp->next()) @@ -1490,7 +1490,7 @@ static void execute_wplist(running_machine &machine, int ref, int params, const { static const char *const types[] = { "unkn ", "read ", "write", "r/w " }; - debug_console_printf(machine, "Device '%s' %s space watchpoints:\n", device->tag().c_str(), + debug_console_printf(machine, "Device '%s' %s space watchpoints:\n", device->tag(), device->debug()->watchpoint_first(spacenum)->space().name()); /* loop over the watchpoints */ @@ -1634,7 +1634,7 @@ static void execute_rplist(running_machine &machine, int ref, int params, const for (device_t *device = iter.first(); device != nullptr; device = iter.next()) if (device->debug()->registerpoint_first() != nullptr) { - debug_console_printf(machine, "Device '%s' registerpoints:\n", device->tag().c_str()); + debug_console_printf(machine, "Device '%s' registerpoints:\n", device->tag()); /* loop over the breakpoints */ for (device_debug::registerpoint *rp = device->debug()->registerpoint_first(); rp != nullptr; rp = rp->next()) @@ -1671,7 +1671,7 @@ static void execute_hotspot(running_machine &machine, int ref, int params, const if (device->debug()->hotspot_tracking_enabled()) { device->debug()->hotspot_track(0, 0); - debug_console_printf(machine, "Cleared hotspot tracking on CPU '%s'\n", device->tag().c_str()); + debug_console_printf(machine, "Cleared hotspot tracking on CPU '%s'\n", device->tag()); cleared = true; } @@ -1693,7 +1693,7 @@ static void execute_hotspot(running_machine &machine, int ref, int params, const /* attempt to install */ device->debug()->hotspot_track(count, threshhold); - debug_console_printf(machine, "Now tracking hotspots on CPU '%s' using %d slots with a threshhold of %d\n", device->tag().c_str(), (int)count, (int)threshhold); + debug_console_printf(machine, "Now tracking hotspots on CPU '%s' using %d slots with a threshhold of %d\n", device->tag(), (int)count, (int)threshhold); } @@ -1989,14 +1989,14 @@ static void execute_cheatinit(running_machine &machine, int ref, int params, con { cheat_region[region_count].offset = space->address_to_byte(entry->m_addrstart) & space->bytemask(); cheat_region[region_count].endoffset = space->address_to_byte(entry->m_addrend) & space->bytemask(); - cheat_region[region_count].share = entry->m_share.c_str(); + cheat_region[region_count].share = entry->m_share; cheat_region[region_count].disabled = (entry->m_write.m_type == AMH_RAM) ? FALSE : TRUE; /* disable double share regions */ - if (!entry->m_share.empty()) + if (entry->m_share != nullptr) for (i = 0; i < region_count; i++) if (cheat_region[i].share != nullptr) - if (strcmp(cheat_region[i].share, entry->m_share.c_str()) == 0) + if (strcmp(cheat_region[i].share, entry->m_share) == 0) cheat_region[region_count].disabled = TRUE; region_count++; @@ -2071,7 +2071,7 @@ static void execute_cheatinit(running_machine &machine, int ref, int params, con /* give a detailed init message to avoid searches being mistakingly carried out on the wrong CPU */ device_t *cpu = nullptr; debug_command_parameter_cpu(machine, cheat.cpu, &cpu); - debug_console_printf(machine, "%u cheat initialized for CPU index %s ( aka %s )\n", active_cheat, cheat.cpu, cpu->tag().c_str()); + debug_console_printf(machine, "%u cheat initialized for CPU index %s ( aka %s )\n", active_cheat, cheat.cpu, cpu->tag()); } @@ -2305,7 +2305,7 @@ static void execute_cheatlist(running_machine &machine, int ref, int params, con active_cheat++; fprintf(f, " \n", active_cheat, core_i64_hex_format(address, space->logaddrchars()), core_i64_hex_format(value, cheat.width * 2)); fprintf(f, " \n"); fprintf(f, " \n\n"); } @@ -2607,9 +2607,9 @@ static void execute_trace_internal(running_machine &machine, int ref, int params /* do it */ cpu->debug()->trace(f, trace_over, action); if (f) - debug_console_printf(machine, "Tracing CPU '%s' to file %s\n", cpu->tag().c_str(), filename.c_str()); + debug_console_printf(machine, "Tracing CPU '%s' to file %s\n", cpu->tag(), filename.c_str()); else - debug_console_printf(machine, "Stopped tracing on CPU '%s'\n", cpu->tag().c_str()); + debug_console_printf(machine, "Stopped tracing on CPU '%s'\n", cpu->tag()); } @@ -2945,7 +2945,7 @@ static void execute_symlist(running_machine &machine, int ref, int params, const if (!debug_command_parameter_cpu(machine, param[0], &cpu)) return; symtable = &cpu->debug()->symtable(); - debug_console_printf(machine, "CPU '%s' symbols:\n", cpu->tag().c_str()); + debug_console_printf(machine, "CPU '%s' symbols:\n", cpu->tag()); } else { diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp index 5fb60b71b00..82c175251fe 100644 --- a/src/emu/debug/debugcpu.cpp +++ b/src/emu/debug/debugcpu.cpp @@ -319,7 +319,7 @@ bool debug_comment_save(running_machine &machine) xml_data_node *curnode = xml_add_child(systemnode, "cpu", nullptr); if (curnode == nullptr) throw emu_exception(); - xml_set_attribute(curnode, "tag", device->tag().c_str()); + xml_set_attribute(curnode, "tag", device->tag()); // export the comments if (!device->debug()->comment_export(*curnode)) @@ -1110,7 +1110,7 @@ static void process_source_file(running_machine &machine) based on a case insensitive tag search -------------------------------------------------*/ -static device_t *expression_get_device(running_machine &machine, std::string tag) +static device_t *expression_get_device(running_machine &machine, const char *tag) { // convert to lowercase then lookup the name (tags are enforced to be all lower case) std::string fullname(tag); @@ -1792,7 +1792,7 @@ void device_debug::interrupt_hook(int irqline) if ((m_flags & DEBUG_FLAG_STOP_INTERRUPT) != 0 && (m_stopirq == -1 || m_stopirq == irqline)) { global->execution_state = EXECUTION_STATE_STOPPED; - debug_console_printf(m_device.machine(), "Stopped on interrupt (CPU '%s', IRQ %d)\n", m_device.tag().c_str(), irqline); + debug_console_printf(m_device.machine(), "Stopped on interrupt (CPU '%s', IRQ %d)\n", m_device.tag(), irqline); compute_debug_flags(); } } @@ -1811,7 +1811,7 @@ void device_debug::exception_hook(int exception) if ((m_flags & DEBUG_FLAG_STOP_EXCEPTION) != 0 && (m_stopexception == -1 || m_stopexception == exception)) { global->execution_state = EXECUTION_STATE_STOPPED; - debug_console_printf(m_device.machine(), "Stopped on exception (CPU '%s', exception %d)\n", m_device.tag().c_str(), exception); + debug_console_printf(m_device.machine(), "Stopped on exception (CPU '%s', exception %d)\n", m_device.tag(), exception); compute_debug_flags(); } } @@ -1889,7 +1889,7 @@ void device_debug::instruction_hook(offs_t curpc) // check the temp running breakpoint and break if we hit it else if ((m_flags & DEBUG_FLAG_STOP_PC) != 0 && m_stopaddr == curpc) { - debug_console_printf(machine, "Stopped at temporary breakpoint %X on CPU '%s'\n", m_stopaddr, m_device.tag().c_str()); + debug_console_printf(machine, "Stopped at temporary breakpoint %X on CPU '%s'\n", m_stopaddr, m_device.tag()); global->execution_state = EXECUTION_STATE_STOPPED; } diff --git a/src/emu/debug/dvbpoints.cpp b/src/emu/debug/dvbpoints.cpp index b72c0081cf2..efb604e385d 100644 --- a/src/emu/debug/dvbpoints.cpp +++ b/src/emu/debug/dvbpoints.cpp @@ -43,7 +43,7 @@ static int cCpuAscending(const void* a, const void* b) { const device_debug::breakpoint* left = *(device_debug::breakpoint**)a; const device_debug::breakpoint* right = *(device_debug::breakpoint**)b; - return left->debugInterface()->device().tag() != right->debugInterface()->device().tag(); + return strcmp(left->debugInterface()->device().tag(), right->debugInterface()->device().tag()); } static int cCpuDescending(const void* a, const void* b) @@ -134,7 +134,7 @@ void debug_view_breakpoints::enumerate_sources() for (device_disasm_interface *dasm = iter.first(); dasm != nullptr; dasm = iter.next()) { std::string name; - strprintf(name, "%s '%s'", dasm->device().name(), dasm->device().tag().c_str()); + strprintf(name, "%s '%s'", dasm->device().name(), dasm->device().tag()); m_source_list.append(*global_alloc(debug_view_source(name.c_str(), &dasm->device()))); } diff --git a/src/emu/debug/dvdisasm.cpp b/src/emu/debug/dvdisasm.cpp index 6cf0a5d095d..e873b0be8bb 100644 --- a/src/emu/debug/dvdisasm.cpp +++ b/src/emu/debug/dvdisasm.cpp @@ -99,7 +99,7 @@ void debug_view_disasm::enumerate_sources() std::string name; for (device_disasm_interface *dasm = iter.first(); dasm != nullptr; dasm = iter.next()) { - strprintf(name,"%s '%s'", dasm->device().name(), dasm->device().tag().c_str()); + strprintf(name,"%s '%s'", dasm->device().name(), dasm->device().tag()); m_source_list.append(*global_alloc(debug_view_disasm_source(name.c_str(), dasm->device()))); } diff --git a/src/emu/debug/dvmemory.cpp b/src/emu/debug/dvmemory.cpp index 8fab24d6ccb..b792d002c27 100644 --- a/src/emu/debug/dvmemory.cpp +++ b/src/emu/debug/dvmemory.cpp @@ -142,7 +142,7 @@ void debug_view_memory::enumerate_sources() if (memintf->has_space(spacenum)) { address_space &space = memintf->space(spacenum); - strprintf(name,"%s '%s' %s space memory", memintf->device().name(), memintf->device().tag().c_str(), space.name()); + strprintf(name,"%s '%s' %s space memory", memintf->device().name(), memintf->device().tag(), space.name()); m_source_list.append(*global_alloc(debug_view_memory_source(name.c_str(), space))); } diff --git a/src/emu/debug/dvstate.cpp b/src/emu/debug/dvstate.cpp index a761a7d0cbb..578b423725d 100644 --- a/src/emu/debug/dvstate.cpp +++ b/src/emu/debug/dvstate.cpp @@ -78,7 +78,7 @@ void debug_view_state::enumerate_sources() std::string name; for (device_state_interface *state = iter.first(); state != nullptr; state = iter.next()) { - strprintf(name,"%s '%s'", state->device().name(), state->device().tag().c_str()); + strprintf(name,"%s '%s'", state->device().name(), state->device().tag()); m_source_list.append(*global_alloc(debug_view_state_source(name.c_str(), state->device()))); } diff --git a/src/emu/debug/dvwpoints.cpp b/src/emu/debug/dvwpoints.cpp index 9a184ee0cc4..c1e346c62b2 100644 --- a/src/emu/debug/dvwpoints.cpp +++ b/src/emu/debug/dvwpoints.cpp @@ -41,7 +41,7 @@ static int cCpuAscending(const void* a, const void* b) { const device_debug::watchpoint* left = *(device_debug::watchpoint**)a; const device_debug::watchpoint* right = *(device_debug::watchpoint**)b; - return left->debugInterface()->device().tag() != right->debugInterface()->device().tag(); + return strcmp(left->debugInterface()->device().tag(), right->debugInterface()->device().tag()); } static int cCpuDescending(const void* a, const void* b) @@ -155,7 +155,7 @@ void debug_view_watchpoints::enumerate_sources() for (device_disasm_interface *dasm = iter.first(); dasm != nullptr; dasm = iter.next()) { std::string name; - strprintf(name, "%s '%s'", dasm->device().name(), dasm->device().tag().c_str()); + strprintf(name, "%s '%s'", dasm->device().name(), dasm->device().tag()); m_source_list.append(*global_alloc(debug_view_source(name.c_str(), &dasm->device()))); } diff --git a/src/emu/devcb.cpp b/src/emu/devcb.cpp index 6bb92fb35e1..d54c25e530b 100644 --- a/src/emu/devcb.cpp +++ b/src/emu/devcb.cpp @@ -37,9 +37,9 @@ devcb_base::devcb_base(device_t &device, UINT64 defmask) void devcb_base::reset(callback_type type) { m_type = type; - m_target_tag.clear(); + m_target_tag = nullptr; m_target_int = 0; - m_space_tag.clear(); + m_space_tag = nullptr; m_space_num = AS_0; m_space = nullptr; m_target.ptr = nullptr; @@ -56,9 +56,9 @@ void devcb_base::reset(callback_type type) void devcb_base::resolve_ioport() { // attempt to resolve, fatal error if fail - m_target.ioport = (!m_target_tag.empty()) ? m_device.owner()->ioport(m_target_tag) : nullptr; + m_target.ioport = (m_target_tag != nullptr) ? m_device.owner()->ioport(m_target_tag) : nullptr; if (m_target.ioport == nullptr) - throw emu_fatalerror("Unable to resolve I/O port callback reference to '%s' in device '%s'\n", m_target_tag.c_str(), m_device.tag().c_str()); + throw emu_fatalerror("Unable to resolve I/O port callback reference to '%s' in device '%s'\n", m_target_tag, m_device.tag()); } @@ -70,14 +70,14 @@ void devcb_base::resolve_ioport() void devcb_base::resolve_inputline() { // attempt to resolve, fatal error if fail - m_target.device = (!m_target_tag.empty()) ? m_device.owner()->subdevice(m_target_tag) : nullptr; + m_target.device = (m_target_tag != nullptr) ? m_device.owner()->subdevice(m_target_tag) : nullptr; if (m_target.device == nullptr) - throw emu_fatalerror("Unable to resolve device reference to '%s' in device '%s'\n", m_target_tag.c_str(), m_device.tag().c_str()); + throw emu_fatalerror("Unable to resolve device reference to '%s' in device '%s'\n", m_target_tag, m_device.tag()); // make sure we have an execute interface device_execute_interface *exec; if (!m_target.device->interface(exec)) - throw emu_fatalerror("No execute interface found for device reference to '%s' in device '%s'\n", m_target_tag.c_str(), m_device.tag().c_str()); + throw emu_fatalerror("No execute interface found for device reference to '%s' in device '%s'\n", m_target_tag, m_device.tag()); } @@ -89,11 +89,11 @@ void devcb_base::resolve_inputline() void devcb_base::resolve_space() { // attempt to resolve, fatal error if fail - device_t *spacedev = (!m_space_tag.empty()) ? m_device.owner()->subdevice(m_space_tag) : nullptr; + device_t *spacedev = (m_space_tag != nullptr) ? m_device.owner()->subdevice(m_space_tag) : nullptr; if (spacedev == nullptr) - throw emu_fatalerror("Unable to resolve device reference to '%s' in device '%s'\n", m_space_tag.c_str(), m_device.tag().c_str()); + throw emu_fatalerror("Unable to resolve device reference to '%s' in device '%s'\n", m_space_tag, m_device.tag()); if (!spacedev->memory().has_space(m_space_num)) - throw emu_fatalerror("Unable to resolve device address space %d on '%s' in device '%s'\n", m_space_num, m_space_tag.c_str(), m_device.tag().c_str()); + throw emu_fatalerror("Unable to resolve device address space %d on '%s' in device '%s'\n", m_space_num, m_space_tag, m_device.tag()); m_space = &spacedev->memory().space(m_space_num); } @@ -141,7 +141,7 @@ void devcb_read_base::reset(callback_type type) void devcb_read_base::resolve() { // first resolve any address spaces - if (!m_space_tag.empty()) + if (m_space_tag != nullptr) resolve_space(); else m_space = &downcast(m_device.machine().root_device()).generic_space(); @@ -311,7 +311,7 @@ UINT64 devcb_read_base::read_ioport_adapter(address_space &space, offs_t offset, UINT64 devcb_read_base::read_logged_adapter(address_space &space, offs_t offset, UINT64 mask) { - m_device.logerror("%s: read %s\n", m_device.machine().describe_context(), m_target_tag.c_str()); + m_device.logerror("%s: read %s\n", m_device.machine().describe_context(), m_target_tag); return shift_mask_xor(m_target_int); } @@ -369,7 +369,7 @@ void devcb_write_base::reset(callback_type type) void devcb_write_base::resolve() { // first resolve any address spaces - if (!m_space_tag.empty()) + if (m_space_tag != nullptr) resolve_space(); else m_space = &downcast(m_device.machine().root_device()).generic_space(); diff --git a/src/emu/devcb.h b/src/emu/devcb.h index d5575d6a811..5aefb2b3429 100644 --- a/src/emu/devcb.h +++ b/src/emu/devcb.h @@ -121,8 +121,8 @@ public: class ioport_desc { public: - ioport_desc(std::string tag) { m_tag = tag; } - std::string m_tag; + ioport_desc(const char *tag) { m_tag = tag; } + const char *m_tag; }; class constant_desc @@ -143,8 +143,8 @@ public: class inputline_desc { public: - inputline_desc(std::string tag, int inputnum) { m_tag = tag; m_inputnum = inputnum; } - std::string m_tag; + inputline_desc(const char *tag, int inputnum) { m_tag = tag; m_inputnum = inputnum; } + const char *m_tag; int m_inputnum; }; @@ -176,9 +176,9 @@ protected: // configuration device_t & m_device; // reference to our owning device callback_type m_type; // type of callback registered - std::string m_target_tag; // tag of target object + const char * m_target_tag; // tag of target object UINT64 m_target_int; // integer value of target object - std::string m_space_tag; // tag of address space device + const char * m_space_tag; // tag of address space device address_spacenum m_space_num; // address space number of space device // derived state @@ -296,7 +296,7 @@ class devcb_read_line : public devcb_read_base public: devcb_read_line(device_t &device) : devcb_read_base(device, 0xff) { } int operator()() { return (this->*m_adapter)(*m_space, 0, U64(0xff)) & 1; } - int operator()(address_space &space) { return (this->*m_adapter)((!m_space_tag.empty()) ? *m_space : space, 0, U64(0xff)) & 1; } + int operator()(address_space &space) { return (this->*m_adapter)((m_space_tag != nullptr) ? *m_space : space, 0, U64(0xff)) & 1; } }; @@ -307,7 +307,7 @@ class devcb_read8 : public devcb_read_base public: devcb_read8(device_t &device) : devcb_read_base(device, 0xff) { } UINT8 operator()(offs_t offset = 0, UINT8 mask = 0xff) { return (this->*m_adapter)(*m_space, offset, mask) & mask; } - UINT8 operator()(address_space &space, offs_t offset = 0, UINT8 mask = 0xff) { return (this->*m_adapter)((!m_space_tag.empty()) ? *m_space : space, offset, mask) & mask; } + UINT8 operator()(address_space &space, offs_t offset = 0, UINT8 mask = 0xff) { return (this->*m_adapter)((m_space_tag != nullptr) ? *m_space : space, offset, mask) & mask; } }; @@ -318,7 +318,7 @@ class devcb_read16 : public devcb_read_base public: devcb_read16(device_t &device) : devcb_read_base(device, 0xffff) { } UINT16 operator()(offs_t offset = 0, UINT16 mask = 0xffff) { return (this->*m_adapter)(*m_space, offset, mask) & mask; } - UINT16 operator()(address_space &space, offs_t offset = 0, UINT16 mask = 0xffff) { return (this->*m_adapter)((!m_space_tag.empty()) ? *m_space : space, offset, mask) & mask; } + UINT16 operator()(address_space &space, offs_t offset = 0, UINT16 mask = 0xffff) { return (this->*m_adapter)((m_space_tag != nullptr) ? *m_space : space, offset, mask) & mask; } }; @@ -329,7 +329,7 @@ class devcb_read32 : public devcb_read_base public: devcb_read32(device_t &device) : devcb_read_base(device, 0xffffffff) { } UINT32 operator()(offs_t offset = 0, UINT32 mask = 0xffffffff) { return (this->*m_adapter)(*m_space, offset, mask) & mask; } - UINT32 operator()(address_space &space, offs_t offset = 0, UINT32 mask = 0xffffffff) { return (this->*m_adapter)((!m_space_tag.empty()) ? *m_space : space, offset, mask) & mask; } + UINT32 operator()(address_space &space, offs_t offset = 0, UINT32 mask = 0xffffffff) { return (this->*m_adapter)((m_space_tag != nullptr) ? *m_space : space, offset, mask) & mask; } }; @@ -340,7 +340,7 @@ class devcb_read64 : public devcb_read_base public: devcb_read64(device_t &device) : devcb_read_base(device, U64(0xffffffffffffffff)) { } UINT64 operator()(offs_t offset = 0, UINT64 mask = U64(0xffffffffffffffff)) { return (this->*m_adapter)(*m_space, offset, mask) & mask; } - UINT64 operator()(address_space &space, offs_t offset = 0, UINT64 mask = U64(0xffffffffffffffff)) { return (this->*m_adapter)((!m_space_tag.empty()) ? *m_space : space, offset, mask) & mask; } + UINT64 operator()(address_space &space, offs_t offset = 0, UINT64 mask = U64(0xffffffffffffffff)) { return (this->*m_adapter)((m_space_tag != nullptr) ? *m_space : space, offset, mask) & mask; } }; @@ -351,7 +351,7 @@ class devcb_write_line : public devcb_write_base public: devcb_write_line(device_t &device) : devcb_write_base(device, 0xff) { } void operator()(int state) { (this->*m_adapter)(*m_space, 0, state & 1, U64(0xff)); } - void operator()(address_space &space, int state) { (this->*m_adapter)((!m_space_tag.empty()) ? *m_space : space, 0, state & 1, U64(0xff)); } + void operator()(address_space &space, int state) { (this->*m_adapter)((m_space_tag != nullptr) ? *m_space : space, 0, state & 1, U64(0xff)); } }; @@ -363,7 +363,7 @@ public: devcb_write8(device_t &device) : devcb_write_base(device, 0xff) { } void operator()(UINT8 data, UINT8 mask = 0xff) { (this->*m_adapter)(*m_space, 0, data, mask); } void operator()(offs_t offset, UINT8 data, UINT8 mask = 0xff) { (this->*m_adapter)(*m_space, offset, data, mask); } - void operator()(address_space &space, offs_t offset, UINT8 data, UINT8 mask = 0xff) { (this->*m_adapter)((!m_space_tag.empty()) ? *m_space : space, offset, data, mask); } + void operator()(address_space &space, offs_t offset, UINT8 data, UINT8 mask = 0xff) { (this->*m_adapter)((m_space_tag != nullptr) ? *m_space : space, offset, data, mask); } }; @@ -375,7 +375,7 @@ public: devcb_write16(device_t &device) : devcb_write_base(device, 0xffff) { } void operator()(UINT16 data, UINT16 mask = 0xffff) { (this->*m_adapter)(*m_space, 0, data, mask); } void operator()(offs_t offset, UINT16 data, UINT16 mask = 0xffff) { (this->*m_adapter)(*m_space, offset, data, mask); } - void operator()(address_space &space, offs_t offset, UINT16 data, UINT16 mask = 0xffff) { (this->*m_adapter)((!m_space_tag.empty()) ? *m_space : space, offset, data, mask); } + void operator()(address_space &space, offs_t offset, UINT16 data, UINT16 mask = 0xffff) { (this->*m_adapter)((m_space_tag != nullptr) ? *m_space : space, offset, data, mask); } }; @@ -387,7 +387,7 @@ public: devcb_write32(device_t &device) : devcb_write_base(device, 0xffffffff) { } void operator()(UINT32 data, UINT32 mask = 0xffffffff) { (this->*m_adapter)(*m_space, 0, data, mask); } void operator()(offs_t offset, UINT32 data, UINT32 mask = 0xffffffff) { (this->*m_adapter)(*m_space, offset, data, mask); } - void operator()(address_space &space, offs_t offset, UINT32 data, UINT32 mask = 0xffffffff) { (this->*m_adapter)((!m_space_tag.empty()) ? *m_space : space, offset, data, mask); } + void operator()(address_space &space, offs_t offset, UINT32 data, UINT32 mask = 0xffffffff) { (this->*m_adapter)((m_space_tag != nullptr) ? *m_space : space, offset, data, mask); } }; @@ -399,7 +399,7 @@ public: devcb_write64(device_t &device) : devcb_write_base(device, U64(0xffffffffffffffff)) { } void operator()(UINT64 data, UINT64 mask = U64(0xffffffffffffffff)) { (this->*m_adapter)(*m_space, 0, data, mask); } void operator()(offs_t offset, UINT64 data, UINT64 mask = U64(0xffffffffffffffff)) { (this->*m_adapter)(*m_space, offset, data, mask); } - void operator()(address_space &space, offs_t offset, UINT64 data, UINT64 mask = U64(0xffffffffffffffff)) { (this->*m_adapter)((!m_space_tag.empty()) ? *m_space : space, offset, data, mask); } + void operator()(address_space &space, offs_t offset, UINT64 data, UINT64 mask = U64(0xffffffffffffffff)) { (this->*m_adapter)((m_space_tag != nullptr) ? *m_space : space, offset, data, mask); } }; diff --git a/src/emu/devcpu.cpp b/src/emu/devcpu.cpp index 068bb8b1b8a..00bac6ed1b0 100644 --- a/src/emu/devcpu.cpp +++ b/src/emu/devcpu.cpp @@ -20,7 +20,7 @@ // cpu_device - constructor //------------------------------------------------- -cpu_device::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::cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_execute_interface(mconfig, *this), device_memory_interface(mconfig, *this), diff --git a/src/emu/devcpu.h b/src/emu/devcpu.h index b4898615e53..0a298a4ddf8 100644 --- a/src/emu/devcpu.h +++ b/src/emu/devcpu.h @@ -68,7 +68,7 @@ class cpu_device : public device_t, protected: // construction/destruction - 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(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual ~cpu_device(); }; diff --git a/src/emu/devdelegate.cpp b/src/emu/devdelegate.cpp index f9cbb187e8f..8917d5dfc3f 100644 --- a/src/emu/devdelegate.cpp +++ b/src/emu/devdelegate.cpp @@ -21,7 +21,7 @@ delegate_late_bind &device_delegate_helper::bound_object(device_t &search_root) { device_t *device = search_root.subdevice(m_device_name); if (device == nullptr) - throw emu_fatalerror("Unable to locate device '%s' relative to '%s'\n", m_device_name.c_str(), search_root.tag().c_str()); + throw emu_fatalerror("Unable to locate device '%s' relative to '%s'\n", m_device_name, search_root.tag()); return *device; } @@ -31,7 +31,7 @@ delegate_late_bind &device_delegate_helper::bound_object(device_t &search_root) // the object is not valid //------------------------------------------------- -std::string device_delegate_helper::safe_tag(device_t *object) +const char *device_delegate_helper::safe_tag(device_t *object) { return (object != nullptr) ? object->tag() : "(unknown)"; } diff --git a/src/emu/devdelegate.h b/src/emu/devdelegate.h index 33a1460e8d4..b688cd31261 100644 --- a/src/emu/devdelegate.h +++ b/src/emu/devdelegate.h @@ -27,14 +27,14 @@ class device_delegate_helper { protected: // constructor - device_delegate_helper(std::string devname) : m_device_name(devname) { } + device_delegate_helper(const char *devname) : m_device_name(devname) { } // internal helpers delegate_late_bind &bound_object(device_t &search_root); - static std::string safe_tag(device_t *object); + static const char *safe_tag(device_t *object); // internal state - std::string m_device_name; + const char *m_device_name; }; @@ -50,7 +50,7 @@ class device_delegate : public delegate<_Signature>, device_delegate_helper public: // provide the same constructors as the base class - device_delegate() : basetype(), device_delegate_helper(std::string()) { } + device_delegate() : basetype(), device_delegate_helper(nullptr) { } device_delegate(const basetype &src) : basetype(src), device_delegate_helper(src.m_device_name) { } device_delegate(const basetype &src, delegate_late_bind &object) : basetype(src, object), device_delegate_helper(src.m_device_name) { } template device_delegate(typename basetype::template traits<_FunctionClass>::member_func_type funcptr, const char *name, _FunctionClass *object) : basetype(funcptr, name, object), device_delegate_helper(safe_tag(dynamic_cast(object))) { } @@ -61,13 +61,13 @@ public: device_delegate &operator=(const thistype &src) { *static_cast(this) = src; m_device_name = src.m_device_name; return *this; } // provide additional constructors that take a device name string - template device_delegate(typename basetype::template traits<_FunctionClass>::member_func_type funcptr, const char *name, const char *devname) : basetype(funcptr, name, (_FunctionClass *)nullptr), device_delegate_helper(devname==nullptr ? std::string() : devname) { } - template device_delegate(typename basetype::template traits<_FunctionClass>::member_func_type funcptr, const char *name, const char *devname, _FunctionClass *object) : basetype(funcptr, name, (_FunctionClass *)nullptr), device_delegate_helper(devname == nullptr ? std::string() : devname) { } + template device_delegate(typename basetype::template traits<_FunctionClass>::member_func_type funcptr, const char *name, const char *devname) : basetype(funcptr, name, (_FunctionClass *)nullptr), device_delegate_helper(devname) { } + template device_delegate(typename basetype::template traits<_FunctionClass>::member_func_type funcptr, const char *name, const char *devname, _FunctionClass *object) : basetype(funcptr, name, (_FunctionClass *)nullptr), device_delegate_helper(devname) { } #ifdef USE_STATIC_DELEGATE - template device_delegate(typename basetype::template traits<_FunctionClass>::static_func_type funcptr, const char *name, const char *devname, _FunctionClass *object) : basetype(funcptr, name, (_FunctionClass *)nullptr), device_delegate_helper(devname == nullptr ? std::string() : devname) { } - template device_delegate(typename basetype::template traits<_FunctionClass>::static_ref_func_type funcptr, const char *name, const char *devname, _FunctionClass *object) : basetype(funcptr, name, (_FunctionClass *)nullptr), device_delegate_helper(devname == nullptr ? std::string() : devname) { } - device_delegate(typename basetype::template traits::static_func_type funcptr, const char *name) : basetype(funcptr, name, (device_t *)nullptr), device_delegate_helper(std::string()) { } - device_delegate(typename basetype::template traits::static_ref_func_type funcptr, const char *name) : basetype(funcptr, name, (device_t *)nullptr), device_delegate_helper(std::string()) { } + template device_delegate(typename basetype::template traits<_FunctionClass>::static_func_type funcptr, const char *name, const char *devname, _FunctionClass *object) : basetype(funcptr, name, (_FunctionClass *)nullptr), device_delegate_helper(devname) { } + template device_delegate(typename basetype::template traits<_FunctionClass>::static_ref_func_type funcptr, const char *name, const char *devname, _FunctionClass *object) : basetype(funcptr, name, (_FunctionClass *)nullptr), device_delegate_helper(devname) { } + device_delegate(typename basetype::template traits::static_func_type funcptr, const char *name) : basetype(funcptr, name, (device_t *)nullptr), device_delegate_helper(nullptr) { } + device_delegate(typename basetype::template traits::static_ref_func_type funcptr, const char *name) : basetype(funcptr, name, (device_t *)nullptr), device_delegate_helper(nullptr) { } #endif // and constructors that provide a search root @@ -77,7 +77,7 @@ public: void bind_relative_to(device_t &search_root) { assert(&search_root != nullptr); if (!basetype::isnull()) basetype::late_bind(bound_object(search_root)); } // getter (for validation purposes) - std::string device_name() const { return m_device_name; } + const char *device_name() const { return m_device_name; } }; diff --git a/src/emu/devfind.cpp b/src/emu/devfind.cpp index d827baeab41..d251e56ce0b 100644 --- a/src/emu/devfind.cpp +++ b/src/emu/devfind.cpp @@ -19,7 +19,7 @@ // finder_base - constructor //------------------------------------------------- -finder_base::finder_base(device_t &base, std::string tag) +finder_base::finder_base(device_t &base, const char *tag) : m_next(base.register_auto_finder(*this)), m_base(base), m_tag(tag) @@ -51,7 +51,7 @@ void *finder_base::find_memregion(UINT8 width, size_t &length, bool required) co if (region->bytewidth() != width) { if (required) - osd_printf_warning("Region '%s' found but is width %d, not %d as requested\n", m_tag.c_str(), region->bitwidth(), width*8); + osd_printf_warning("Region '%s' found but is width %d, not %d as requested\n", m_tag, region->bitwidth(), width*8); return nullptr; } @@ -76,7 +76,7 @@ void *finder_base::find_memshare(UINT8 width, size_t &bytes, bool required) if (width != 0 && share->bitwidth() != width) { if (required) - osd_printf_warning("Shared ptr '%s' found but is width %d, not %d as requested\n", m_tag.c_str(), share->bitwidth(), width); + osd_printf_warning("Shared ptr '%s' found but is width %d, not %d as requested\n", m_tag, share->bitwidth(), width); return nullptr; } @@ -91,9 +91,9 @@ void *finder_base::find_memshare(UINT8 width, size_t &bytes, bool required) // return true if it's ok //------------------------------------------------- -bool finder_base::report_missing(bool found, std::string objname, bool required) +bool finder_base::report_missing(bool found, const char *objname, bool required) { - if (required && m_tag==FINDER_DUMMY_TAG) + if (required && strcmp(m_tag, FINDER_DUMMY_TAG)==0) { osd_printf_error("Tag not defined for required device\n"); return false; @@ -105,9 +105,9 @@ bool finder_base::report_missing(bool found, std::string objname, bool required) // otherwise, report if (required) - osd_printf_error("Required %s '%s' not found\n", objname.c_str(), m_tag.c_str()); + osd_printf_error("Required %s '%s' not found\n", objname, m_tag); else - osd_printf_verbose("Optional %s '%s' not found\n", objname.c_str(), m_tag.c_str()); + osd_printf_verbose("Optional %s '%s' not found\n", objname, m_tag); return !required; } diff --git a/src/emu/devfind.h b/src/emu/devfind.h index 86568f7642e..00e859437ba 100644 --- a/src/emu/devfind.h +++ b/src/emu/devfind.h @@ -26,8 +26,8 @@ // these macros can be used to initialize an ioport_array with // individual port names, instead of a base name + numeric suffix -#define IOPORT_ARRAY_MEMBER(name) std::string const name[] = -#define DECLARE_IOPORT_ARRAY(name) static std::string const name[] +#define IOPORT_ARRAY_MEMBER(name) const char * const name[] = +#define DECLARE_IOPORT_ARRAY(name) static const char * const name[] //************************************************************************** // TYPE DEFINITIONS @@ -42,27 +42,27 @@ class finder_base public: // construction/destruction - finder_base(device_t &base, std::string tag); + finder_base(device_t &base, const char *tag); virtual ~finder_base(); // getters virtual bool findit(bool isvalidation = false) = 0; // setter for setting the object - void set_tag(std::string tag) { m_tag = tag; } + void set_tag(const char *tag) { m_tag = tag; } protected: // helpers void *find_memregion(UINT8 width, size_t &length, bool required) const; void *find_memshare(UINT8 width, size_t &bytes, bool required); - bool report_missing(bool found, std::string objname, bool required); + bool report_missing(bool found, const char *objname, bool required); void printf_warning(const char *format, ...) ATTR_PRINTF(2,3); // internal state finder_base *m_next; device_t &m_base; - std::string m_tag; + const char *m_tag; }; @@ -74,7 +74,7 @@ class object_finder_base : public finder_base { public: // construction/destruction - object_finder_base(device_t &base, std::string tag) + object_finder_base(device_t &base, const char *tag) : finder_base(base, tag), m_target(nullptr) { } @@ -104,7 +104,7 @@ class device_finder : public object_finder_base<_DeviceClass> { public: // construction/destruction - device_finder(device_t &base, std::string tag) + device_finder(device_t &base, const char *tag) : object_finder_base<_DeviceClass>(base, tag) { } // make reference use transparent as well @@ -117,7 +117,7 @@ public: this->m_target = dynamic_cast<_DeviceClass *>(device); if (device != nullptr && this->m_target == nullptr) { - this->printf_warning("Device '%s' found but is of incorrect type (actual type is %s)\n", this->m_tag.c_str(), device->name()); + this->printf_warning("Device '%s' found but is of incorrect type (actual type is %s)\n", this->m_tag, device->name()); } return this->report_missing(this->m_target != nullptr, "device", _Required); } @@ -128,7 +128,7 @@ template class optional_device : public device_finder<_DeviceClass, false> { public: - optional_device(device_t &base, std::string tag = FINDER_DUMMY_TAG) : device_finder<_DeviceClass, false>(base, tag) { } + optional_device(device_t &base, const char *tag = FINDER_DUMMY_TAG) : device_finder<_DeviceClass, false>(base, tag) { } }; // required devices are similar but throw an error if they are not found @@ -136,7 +136,7 @@ template class required_device : public device_finder<_DeviceClass, true> { public: - required_device(device_t &base, std::string tag = FINDER_DUMMY_TAG) : device_finder<_DeviceClass, true>(base, tag) { } + required_device(device_t &base, const char *tag = FINDER_DUMMY_TAG) : device_finder<_DeviceClass, true>(base, tag) { } }; @@ -148,7 +148,7 @@ class memory_region_finder : public object_finder_base { public: // construction/destruction - memory_region_finder(device_t &base, std::string tag) + memory_region_finder(device_t &base, const char *tag) : object_finder_base(base, tag) { } // make reference use transparent as well @@ -167,14 +167,14 @@ public: class optional_memory_region : public memory_region_finder { public: - optional_memory_region(device_t &base, std::string tag = FINDER_DUMMY_TAG) : memory_region_finder(base, tag) { } + optional_memory_region(device_t &base, const char *tag = FINDER_DUMMY_TAG) : memory_region_finder(base, tag) { } }; // required devices are similar but throw an error if they are not found class required_memory_region : public memory_region_finder { public: - required_memory_region(device_t &base, std::string tag = FINDER_DUMMY_TAG) : memory_region_finder(base, tag) { } + required_memory_region(device_t &base, const char *tag = FINDER_DUMMY_TAG) : memory_region_finder(base, tag) { } }; @@ -186,7 +186,7 @@ class memory_bank_finder : public object_finder_base { public: // construction/destruction - memory_bank_finder(device_t &base, std::string tag) + memory_bank_finder(device_t &base, const char *tag) : object_finder_base(base, tag) { } // make reference use transparent as well @@ -205,14 +205,14 @@ public: class optional_memory_bank : public memory_bank_finder { public: - optional_memory_bank(device_t &base, std::string tag = FINDER_DUMMY_TAG) : memory_bank_finder(base, tag) { } + optional_memory_bank(device_t &base, const char *tag = FINDER_DUMMY_TAG) : memory_bank_finder(base, tag) { } }; // required devices are similar but throw an error if they are not found class required_memory_bank : public memory_bank_finder { public: - required_memory_bank(device_t &base, std::string tag = FINDER_DUMMY_TAG) : memory_bank_finder(base, tag) { } + required_memory_bank(device_t &base, const char *tag = FINDER_DUMMY_TAG) : memory_bank_finder(base, tag) { } }; @@ -224,7 +224,7 @@ class ioport_finder : public object_finder_base { public: // construction/destruction - ioport_finder(device_t &base, std::string tag) + ioport_finder(device_t &base, const char *tag) : object_finder_base(base, tag) { } // make reference use transparent as well @@ -246,14 +246,14 @@ public: class optional_ioport : public ioport_finder { public: - optional_ioport(device_t &base, std::string tag = FINDER_DUMMY_TAG) : ioport_finder(base, tag) { } + optional_ioport(device_t &base, const char *tag = FINDER_DUMMY_TAG) : ioport_finder(base, tag) { } }; // required devices are similar but throw an error if they are not found class required_ioport : public ioport_finder { public: - required_ioport(device_t &base, std::string tag = FINDER_DUMMY_TAG) : ioport_finder(base, tag) { } + required_ioport(device_t &base, const char *tag = FINDER_DUMMY_TAG) : ioport_finder(base, tag) { } }; @@ -267,19 +267,19 @@ class ioport_array_finder public: // construction/destruction - ioport_array_finder(device_t &base, std::string basetag) + ioport_array_finder(device_t &base, const char *basetag) { for (int index = 0; index < _Count; index++) { - strprintf(m_tag[index], "%s.%d", basetag.c_str(), index); + strprintf(m_tag[index], "%s.%d", basetag, index); m_array[index] = std::make_unique(base, m_tag[index].c_str()); } } - ioport_array_finder(device_t &base, std::string const *tags) + ioport_array_finder(device_t &base, const char * const *tags) { for (int index = 0; index < _Count; index++) - m_array[index] = std::make_unique(base, tags[index].c_str()); + m_array[index] = std::make_unique(base, tags[index]); } // array accessors @@ -297,8 +297,8 @@ template class optional_ioport_array: public ioport_array_finder<_Count, false> { public: - optional_ioport_array(device_t &base, std::string basetag) : ioport_array_finder<_Count, false>(base, basetag) { } - optional_ioport_array(device_t &base, std::string const *tags) : ioport_array_finder<_Count, false>(base, tags) { } + optional_ioport_array(device_t &base, const char *basetag) : ioport_array_finder<_Count, false>(base, basetag) { } + optional_ioport_array(device_t &base, const char * const *tags) : ioport_array_finder<_Count, false>(base, tags) { } }; // required ioport array finder @@ -306,8 +306,8 @@ template class required_ioport_array: public ioport_array_finder<_Count, true> { public: - required_ioport_array(device_t &base, std::string basetag) : ioport_array_finder<_Count, true>(base, basetag) { } - required_ioport_array(device_t &base, std::string const *tags) : ioport_array_finder<_Count, true>(base, tags) { } + required_ioport_array(device_t &base, const char *basetag) : ioport_array_finder<_Count, true>(base, basetag) { } + required_ioport_array(device_t &base, const char * const *tags) : ioport_array_finder<_Count, true>(base, tags) { } }; @@ -319,7 +319,7 @@ class region_ptr_finder : public object_finder_base<_PointerType> { public: // construction/destruction - region_ptr_finder(device_t &base, std::string tag) + region_ptr_finder(device_t &base, const char *tag) : object_finder_base<_PointerType>(base, tag), m_length(0) { } @@ -350,7 +350,7 @@ template class optional_region_ptr : public region_ptr_finder<_PointerType, false> { public: - optional_region_ptr(device_t &base, std::string tag = FINDER_DUMMY_TAG) : region_ptr_finder<_PointerType, false>(base, tag) { } + optional_region_ptr(device_t &base, const char *tag = FINDER_DUMMY_TAG) : region_ptr_finder<_PointerType, false>(base, tag) { } }; // required region pointer finder @@ -358,7 +358,7 @@ template class required_region_ptr : public region_ptr_finder<_PointerType, true> { public: - required_region_ptr(device_t &base, std::string tag = FINDER_DUMMY_TAG) : region_ptr_finder<_PointerType, true>(base, tag) { } + required_region_ptr(device_t &base, const char *tag = FINDER_DUMMY_TAG) : region_ptr_finder<_PointerType, true>(base, tag) { } }; @@ -370,7 +370,7 @@ class shared_ptr_finder : public object_finder_base<_PointerType> { public: // construction/destruction - shared_ptr_finder(device_t &base, std::string tag, UINT8 width = sizeof(_PointerType) * 8) + shared_ptr_finder(device_t &base, const char *tag, UINT8 width = sizeof(_PointerType) * 8) : object_finder_base<_PointerType>(base, tag), m_bytes(0), m_width(width) { } @@ -393,7 +393,7 @@ public: m_allocated.resize(entries); this->m_target = &m_allocated[0]; m_bytes = entries * sizeof(_PointerType); - this->m_base.save_item(this->m_allocated, this->m_tag.c_str()); + this->m_base.save_item(this->m_allocated, this->m_tag); } // finder @@ -416,7 +416,7 @@ template class optional_shared_ptr : public shared_ptr_finder<_PointerType, false> { public: - optional_shared_ptr(device_t &base, std::string tag = FINDER_DUMMY_TAG, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_finder<_PointerType, false>(base, tag, width) { } + optional_shared_ptr(device_t &base, const char *tag = FINDER_DUMMY_TAG, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_finder<_PointerType, false>(base, tag, width) { } }; // required shared pointer finder @@ -424,7 +424,7 @@ template class required_shared_ptr : public shared_ptr_finder<_PointerType, true> { public: - required_shared_ptr(device_t &base, std::string tag = FINDER_DUMMY_TAG, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_finder<_PointerType, true>(base, tag, width) { } + required_shared_ptr(device_t &base, const char *tag = FINDER_DUMMY_TAG, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_finder<_PointerType, true>(base, tag, width) { } }; @@ -438,11 +438,11 @@ class shared_ptr_array_finder public: // construction/destruction - shared_ptr_array_finder(device_t &base, std::string basetag, UINT8 width = sizeof(_PointerType) * 8) + shared_ptr_array_finder(device_t &base, const char *basetag, UINT8 width = sizeof(_PointerType) * 8) { for (int index = 0; index < _Count; index++) { - strprintf(m_tag[index],"%s.%d", basetag.c_str(), index); + strprintf(m_tag[index],"%s.%d", basetag, index); m_array[index] = std::make_unique(base, m_tag[index].c_str(), width); } } @@ -462,7 +462,7 @@ template class optional_shared_ptr_array : public shared_ptr_array_finder<_PointerType, _Count, false> { public: - optional_shared_ptr_array(device_t &base, std::string tag, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_array_finder<_PointerType, _Count, false>(base, tag, width) { } + optional_shared_ptr_array(device_t &base, const char *tag, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_array_finder<_PointerType, _Count, false>(base, tag, width) { } }; // required shared pointer array finder @@ -470,7 +470,7 @@ template class required_shared_ptr_array : public shared_ptr_array_finder<_PointerType, _Count, true> { public: - required_shared_ptr_array(device_t &base, std::string tag, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_array_finder<_PointerType, _Count, true>(base, tag, width) { } + required_shared_ptr_array(device_t &base, const char *tag, UINT8 width = sizeof(_PointerType) * 8) : shared_ptr_array_finder<_PointerType, _Count, true>(base, tag, width) { } }; diff --git a/src/emu/device.cpp b/src/emu/device.cpp index 217a47b8bbd..8400d87ddbd 100644 --- a/src/emu/device.cpp +++ b/src/emu/device.cpp @@ -24,7 +24,7 @@ // from the provided config //------------------------------------------------- -device_t::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 *source) +device_t::device_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : m_type(type), m_name(name), m_shortname(shortname), @@ -82,14 +82,14 @@ device_t::~device_t() // NOTE: this being NULL in a C++ member function can lead to undefined behavior. // However, it is relied on throughout MAME, so will remain for now. -memory_region *device_t::memregion(std::string _tag) const +memory_region *device_t::memregion(const char *_tag) const { // safety first if (this == nullptr) return nullptr; // build a fully-qualified name and look it up - return machine().memory().region(subtag(_tag)); + return machine().memory().region(subtag(_tag).c_str()); } @@ -98,14 +98,14 @@ memory_region *device_t::memregion(std::string _tag) const // info for a given share //------------------------------------------------- -memory_share *device_t::memshare(std::string _tag) const +memory_share *device_t::memshare(const char *_tag) const { // safety first if (this == nullptr) return nullptr; // build a fully-qualified name and look it up - return machine().memory().shared(subtag(_tag)); + return machine().memory().shared(subtag(_tag).c_str()); } @@ -114,14 +114,14 @@ memory_share *device_t::memshare(std::string _tag) const // bank info for a given bank //------------------------------------------------- -memory_bank *device_t::membank(std::string _tag) const +memory_bank *device_t::membank(const char *_tag) const { // safety first if (this == nullptr) return nullptr; // build a fully-qualified name and look it up - return machine().memory().bank(subtag(_tag)); + return machine().memory().bank(subtag(_tag).c_str()); } @@ -130,14 +130,14 @@ memory_bank *device_t::membank(std::string _tag) const // object for a given port name //------------------------------------------------- -ioport_port *device_t::ioport(std::string tag) const +ioport_port *device_t::ioport(const char *tag) const { // safety first if (this == nullptr) return nullptr; // build a fully-qualified name and look it up - return machine().ioport().port(subtag(tag)); + return machine().ioport().port(subtag(tag).c_str()); } @@ -146,11 +146,11 @@ ioport_port *device_t::ioport(std::string tag) const // object for a given port name //------------------------------------------------- -std::string device_t::parameter(std::string tag) const +std::string device_t::parameter(const char *tag) const { // safety first if (this == nullptr) - return std::string(); + return nullptr; // build a fully-qualified name and look it up return machine().parameters().lookup(subtag(tag)); @@ -369,9 +369,9 @@ void device_t::start() device_sound_interface *sound; if (state_registrations == 0 && (interface(exec) || interface(sound)) && type() != SPEAKER) { - logerror("Device '%s' did not register any state to save!\n", tag().c_str()); + logerror("Device '%s' did not register any state to save!\n", tag()); if ((machine().system().flags & MACHINE_SUPPORTS_SAVE) != 0) - fatalerror("Device '%s' did not register any state to save!\n", tag().c_str()); + fatalerror("Device '%s' did not register any state to save!\n", tag()); } // let the interfaces do their post-work @@ -647,7 +647,7 @@ void device_t::device_timer(emu_timer &timer, device_timer_id id, int param, voi // caching the results //------------------------------------------------- -device_t *device_t::subdevice_slow(std::string tag) const +device_t *device_t::subdevice_slow(const char *tag) const { // resolve the full path std::string fulltag = subtag(tag); @@ -680,10 +680,9 @@ device_t *device_t::subdevice_slow(std::string tag) const // to our device based on the provided tag //------------------------------------------------- -std::string device_t::subtag(std::string _tag) const +std::string device_t::subtag(const char *tag) const { std::string result; - const char *tag = _tag.c_str(); // if the tag begins with a colon, ignore our path and start from the root if (*tag == ':') { @@ -737,7 +736,7 @@ std::string device_t::subtag(std::string _tag) const // as a subdevice //------------------------------------------------- -device_t *device_t::add_subdevice(device_type type, std::string tag, UINT32 clock) +device_t *device_t::add_subdevice(device_type type, const char *tag, UINT32 clock) { // allocate the device and append to our list device_t *device = (*type)(mconfig(), tag, this, clock); @@ -756,7 +755,7 @@ device_t *device_t::add_subdevice(device_type type, std::string tag, UINT32 cloc // to replace an existing subdevice //------------------------------------------------- -device_t *device_t::replace_subdevice(device_t &old, device_type type, std::string tag, UINT32 clock) +device_t *device_t::replace_subdevice(device_t &old, device_type type, const char *tag, UINT32 clock) { // iterate over all devices and remove any references to the old device device_iterator iter(mconfig().root_device()); diff --git a/src/emu/device.h b/src/emu/device.h index 96a460bb988..d6e0311af66 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -72,12 +72,12 @@ class device_missing_dependencies : public emu_exception { }; // a device_type is simply a pointer to its alloc function -typedef device_t *(*device_type)(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); +typedef device_t *(*device_type)(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // this template function creates a stub which constructs a device template -device_t *device_creator(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +device_t *device_creator(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) { return global_alloc_clear<_DeviceClass>(mconfig, tag, owner, clock); } @@ -105,13 +105,13 @@ class device_t : public delegate_late_bind protected: // construction/destruction - 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 *source); + device_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); public: virtual ~device_t(); // getters running_machine &machine() const { /*assert(m_machine != NULL);*/ return *m_machine; } - std::string tag() const { return m_tag; } + const char *tag() const { return m_tag.c_str(); } const char *basetag() const { return m_basetag.c_str(); } device_type type() const { return m_type; } const char *name() const { return m_name.c_str(); } @@ -130,7 +130,7 @@ public: UINT8 default_bios() const { return m_default_bios; } UINT8 system_bios() const { return m_system_bios; } std::string default_bios_tag() const { return m_default_bios_tag; } - std::string parameter(std::string tag) const; + std::string parameter(const char *tag) const; // interface helpers device_interface *first_interface() const { return m_interface_list; } @@ -150,23 +150,23 @@ public: // owned object helpers device_t *first_subdevice() const { return m_subdevice_list.first(); } - std::string subtag(std::string tag) const; - std::string siblingtag(std::string tag) const { return m_owner != nullptr ? m_owner->subtag(tag) : tag; } - memory_region *memregion(std::string tag) const; - memory_share *memshare(std::string tag) const; - memory_bank *membank(std::string tag) const; - ioport_port *ioport(std::string tag) const; - device_t *subdevice(std::string tag) const; - device_t *siblingdevice(std::string tag) const; - template inline _DeviceClass *subdevice(std::string tag) const { return downcast<_DeviceClass *>(subdevice(tag)); } - template inline _DeviceClass *siblingdevice(std::string tag) const { return downcast<_DeviceClass *>(siblingdevice(tag)); } + std::string subtag(const char *tag) const; + std::string siblingtag(const char *tag) const { return (this != nullptr && m_owner != nullptr) ? m_owner->subtag(tag) : std::string(tag); } + memory_region *memregion(const char *tag) const; + memory_share *memshare(const char *tag) const; + memory_bank *membank(const char *tag) const; + ioport_port *ioport(const char *tag) const; + device_t *subdevice(const char *tag) const; + device_t *siblingdevice(const char *tag) const; + template inline _DeviceClass *subdevice(const char *tag) const { return downcast<_DeviceClass *>(subdevice(tag)); } + template inline _DeviceClass *siblingdevice(const char *tag) const { return downcast<_DeviceClass *>(siblingdevice(tag)); } memory_region *region() const { return m_region; } // configuration helpers static void static_set_clock(device_t &device, UINT32 clock); static void static_set_static_config(device_t &device, const void *config) { device.m_static_config = config; } static void static_set_input_default(device_t &device, const input_device_default *config) { device.m_input_defaults = config; } - static void static_set_default_bios_tag(device_t &device, std::string tag) { std::string default_bios_tag(tag); device.m_default_bios_tag = default_bios_tag; } + static void static_set_default_bios_tag(device_t &device, const char *tag) { std::string default_bios_tag(tag); device.m_default_bios_tag = default_bios_tag; } // state helpers void config_complete(); @@ -206,8 +206,8 @@ public: bool findit(bool isvalidation = false) const; // misc - void popmessage(const char *format, ...) const ATTR_PRINTF(2,3); - void logerror(const char *format, ...) const ATTR_PRINTF(2,3); + void popmessage(const char *format, ...) const; + void logerror(const char *format, ...) const; void vlogerror(const char *format, va_list args) const; protected: @@ -279,10 +279,10 @@ protected: private: // private helpers - device_t *add_subdevice(device_type type, std::string tag, UINT32 clock); - device_t *replace_subdevice(device_t &old, device_type type, std::string tag, UINT32 clock); + device_t *add_subdevice(device_type type, const char *tag, UINT32 clock); + device_t *replace_subdevice(device_t &old, device_type type, const char *tag, UINT32 clock); void remove_subdevice(device_t &device); - device_t *subdevice_slow(std::string tag) const; + device_t *subdevice_slow(const char *tag) const; // private state; accessor use required running_machine * m_machine; @@ -587,14 +587,14 @@ private: // name relative to this device //------------------------------------------------- -inline device_t *device_t::subdevice(std::string tag) const +inline device_t *device_t::subdevice(const char *tag) const { // safety first if (this == nullptr) return nullptr; - // empty string means this device - if (tag.empty()) + // empty string or NULL means this device + if (tag == nullptr || *tag == 0) return const_cast(this); // do a quick lookup and return that if possible @@ -608,18 +608,18 @@ inline device_t *device_t::subdevice(std::string tag) const // by name relative to this device's parent //------------------------------------------------- -inline device_t *device_t::siblingdevice(std::string tag) const +inline device_t *device_t::siblingdevice(const char *tag) const { // safety first if (this == nullptr) return nullptr; // empty string or NULL means this device - if (tag.empty()) + if (tag == nullptr || *tag == 0) return const_cast(this); // leading caret implies the owner, just skip it - if (tag[0] == '^') tag.erase(0, 1); + if (tag[0] == '^') tag++; // query relative to the parent, if we have one if (m_owner != nullptr) diff --git a/src/emu/diexec.cpp b/src/emu/diexec.cpp index d0434d8638b..7b4b530f75b 100644 --- a/src/emu/diexec.cpp +++ b/src/emu/diexec.cpp @@ -44,6 +44,7 @@ const int TRIGGER_SUSPENDTIME = -4000; device_execute_interface::device_execute_interface(const machine_config &mconfig, device_t &device) : device_interface(device, "execute"), m_disabled(false), + m_vblank_interrupt_screen(nullptr), m_timed_interrupt_period(attotime::zero), m_is_octal(false), m_nextexec(nullptr), @@ -89,7 +90,7 @@ void device_execute_interface::static_set_disable(device_t &device) { device_execute_interface *exec; if (!device.interface(exec)) - throw emu_fatalerror("MCFG_DEVICE_DISABLE called on device '%s' with no execute interface", device.tag().c_str()); + throw emu_fatalerror("MCFG_DEVICE_DISABLE called on device '%s' with no execute interface", device.tag()); exec->m_disabled = true; } @@ -99,11 +100,11 @@ void device_execute_interface::static_set_disable(device_t &device) // to set up VBLANK interrupts on the device //------------------------------------------------- -void device_execute_interface::static_set_vblank_int(device_t &device, device_interrupt_delegate function, std::string tag, int rate) +void device_execute_interface::static_set_vblank_int(device_t &device, device_interrupt_delegate function, const char *tag, int rate) { device_execute_interface *exec; if (!device.interface(exec)) - throw emu_fatalerror("MCFG_DEVICE_VBLANK_INT called on device '%s' with no execute interface", device.tag().c_str()); + throw emu_fatalerror("MCFG_DEVICE_VBLANK_INT called on device '%s' with no execute interface", device.tag()); exec->m_vblank_interrupt = function; exec->m_vblank_interrupt_screen = tag; } @@ -118,7 +119,7 @@ void device_execute_interface::static_set_periodic_int(device_t &device, device_ { device_execute_interface *exec; if (!device.interface(exec)) - throw emu_fatalerror("MCFG_DEVICE_PERIODIC_INT called on device '%s' with no execute interface", device.tag().c_str()); + throw emu_fatalerror("MCFG_DEVICE_PERIODIC_INT called on device '%s' with no execute interface", device.tag()); exec->m_timed_interrupt = function; exec->m_timed_interrupt_period = rate; } @@ -133,7 +134,7 @@ void device_execute_interface::static_set_irq_acknowledge_callback(device_t &dev { device_execute_interface *exec; if (!device.interface(exec)) - throw emu_fatalerror("MCFG_DEVICE_IRQ_ACKNOWLEDGE called on device '%s' with no execute interface", device.tag().c_str()); + throw emu_fatalerror("MCFG_DEVICE_IRQ_ACKNOWLEDGE called on device '%s' with no execute interface", device.tag()); exec->m_driver_irq = callback; } @@ -237,7 +238,7 @@ void device_execute_interface::suspend_resume_changed() void device_execute_interface::suspend(UINT32 reason, bool eatcycles) { -if (TEMPLOG) printf("suspend %s (%X)\n", device().tag().c_str(), reason); +if (TEMPLOG) printf("suspend %s (%X)\n", device().tag(), reason); // set the suspend reason and eat cycles flag m_nextsuspend |= reason; m_nexteatcycles = eatcycles; @@ -252,7 +253,7 @@ if (TEMPLOG) printf("suspend %s (%X)\n", device().tag().c_str(), reason); void device_execute_interface::resume(UINT32 reason) { -if (TEMPLOG) printf("resume %s (%X)\n", device().tag().c_str(), reason); +if (TEMPLOG) printf("resume %s (%X)\n", device().tag(), reason); // clear the suspend reason and eat cycles flag m_nextsuspend &= ~reason; suspend_resume_changed(); @@ -450,8 +451,8 @@ void device_execute_interface::interface_validity_check(validity_checker &valid) screen_device_iterator iter(device().mconfig().root_device()); if (iter.first() == nullptr) osd_printf_error("VBLANK interrupt specified, but the driver is screenless\n"); - else if (!m_vblank_interrupt_screen.empty() && device().siblingdevice(m_vblank_interrupt_screen) == nullptr) - osd_printf_error("VBLANK interrupt references a non-existant screen tag '%s'\n", m_vblank_interrupt_screen.c_str()); + else if (m_vblank_interrupt_screen != nullptr && device().siblingdevice(m_vblank_interrupt_screen) == nullptr) + osd_printf_error("VBLANK interrupt references a non-existant screen tag '%s'\n", m_vblank_interrupt_screen); } if (!m_timed_interrupt.isnull() && m_timed_interrupt_period == attotime::zero) @@ -543,10 +544,10 @@ void device_execute_interface::interface_post_reset() elem.reset(); // reconfingure VBLANK interrupts - if (!m_vblank_interrupt_screen.empty()) + if (m_vblank_interrupt_screen != nullptr) { // get the screen that will trigger the VBLANK - screen_device *screen = downcast(device().machine().device(device().siblingtag(m_vblank_interrupt_screen))); + screen_device *screen = downcast(device().machine().device(device().siblingtag(m_vblank_interrupt_screen).c_str())); assert(screen != nullptr); screen->register_vblank_callback(vblank_state_delegate(FUNC(device_execute_interface::on_vblank), this)); @@ -615,7 +616,7 @@ int device_execute_interface::standard_irq_callback(int irqline) // get the default vector and acknowledge the interrupt if needed int vector = m_input[irqline].default_irq_callback(); - if (VERBOSE) device().logerror("standard_irq_callback('%s', %d) $%04x\n", device().tag().c_str(), irqline, vector); + if (VERBOSE) device().logerror("standard_irq_callback('%s', %d) $%04x\n", device().tag(), irqline, vector); // if there's a driver callback, run it to get the vector if (!m_driver_irq.isnull()) @@ -759,9 +760,9 @@ void device_execute_interface::device_input::reset() void device_execute_interface::device_input::set_state_synced(int state, int vector) { - LOG(("set_state_synced('%s',%d,%d,%02x)\n", m_execute->device().tag().c_str(), m_linenum, state, vector)); + LOG(("set_state_synced('%s',%d,%d,%02x)\n", m_execute->device().tag(), m_linenum, state, vector)); -if (TEMPLOG) printf("setline(%s,%d,%d,%d)\n", m_execute->device().tag().c_str(), m_linenum, state, (vector == USE_STORED_VECTOR) ? 0 : vector); +if (TEMPLOG) printf("setline(%s,%d,%d,%d)\n", m_execute->device().tag(), m_linenum, state, (vector == USE_STORED_VECTOR) ? 0 : vector); assert(state == ASSERT_LINE || state == HOLD_LINE || state == CLEAR_LINE || state == PULSE_LINE); // treat PULSE_LINE as ASSERT+CLEAR @@ -769,7 +770,7 @@ if (TEMPLOG) printf("setline(%s,%d,%d,%d)\n", m_execute->device().tag().c_str(), { // catch errors where people use PULSE_LINE for devices that don't support it if (m_linenum != INPUT_LINE_NMI && m_linenum != INPUT_LINE_RESET) - throw emu_fatalerror("device '%s': PULSE_LINE can only be used for NMI and RESET lines\n", m_execute->device().tag().c_str()); + throw emu_fatalerror("device '%s': PULSE_LINE can only be used for NMI and RESET lines\n", m_execute->device().tag()); set_state_synced(ASSERT_LINE, vector); set_state_synced(CLEAR_LINE, vector); @@ -783,7 +784,7 @@ if (TEMPLOG) printf("setline(%s,%d,%d,%d)\n", m_execute->device().tag().c_str(), m_qindex--; empty_event_queue(); event_index = m_qindex++; - m_execute->device().logerror("Exceeded pending input line event queue on device '%s'!\n", m_execute->device().tag().c_str()); + m_execute->device().logerror("Exceeded pending input line event queue on device '%s'!\n", m_execute->device().tag()); } // enqueue the event @@ -811,7 +812,7 @@ TIMER_CALLBACK( device_execute_interface::device_input::static_empty_event_queue void device_execute_interface::device_input::empty_event_queue() { -if (TEMPLOG) printf("empty_queue(%s,%d,%d)\n", m_execute->device().tag().c_str(), m_linenum, m_qindex); +if (TEMPLOG) printf("empty_queue(%s,%d,%d)\n", m_execute->device().tag(), m_linenum, m_qindex); // loop over all events for (int curevent = 0; curevent < m_qindex; curevent++) { @@ -867,7 +868,7 @@ if (TEMPLOG) printf(" (%d,%d)\n", m_curstate, m_curvector); break; default: - m_execute->device().logerror("empty_event_queue device '%s', line %d, unknown state %d\n", m_execute->device().tag().c_str(), m_linenum, m_curstate); + m_execute->device().logerror("empty_event_queue device '%s', line %d, unknown state %d\n", m_execute->device().tag(), m_linenum, m_curstate); break; } @@ -894,7 +895,7 @@ int device_execute_interface::device_input::default_irq_callback() // if the IRQ state is HOLD_LINE, clear it if (m_curstate == HOLD_LINE) { - LOG(("->set_irq_line('%s',%d,%d)\n", m_execute->device().tag().c_str(), m_linenum, CLEAR_LINE)); + LOG(("->set_irq_line('%s',%d,%d)\n", m_execute->device().tag(), m_linenum, CLEAR_LINE)); m_execute->execute_set_input(m_linenum, CLEAR_LINE); m_curstate = CLEAR_LINE; } diff --git a/src/emu/diexec.h b/src/emu/diexec.h index 278c45a29ea..7f9eb41bfcf 100644 --- a/src/emu/diexec.h +++ b/src/emu/diexec.h @@ -150,7 +150,7 @@ public: // static inline configuration helpers static void static_set_disable(device_t &device); - static void static_set_vblank_int(device_t &device, device_interrupt_delegate function, std::string tag, int rate = 0); + static void static_set_vblank_int(device_t &device, device_interrupt_delegate function, const char *tag, int rate = 0); static void static_set_periodic_int(device_t &device, device_interrupt_delegate function, const attotime &rate); static void static_set_irq_acknowledge_callback(device_t &device, device_irq_acknowledge_delegate callback); @@ -257,7 +257,7 @@ protected: // configuration bool m_disabled; // disabled from executing? device_interrupt_delegate m_vblank_interrupt; // for interrupts tied to VBLANK - std::string m_vblank_interrupt_screen; // the screen that causes the VBLANK interrupt + const char * m_vblank_interrupt_screen; // the screen that causes the VBLANK interrupt device_interrupt_delegate m_timed_interrupt; // for interrupts not tied to VBLANK attotime m_timed_interrupt_period; // period for periodic interrupts bool m_is_octal; // to determine if messages/debugger will show octal or hex diff --git a/src/emu/digfx.cpp b/src/emu/digfx.cpp index 394f32dfcd7..bed430e64f0 100644 --- a/src/emu/digfx.cpp +++ b/src/emu/digfx.cpp @@ -25,7 +25,7 @@ device_gfx_interface::device_gfx_interface(const machine_config &mconfig, device : device_interface(device, "gfx"), m_palette(nullptr), m_gfxdecodeinfo(gfxinfo), - m_palette_tag(palette_tag==nullptr ? std::string() : palette_tag), + m_palette_tag(palette_tag), m_palette_is_sibling(palette_tag == nullptr), m_decoded(false) { @@ -49,7 +49,7 @@ void device_gfx_interface::static_set_info(device_t &device, const gfx_decode_en { device_gfx_interface *gfx; if (!device.interface(gfx)) - throw emu_fatalerror("MCFG_GFX_INFO called on device '%s' with no gfx interface\n", device.tag().c_str()); + throw emu_fatalerror("MCFG_GFX_INFO called on device '%s' with no gfx interface\n", device.tag()); gfx->m_gfxdecodeinfo = gfxinfo; } @@ -60,11 +60,11 @@ void device_gfx_interface::static_set_info(device_t &device, const gfx_decode_en // set the palette used by the device //------------------------------------------------- -void device_gfx_interface::static_set_palette(device_t &device, std::string tag) +void device_gfx_interface::static_set_palette(device_t &device, const char *tag) { device_gfx_interface *gfx; if (!device.interface(gfx)) - throw emu_fatalerror("MCFG_GFX_PALETTE called on device '%s' with no gfx interface\n", device.tag().c_str()); + throw emu_fatalerror("MCFG_GFX_PALETTE called on device '%s' with no gfx interface\n", device.tag()); gfx->m_palette_tag = tag; gfx->m_palette_is_sibling = true; @@ -78,8 +78,8 @@ void device_gfx_interface::static_set_palette(device_t &device, std::string tag) void device_gfx_interface::interface_pre_start() { - if (m_palette_tag.empty()) - fatalerror("No palette specified for device '%s'\n", device().tag().c_str()); + if (m_palette_tag == nullptr) + fatalerror("No palette specified for device '%s'\n", device().tag()); // find our palette device, either as a sibling device or subdevice if (m_palette_is_sibling) @@ -89,9 +89,9 @@ void device_gfx_interface::interface_pre_start() if (m_palette == nullptr) fatalerror("Device '%s' specifies nonexistent %sdevice '%s' as palette\n", - device().tag().c_str(), + device().tag(), (m_palette_is_sibling ? "sibling " : "sub"), - m_palette_tag.c_str()); + m_palette_tag); // if palette device isn't started, wait for it // if (!m_palette->started()) @@ -291,8 +291,8 @@ void device_gfx_interface::decode_gfx(const gfx_decode_entry *gfxdecodeinfo) void device_gfx_interface::interface_validity_check(validity_checker &valid) const { // validate palette tag - if (m_palette_tag.empty()) - osd_printf_error("No palette specified for device '%s'\n", device().tag().c_str()); + if (m_palette_tag == nullptr) + osd_printf_error("No palette specified for device '%s'\n", device().tag()); else { palette_device *palette; @@ -303,9 +303,9 @@ void device_gfx_interface::interface_validity_check(validity_checker &valid) con if (palette == nullptr) osd_printf_error("Device '%s' specifies nonexistent %sdevice '%s' as palette\n", - device().tag().c_str(), + device().tag(), (m_palette_is_sibling ? "sibling " : "sub"), - m_palette_tag.c_str()); + m_palette_tag); } if (!m_gfxdecodeinfo) diff --git a/src/emu/digfx.h b/src/emu/digfx.h index c663c0b9928..373bff7ba71 100644 --- a/src/emu/digfx.h +++ b/src/emu/digfx.h @@ -196,7 +196,7 @@ public: // static configuration static void static_set_info(device_t &device, const gfx_decode_entry *gfxinfo); - static void static_set_palette(device_t &device, std::string tag); + static void static_set_palette(device_t &device, const char *tag); // getters palette_device *palette() const { return m_palette; } @@ -220,7 +220,7 @@ protected: private: // configuration const gfx_decode_entry * m_gfxdecodeinfo; // pointer to array of gfx decode information - std::string m_palette_tag; // configured tag for palette device + const char * m_palette_tag; // configured tag for palette device bool m_palette_is_sibling; // is palette a sibling or a subdevice? // internal state diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp index 7b8a54ab131..ed02e18a442 100644 --- a/src/emu/diimage.cpp +++ b/src/emu/diimage.cpp @@ -371,14 +371,14 @@ const char * device_image_interface::working_directory() get_software_region -------------------------------------------------*/ -UINT8 *device_image_interface::get_software_region(std::string tag) +UINT8 *device_image_interface::get_software_region(const char *tag) { char full_tag[256]; if ( m_software_info_ptr == nullptr || m_software_part_ptr == nullptr ) return nullptr; - sprintf( full_tag, "%s:%s", device().tag().c_str(), tag.c_str() ); + sprintf( full_tag, "%s:%s", device().tag(), tag ); return device().machine().root_device().memregion( full_tag )->base(); } @@ -387,11 +387,11 @@ UINT8 *device_image_interface::get_software_region(std::string tag) image_get_software_region_length -------------------------------------------------*/ -UINT32 device_image_interface::get_software_region_length(std::string tag) +UINT32 device_image_interface::get_software_region_length(const char *tag) { char full_tag[256]; - sprintf( full_tag, "%s:%s", device().tag().c_str(), tag.c_str() ); + sprintf( full_tag, "%s:%s", device().tag(), tag ); return device().machine().root_device().memregion( full_tag )->bytes(); } @@ -410,7 +410,7 @@ const char *device_image_interface::get_feature(const char *feature_name) // load_software_region - //------------------------------------------------- -bool device_image_interface::load_software_region(std::string tag, optional_shared_ptr &ptr) +bool device_image_interface::load_software_region(const char *tag, optional_shared_ptr &ptr) { size_t size = get_software_region_length(tag); diff --git a/src/emu/diimage.h b/src/emu/diimage.h index f33de658d7d..b1a8a16ad70 100644 --- a/src/emu/diimage.h +++ b/src/emu/diimage.h @@ -208,10 +208,10 @@ public: void set_working_directory(const char *working_directory) { m_working_directory = working_directory; } const char * working_directory(); - UINT8 *get_software_region(std::string tag); - UINT32 get_software_region_length(std::string tag); + UINT8 *get_software_region(const char *tag); + UINT32 get_software_region_length(const char *tag); const char *get_feature(const char *feature_name); - bool load_software_region(std::string tag, optional_shared_ptr &ptr); + bool load_software_region(const char *tag, optional_shared_ptr &ptr); UINT32 crc(); hash_collection& hash() { return m_hash; } diff --git a/src/emu/dimemory.cpp b/src/emu/dimemory.cpp index 3d8c5251d43..b245d51a0b9 100644 --- a/src/emu/dimemory.cpp +++ b/src/emu/dimemory.cpp @@ -144,9 +144,9 @@ void device_memory_interface::static_set_addrmap(device_t &device, address_space { device_memory_interface *memory; if (!device.interface(memory)) - throw emu_fatalerror("MCFG_DEVICE_ADDRESS_MAP called on device '%s' with no memory interface", device.tag().c_str()); + throw emu_fatalerror("MCFG_DEVICE_ADDRESS_MAP called on device '%s' with no memory interface", device.tag()); if (spacenum >= ARRAY_LENGTH(memory->m_address_map)) - throw emu_fatalerror("MCFG_DEVICE_ADDRESS_MAP called on device '%s' with out-of-range space number %d", device.tag().c_str(), spacenum); + throw emu_fatalerror("MCFG_DEVICE_ADDRESS_MAP called on device '%s' with out-of-range space number %d", device.tag(), spacenum); memory->m_address_map[spacenum] = map; } diff --git a/src/emu/dimemory.h b/src/emu/dimemory.h index 1f9e48416c2..66561b5a5cf 100644 --- a/src/emu/dimemory.h +++ b/src/emu/dimemory.h @@ -144,7 +144,7 @@ inline const address_space_config *device_get_space_config(const device_t &devic { const device_memory_interface *intf; if (!device.interface(intf)) - throw emu_fatalerror("Device '%s' does not have memory interface", device.tag().c_str()); + throw emu_fatalerror("Device '%s' does not have memory interface", device.tag()); return intf->space_config(spacenum); } diff --git a/src/emu/diserial.cpp b/src/emu/diserial.cpp index 276fdcfb64c..3e4c0b4c785 100644 --- a/src/emu/diserial.cpp +++ b/src/emu/diserial.cpp @@ -59,7 +59,7 @@ device_serial_interface::~device_serial_interface() void device_serial_interface::register_save_state(save_manager &save, device_t *device) { const char *module = device->name(); - std::string tag = device->tag(); + const char *tag = device->tag(); save.save_item(device, module, tag, 0, NAME(m_df_start_bit_count)); save.save_item(device, module, tag, 0, NAME(m_df_word_length)); save.save_item(device, module, tag, 0, NAME(m_df_parity)); diff --git a/src/emu/dislot.cpp b/src/emu/dislot.cpp index f5522a17aea..051dc33bdb2 100644 --- a/src/emu/dislot.cpp +++ b/src/emu/dislot.cpp @@ -45,7 +45,7 @@ void device_slot_interface::static_option_add(device_t &device, const char *name device_slot_option *option = intf.option(name); if (option != nullptr) - throw emu_fatalerror("slot '%s' duplicate option '%s\n", device.tag().c_str(), name); + throw emu_fatalerror("slot '%s' duplicate option '%s\n", device.tag(), name); intf.m_options.append(name, *global_alloc(device_slot_option(name, devtype))); } @@ -56,7 +56,7 @@ device_slot_option *device_slot_interface::static_option(device_t &device, const device_slot_option *option = intf.option(name); if (option == nullptr) - throw emu_fatalerror("slot '%s' has no option '%s\n", device.tag().c_str(), name); + throw emu_fatalerror("slot '%s' has no option '%s\n", device.tag(), name); return option; } @@ -65,15 +65,15 @@ device_t* device_slot_interface::get_card_device() { std::string subtag; device_t *dev = nullptr; - if (device().mconfig().options().exists(device().tag().c_str()+1)) - subtag = device().mconfig().options().main_value(device().tag().c_str()+1); + if (device().mconfig().options().exists(device().tag()+1)) + subtag = device().mconfig().options().main_value(device().tag()+1); else if (m_default_option != nullptr) subtag.assign(m_default_option); if (!subtag.empty()) { device_slot_card_interface *intf = nullptr; dev = device().subdevice(subtag.c_str()); if (dev!=nullptr && !dev->interface(intf)) - throw emu_fatalerror("get_card_device called for device '%s' with no slot card interface", dev->tag().c_str()); + throw emu_fatalerror("get_card_device called for device '%s' with no slot card interface", dev->tag()); } return dev; } diff --git a/src/emu/disound.cpp b/src/emu/disound.cpp index c99d1bb1b6d..c1f4e49f4b6 100644 --- a/src/emu/disound.cpp +++ b/src/emu/disound.cpp @@ -47,7 +47,7 @@ device_sound_interface::sound_route &device_sound_interface::static_add_route(de // find our sound interface device_sound_interface *sound; if (!device.interface(sound)) - throw emu_fatalerror("MCFG_SOUND_ROUTE called on device '%s' with no sound interface", device.tag().c_str()); + throw emu_fatalerror("MCFG_SOUND_ROUTE called on device '%s' with no sound interface", device.tag()); // append a new route to the list return sound->m_route_list.append(*global_alloc(sound_route(output, input, gain, target, mixoutput))); @@ -64,7 +64,7 @@ void device_sound_interface::static_reset_routes(device_t &device) // find our sound interface device_sound_interface *sound; if (!device.interface(sound)) - throw emu_fatalerror("MCFG_SOUND_ROUTES_RESET called on device '%s' with no sound interface", device.tag().c_str()); + throw emu_fatalerror("MCFG_SOUND_ROUTES_RESET called on device '%s' with no sound interface", device.tag()); // reset the routine list sound->m_route_list.reset(); @@ -324,7 +324,7 @@ void device_sound_interface::interface_post_start() int streaminputnum; sound_stream *inputstream = input_to_stream_input(inputnum++, streaminputnum); if (inputstream == nullptr) - fatalerror("Sound device '%s' targeted output #%d to non-existant device '%s' input %d\n", route->m_target.c_str(), outputnum, m_device.tag().c_str(), inputnum - 1); + fatalerror("Sound device '%s' targeted output #%d to non-existant device '%s' input %d\n", route->m_target.c_str(), outputnum, m_device.tag(), inputnum - 1); // set the input inputstream->set_input(streaminputnum, outputstream, streamoutputnum, route->m_gain); @@ -408,7 +408,7 @@ void device_mixer_interface::interface_pre_start() // no inputs? that's weird if (m_auto_allocated_inputs == 0) { - device().logerror("Warning: mixer \"%s\" has no inputs\n", device().tag().c_str()); + device().logerror("Warning: mixer \"%s\" has no inputs\n", device().tag()); return; } diff --git a/src/emu/dispatch.cpp b/src/emu/dispatch.cpp index 1bb12d44cb9..4df4d3f610b 100644 --- a/src/emu/dispatch.cpp +++ b/src/emu/dispatch.cpp @@ -9,31 +9,31 @@ const device_type DEVCB_LINE_DISPATCH_4 = &device_creator >; const device_type DEVCB_LINE_DISPATCH_6 = &device_creator >; -template<> devcb_line_dispatch_device<2>::devcb_line_dispatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +template<> devcb_line_dispatch_device<2>::devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DEVCB_LINE_DISPATCH_2, "Line dispatcher (2 slots)", tag, owner, clock, "devcb_line_dispatch", __FILE__) { init_fwd(); } -template<> devcb_line_dispatch_device<3>::devcb_line_dispatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +template<> devcb_line_dispatch_device<3>::devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DEVCB_LINE_DISPATCH_3, "Line dispatcher (3 slots)", tag, owner, clock, "devcb_line_dispatch", __FILE__) { init_fwd(); } -template<> devcb_line_dispatch_device<4>::devcb_line_dispatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +template<> devcb_line_dispatch_device<4>::devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DEVCB_LINE_DISPATCH_4, "Line dispatcher (4 slots)", tag, owner, clock, "devcb_line_dispatch", __FILE__) { init_fwd(); } -template<> devcb_line_dispatch_device<5>::devcb_line_dispatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +template<> devcb_line_dispatch_device<5>::devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DEVCB_LINE_DISPATCH_5, "Line dispatcher (5 slots)", tag, owner, clock, "devcb_line_dispatch", __FILE__) { init_fwd(); } -template<> devcb_line_dispatch_device<6>::devcb_line_dispatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +template<> devcb_line_dispatch_device<6>::devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DEVCB_LINE_DISPATCH_6, "Line dispatcher (6 slots)", tag, owner, clock, "devcb_line_dispatch", __FILE__) { init_fwd(); diff --git a/src/emu/dispatch.h b/src/emu/dispatch.h index a8c5eab58c2..f9442a658da 100644 --- a/src/emu/dispatch.h +++ b/src/emu/dispatch.h @@ -25,7 +25,7 @@ template class devcb_line_dispatch_device : public device_t { public: - devcb_line_dispatch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + devcb_line_dispatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void init_fwd() { for(auto & elem : fwd_cb) diff --git a/src/emu/distate.cpp b/src/emu/distate.cpp index 61224fc0b1e..9986b261e93 100644 --- a/src/emu/distate.cpp +++ b/src/emu/distate.cpp @@ -605,7 +605,7 @@ void device_state_interface::interface_post_start() { // make sure we got something during startup if (m_state_list.count() == 0) - throw emu_fatalerror("No state registered for device '%s' that supports it!", m_device.tag().c_str()); + throw emu_fatalerror("No state registered for device '%s' that supports it!", m_device.tag()); } diff --git a/src/emu/divideo.cpp b/src/emu/divideo.cpp index a4e77e39981..2ba4d117a28 100644 --- a/src/emu/divideo.cpp +++ b/src/emu/divideo.cpp @@ -46,12 +46,12 @@ device_video_interface::~device_video_interface() // a new route to the device //------------------------------------------------- -void device_video_interface::static_set_screen(device_t &device, std::string tag) +void device_video_interface::static_set_screen(device_t &device, const char *tag) { // find our video interface device_video_interface *video; if (!device.interface(video)) - throw emu_fatalerror("MCFG_VIDEO_SET_SCREEN called on device '%s' with no video interface", device.tag().c_str()); + throw emu_fatalerror("MCFG_VIDEO_SET_SCREEN called on device '%s' with no video interface", device.tag()); video->m_screen_tag = tag; } @@ -66,14 +66,14 @@ void device_video_interface::interface_validity_check(validity_checker &valid) c { // only look up screens if we haven't explicitly requested no screen screen_device *screen = nullptr; - if (!m_screen_tag.empty()) + if (m_screen_tag != nullptr) { // find the screen device if explicitly configured - if (m_screen_tag != s_unconfigured_screen_tag) + if (strcmp(m_screen_tag, s_unconfigured_screen_tag) != 0) { screen = device().siblingdevice(m_screen_tag); if (screen == nullptr) - osd_printf_error("Screen '%s' not found, explicitly set for device '%s'\n", m_screen_tag.c_str(), device().tag().c_str()); + osd_printf_error("Screen '%s' not found, explicitly set for device '%s'\n", m_screen_tag, device().tag()); } // otherwise, look for a single match @@ -82,13 +82,13 @@ void device_video_interface::interface_validity_check(validity_checker &valid) c screen_device_iterator iter(device().mconfig().root_device()); screen = iter.first(); if (iter.next() != nullptr) - osd_printf_error("No screen specified for device '%s', but multiple screens found\n", device().tag().c_str()); + osd_printf_error("No screen specified for device '%s', but multiple screens found\n", device().tag()); } } // error if no screen is found if (screen == nullptr && m_screen_required) - osd_printf_error("Device '%s' requires a screen\n", device().tag().c_str()); + osd_printf_error("Device '%s' requires a screen\n", device().tag()); } @@ -100,14 +100,14 @@ void device_video_interface::interface_validity_check(validity_checker &valid) c void device_video_interface::interface_pre_start() { // only look up screens if we haven't explicitly requested no screen - if (!m_screen_tag.empty()) + if (m_screen_tag != nullptr) { // find the screen device if explicitly configured - if (m_screen_tag != s_unconfigured_screen_tag) + if (strcmp(m_screen_tag, s_unconfigured_screen_tag) != 0) { m_screen = device().siblingdevice(m_screen_tag); if (m_screen == nullptr) - throw emu_fatalerror("Screen '%s' not found, explicitly set for device '%s'", m_screen_tag.c_str(), device().tag().c_str()); + throw emu_fatalerror("Screen '%s' not found, explicitly set for device '%s'", m_screen_tag, device().tag()); } // otherwise, look for a single match @@ -116,13 +116,13 @@ void device_video_interface::interface_pre_start() screen_device_iterator iter(device().machine().root_device()); m_screen = iter.first(); if (iter.next() != nullptr) - throw emu_fatalerror("No screen specified for device '%s', but multiple screens found", device().tag().c_str()); + throw emu_fatalerror("No screen specified for device '%s', but multiple screens found", device().tag()); } } // fatal error if no screen is found if (m_screen == nullptr && m_screen_required) - throw emu_fatalerror("Device '%s' requires a screen", device().tag().c_str()); + throw emu_fatalerror("Device '%s' requires a screen", device().tag()); // if we have a screen and it's not started, wait for it if (m_screen != nullptr && !m_screen->started()) diff --git a/src/emu/divideo.h b/src/emu/divideo.h index 1cdeb82bbac..e50a1b5df08 100644 --- a/src/emu/divideo.h +++ b/src/emu/divideo.h @@ -43,7 +43,7 @@ public: virtual ~device_video_interface(); // static configuration - static void static_set_screen(device_t &device, std::string tag); + static void static_set_screen(device_t &device, const char *tag); // getters screen_device &screen() const { return *m_screen; } @@ -55,7 +55,7 @@ protected: // configuration state bool m_screen_required; // is a screen required? - std::string m_screen_tag; // configured tag for the target screen + const char * m_screen_tag; // configured tag for the target screen // internal state screen_device * m_screen; // pointer to the screen device diff --git a/src/emu/drawgfx.cpp b/src/emu/drawgfx.cpp index 6ffe96b2337..21fc4b425c7 100644 --- a/src/emu/drawgfx.cpp +++ b/src/emu/drawgfx.cpp @@ -68,7 +68,7 @@ static inline INT32 normalize_yscroll(const bitmap_t &bitmap, INT32 yscroll) const device_type GFXDECODE = &device_creator; -gfxdecode_device::gfxdecode_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +gfxdecode_device::gfxdecode_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GFXDECODE, "gfxdecode", tag, owner, clock, "gfxdecode", __FILE__), device_gfx_interface(mconfig, *this) { diff --git a/src/emu/drawgfx.h b/src/emu/drawgfx.h index 8e26a7a8fc4..f106ce18768 100644 --- a/src/emu/drawgfx.h +++ b/src/emu/drawgfx.h @@ -452,7 +452,7 @@ class gfxdecode_device : public device_t, public device_gfx_interface { public: // construction/destruction - gfxdecode_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gfxdecode_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override {}; diff --git a/src/emu/driver.cpp b/src/emu/driver.cpp index 4afb6926adc..7d61c40e582 100644 --- a/src/emu/driver.cpp +++ b/src/emu/driver.cpp @@ -32,7 +32,7 @@ ADDRESS_MAP_END // driver_device - constructor //------------------------------------------------- -driver_device::driver_device(const machine_config &mconfig, device_type type, std::string tag) +driver_device::driver_device(const machine_config &mconfig, device_type type, const char *tag) : device_t(mconfig, type, "Driver Device", tag, nullptr, 0, "", __FILE__), device_memory_interface(mconfig, *this), m_space_config("generic", ENDIANNESS_LITTLE, 8, 32, 0, nullptr, *ADDRESS_MAP_NAME(generic)), @@ -578,7 +578,7 @@ repeated both in the upper and lower half CUSTOM_INPUT_MEMBER(driver_device::custom_port_read) { - std::string tag = (const char *)param; + const char *tag = (const char *)param; return ioport(tag)->read(); } diff --git a/src/emu/driver.h b/src/emu/driver.h index d0fadb08bab..20d4036dc43 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -102,7 +102,7 @@ class driver_device : public device_t, { public: // construction/destruction - driver_device(const machine_config &mconfig, device_type type, std::string tag); + driver_device(const machine_config &mconfig, device_type type, const char *tag); virtual ~driver_device(); // getters @@ -283,7 +283,7 @@ private: // this template function creates a stub which constructs a device template -device_t *driver_device_creator(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +device_t *driver_device_creator(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) { assert(owner == nullptr); assert(clock == 0); diff --git a/src/emu/drivers/empty.cpp b/src/emu/drivers/empty.cpp index edd2a483814..9c48a6c8b26 100644 --- a/src/emu/drivers/empty.cpp +++ b/src/emu/drivers/empty.cpp @@ -21,7 +21,7 @@ class empty_state : public driver_device { public: // constructor - empty_state(const machine_config &mconfig, device_type type, std::string tag) + empty_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } diff --git a/src/emu/drivers/testcpu.cpp b/src/emu/drivers/testcpu.cpp index f20b6bc5c6d..51bfa457694 100644 --- a/src/emu/drivers/testcpu.cpp +++ b/src/emu/drivers/testcpu.cpp @@ -29,7 +29,7 @@ class testcpu_state : public driver_device { public: // constructor - testcpu_state(const machine_config &mconfig, device_type type, std::string tag) + testcpu_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cpu(*this, "maincpu"), m_ram(*this, "ram"), diff --git a/src/emu/emucore.cpp b/src/emu/emucore.cpp index d4466cd09fc..26c23ac19fe 100644 --- a/src/emu/emucore.cpp +++ b/src/emu/emucore.cpp @@ -82,7 +82,7 @@ void report_bad_cast(const std::type_info &src_type, const std::type_info &dst_t void report_bad_device_cast(const device_t *dev, const std::type_info &src_type, const std::type_info &dst_type) { throw emu_fatalerror("Error: bad downcast<> or device<>. Tried to convert the device %s (%s) of type %s to a %s, which are incompatible.\n", - dev->tag().c_str(), dev->name(), src_type.name(), dst_type.name()); + dev->tag(), dev->name(), src_type.name(), dst_type.name()); } void fatalerror(const char *format, ...) diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp index 25c30abf1e4..aa1b0482edc 100644 --- a/src/emu/emuopts.cpp +++ b/src/emu/emuopts.cpp @@ -241,7 +241,7 @@ bool emu_options::add_slot_options(bool isfirstpass) first = false; // retrieve info about the device instance - const char *name = slot->device().tag().c_str() + 1; + const char *name = slot->device().tag() + 1; if (!exists(name)) { // add the option @@ -278,7 +278,7 @@ void emu_options::update_slot_options() for (device_slot_interface *slot = iter.first(); slot != nullptr; slot = iter.next()) { // retrieve info about the device instance - const char *name = slot->device().tag().c_str() + 1; + const char *name = slot->device().tag() + 1; if (exists(name) && slot->first_option() != nullptr) { std::string defvalue = slot->get_default_card_software(); diff --git a/src/emu/emupal.cpp b/src/emu/emupal.cpp index 41ca765413f..e3d2dcd97a1 100644 --- a/src/emu/emupal.cpp +++ b/src/emu/emupal.cpp @@ -19,7 +19,7 @@ const device_type PALETTE = &device_creator; -palette_device::palette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +palette_device::palette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PALETTE, "palette", tag, owner, clock, "palette", __FILE__), m_entries(0), m_indirect_entries(0), diff --git a/src/emu/emupal.h b/src/emu/emupal.h index 89492d72d33..b06a5b43d7f 100644 --- a/src/emu/emupal.h +++ b/src/emu/emupal.h @@ -373,7 +373,7 @@ class palette_device : public device_t public: // construction/destruction - palette_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + palette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration static void static_set_init(device_t &device, palette_init_delegate init); diff --git a/src/emu/info.cpp b/src/emu/info.cpp index 28590bd2857..4bae0daf37a 100644 --- a/src/emu/info.cpp +++ b/src/emu/info.cpp @@ -397,7 +397,7 @@ void info_xml_creator::output_devices() if (device->owner() != nullptr && device->shortname()!= nullptr && device->shortname()[0]!='\0') { if (shortnames.insert(device->shortname()).second) - output_one_device(*device, device->tag().c_str()); + output_one_device(*device, device->tag()); } } @@ -427,7 +427,7 @@ void info_xml_creator::output_devices() if (device->owner() == dev && device->shortname()!= nullptr && device->shortname()[0]!='\0') { if (shortnames.insert(device->shortname()).second) - output_one_device(*device, device->tag().c_str()); + output_one_device(*device, device->tag()); } } @@ -640,7 +640,7 @@ void info_xml_creator::output_chips(device_t &device, const char *root_tag) execute_interface_iterator execiter(device); for (device_execute_interface *exec = execiter.first(); exec != nullptr; exec = execiter.next()) { - if (exec->device().tag() != device.tag()) + if (strcmp(exec->device().tag(), device.tag())) { std::string newtag(exec->device().tag()), oldtag(":"); newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length()); @@ -658,7 +658,7 @@ void info_xml_creator::output_chips(device_t &device, const char *root_tag) sound_interface_iterator sounditer(device); for (device_sound_interface *sound = sounditer.first(); sound != nullptr; sound = sounditer.next()) { - if (sound->device().tag() != device.tag()) + if (strcmp(sound->device().tag(), device.tag())) { std::string newtag(sound->device().tag()), oldtag(":"); newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length()); @@ -686,7 +686,7 @@ void info_xml_creator::output_display(device_t &device, const char *root_tag) screen_device_iterator iter(device); for (const screen_device *screendev = iter.first(); screendev != nullptr; screendev = iter.next()) { - if (screendev->tag() != device.tag()) + if (strcmp(screendev->tag(), device.tag())) { std::string newtag(screendev->tag()), oldtag(":"); newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length()); @@ -1124,7 +1124,7 @@ void info_xml_creator::output_ports(const ioport_list &portlist) // cycle through ports for (ioport_port *port = portlist.first(); port != nullptr; port = port->next()) { - fprintf(m_output,"\t\t\n",port->tag().c_str()); + fprintf(m_output,"\t\t\n",port->tag()); for (ioport_field *field = port->first_field(); field != nullptr; field = field->next()) { if(field->is_analog()) @@ -1223,7 +1223,7 @@ void info_xml_creator::output_images(device_t &device, const char *root_tag) image_interface_iterator iter(device); for (const device_image_interface *imagedev = iter.first(); imagedev != nullptr; imagedev = iter.next()) { - if (imagedev->device().tag() != device.tag()) + if (strcmp(imagedev->device().tag(), device.tag())) { std::string newtag(imagedev->device().tag()), oldtag(":"); newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length()); @@ -1232,7 +1232,7 @@ void info_xml_creator::output_images(device_t &device, const char *root_tag) fprintf(m_output, "\t\timage_type_name())); // does this device have a tag? - if (!imagedev->device().tag().empty()) + if (imagedev->device().tag()) fprintf(m_output, " tag=\"%s\"", xml_normalize_string(newtag.c_str())); // is this device mandatory? @@ -1281,7 +1281,7 @@ void info_xml_creator::output_slots(device_t &device, const char *root_tag) { if (slot->fixed()) continue; // or shall we list these as non-configurable? - if (slot->device().tag()!=device.tag()) + if (strcmp(slot->device().tag(), device.tag())) { std::string newtag(slot->device().tag()), oldtag(":"); newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length()); diff --git a/src/emu/ioport.cpp b/src/emu/ioport.cpp index c3f55518417..282cc5c256c 100644 --- a/src/emu/ioport.cpp +++ b/src/emu/ioport.cpp @@ -1399,7 +1399,7 @@ bool ioport_condition::eval() const void ioport_condition::initialize(device_t &device) { - if (!m_tag.empty()) + if (m_tag != nullptr) m_port = device.ioport(m_tag); } @@ -1487,7 +1487,7 @@ ioport_field::ioport_field(ioport_port &port, ioport_type type, ioport_value def const input_device_default *def = device().input_ports_defaults(); if (def != nullptr) { - std::string fulltag = port.tag(); + const char *fulltag = port.tag(); for ( ; def->tag != nullptr; def++) if (device().subtag(def->tag) == fulltag && def->mask == m_mask) m_defvalue = def->defvalue & m_mask; @@ -2200,7 +2200,7 @@ ioport_field_live::ioport_field_live(ioport_field &field, analog_field *analog) // ioport_port - constructor //------------------------------------------------- -ioport_port::ioport_port(device_t &owner, std::string tag) +ioport_port::ioport_port(device_t &owner, const char *tag) : m_next(nullptr), m_device(owner), m_tag(tag), @@ -2354,7 +2354,7 @@ void ioport_port::insert_field(ioport_field &newfield, ioport_value &disallowedb if (newfield.condition().none()) { if ((newfield.mask() & disallowedbits) != 0) - strcatprintf(errorbuf, "INPUT_TOKEN_FIELD specifies duplicate port bits (port=%s mask=%X)\n", tag().c_str(), newfield.mask()); + strcatprintf(errorbuf, "INPUT_TOKEN_FIELD specifies duplicate port bits (port=%s mask=%X)\n", tag(), newfield.mask()); disallowedbits |= newfield.mask(); } @@ -3087,13 +3087,13 @@ bool ioport_manager::load_default_config(xml_data_node *portnode, int type, int bool ioport_manager::load_game_config(xml_data_node *portnode, int type, int player, const input_seq *newseq) { // read the mask, index, and defvalue attributes - std::string tag = xml_get_attribute_string(portnode, "tag", nullptr); + const char *tag = xml_get_attribute_string(portnode, "tag", nullptr); ioport_value mask = xml_get_attribute_int(portnode, "mask", 0); ioport_value defvalue = xml_get_attribute_int(portnode, "defvalue", 0); // find the port we want; if no tag, search them all for (ioport_port *port = first_port(); port != nullptr; port = port->next()) - if (tag.empty() || port->tag()==tag) + if (tag == nullptr || strcmp(port->tag(), tag) == 0) for (ioport_field *field = port->first_field(); field != nullptr; field = field->next()) // find the matching mask and defvalue @@ -3286,7 +3286,7 @@ void ioport_manager::save_game_inputs(xml_data_node *parentnode) if (portnode != nullptr) { // add the identifying information and attributes - xml_set_attribute(portnode, "tag", port->tag().c_str()); + xml_set_attribute(portnode, "tag", port->tag()); xml_set_attribute(portnode, "type", input_type_to_token(field->type(), field->player()).c_str()); xml_set_attribute_int(portnode, "mask", field->mask()); xml_set_attribute_int(portnode, "defvalue", field->defvalue() & field->mask()); @@ -3679,7 +3679,7 @@ const char *ioport_configurer::string_from_token(const char *string) // port_alloc - allocate a new port //------------------------------------------------- -void ioport_configurer::port_alloc(std::string tag) +void ioport_configurer::port_alloc(const char *tag) { // create the full tag std::string fulltag = m_owner.subtag(tag); @@ -3696,7 +3696,7 @@ void ioport_configurer::port_alloc(std::string tag) // modify it //------------------------------------------------- -void ioport_configurer::port_modify(std::string tag) +void ioport_configurer::port_modify(const char *tag) { // create the full tag std::string fulltag = m_owner.subtag(tag); @@ -3780,7 +3780,7 @@ void ioport_configurer::setting_alloc(ioport_value value, const char *name) // the current setting or field //------------------------------------------------- -void ioport_configurer::set_condition(ioport_condition::condition_t condition, std::string tag, ioport_value mask, ioport_value value) +void ioport_configurer::set_condition(ioport_condition::condition_t condition, const char *tag, ioport_value mask, ioport_value value) { ioport_condition &target = (m_cursetting != nullptr) ? m_cursetting->condition() : m_curfield->condition(); target.set(condition, tag, mask, value); diff --git a/src/emu/ioport.h b/src/emu/ioport.h index 6dec762a7d2..89bd9e6964e 100644 --- a/src/emu/ioport.h +++ b/src/emu/ioport.h @@ -889,19 +889,19 @@ public: // construction/destruction ioport_condition() { reset(); } - ioport_condition(condition_t condition, std::string tag, ioport_value mask, ioport_value value) { set(condition, tag, mask, value); } + ioport_condition(condition_t condition, const char *tag, ioport_value mask, ioport_value value) { set(condition, tag, mask, value); } // getters - std::string tag() const { return m_tag; } + const char *tag() const { return m_tag; } // operators - bool operator==(const ioport_condition &rhs) const { return (m_mask == rhs.m_mask && m_value == rhs.m_value && m_condition == rhs.m_condition && m_tag==rhs.m_tag); } + bool operator==(const ioport_condition &rhs) const { return (m_mask == rhs.m_mask && m_value == rhs.m_value && m_condition == rhs.m_condition && strcmp(m_tag, rhs.m_tag) == 0); } bool eval() const; bool none() const { return (m_condition == ALWAYS); } // configuration - void reset() { set(ALWAYS, std::string(), 0, 0); } - void set(condition_t condition, std::string tag, ioport_value mask, ioport_value value) + void reset() { set(ALWAYS, nullptr, 0, 0); } + void set(condition_t condition, const char *tag, ioport_value mask, ioport_value value) { m_condition = condition; m_tag = tag; @@ -914,7 +914,7 @@ public: private: // internal state condition_t m_condition; // condition to use - std::string m_tag; // tag of port whose condition is to be tested + const char * m_tag; // tag of port whose condition is to be tested ioport_port * m_port; // reference to the port to be tested ioport_value m_mask; // mask to apply to the port ioport_value m_value; // value to compare against @@ -1188,7 +1188,7 @@ class ioport_port public: // construction/destruction - ioport_port(device_t &owner, std::string tag); + ioport_port(device_t &owner, const char *tag); ~ioport_port(); // getters @@ -1197,7 +1197,7 @@ public: device_t &device() const { return m_device; } running_machine &machine() const; ioport_field *first_field() const { return m_fieldlist.first(); } - std::string tag() const { return m_tag.c_str(); } + const char *tag() const { return m_tag.c_str(); } int modcount() const { return m_modcount; } ioport_value active() const { return m_active; } ioport_port_live &live() const { assert(m_live != nullptr); return *m_live; } @@ -1408,7 +1408,7 @@ private: void frame_update_callback(); void frame_update(); - ioport_port *port(std::string tag) const { return m_portlist.find(tag); } + ioport_port *port(const char *tag) const { return m_portlist.find(tag); } void exit(); input_seq_type token_to_seq_type(const char *string); void update_defaults(); @@ -1480,8 +1480,8 @@ public: static const char *string_from_token(const char *string); // port helpers - void port_alloc(std::string tag); - void port_modify(std::string tag); + void port_alloc(const char *tag); + void port_modify(const char *tag); // field helpers void field_alloc(ioport_type type, ioport_value defval, ioport_value mask, const char *name = nullptr); @@ -1515,7 +1515,7 @@ public: void setting_alloc(ioport_value value, const char *name); // misc helpers - void set_condition(ioport_condition::condition_t condition, std::string tag, ioport_value mask, ioport_value value); + void set_condition(ioport_condition::condition_t condition, const char *tag, ioport_value mask, ioport_value value); void onoff_alloc(const char *name, ioport_value defval, ioport_value mask, const char *diplocation); private: diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index 22254278ef7..a80a9c1aa74 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -186,7 +186,7 @@ const char *running_machine::describe_context() { cpu_device *cpu = dynamic_cast(&executing->device()); if (cpu != nullptr) - strprintf(m_context, "'%s' (%s)", cpu->tag().c_str(), core_i64_format(cpu->pc(), cpu->space(AS_PROGRAM).logaddrchars(), cpu->is_octal())); + strprintf(m_context, "'%s' (%s)", cpu->tag(), core_i64_format(cpu->pc(), cpu->space(AS_PROGRAM).logaddrchars(), cpu->is_octal())); } else m_context.assign("(no context)"); @@ -412,7 +412,7 @@ int running_machine::run(bool firstrun) } catch (add_exception &aex) { - osd_printf_error("Tag '%s' already exists in tagged_list\n", aex.tag().c_str()); + osd_printf_error("Tag '%s' already exists in tagged_list\n", aex.tag()); error = MAMERR_FATALERROR; } catch (std::exception &ex) @@ -1092,7 +1092,7 @@ void running_machine::start_all_devices() device->set_machine(*this); // now start the device - osd_printf_verbose("Starting %s '%s'\n", device->name(), device->tag().c_str()); + osd_printf_verbose("Starting %s '%s'\n", device->name(), device->tag()); device->start(); } diff --git a/src/emu/machine.h b/src/emu/machine.h index 824cce20dab..957ff4bbe13 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -198,8 +198,8 @@ public: bool scheduled_event_pending() const { return m_exit_pending || m_hard_reset_pending; } // fetch items by name - inline device_t *device(std::string tag) const { return root_device().subdevice(tag); } - template inline _DeviceClass *device(std::string tag) { return downcast<_DeviceClass *>(device(tag)); } + inline device_t *device(const char *tag) const { return root_device().subdevice(tag); } + template inline _DeviceClass *device(const char *tag) { return downcast<_DeviceClass *>(device(tag)); } // immediate operations int run(bool firstrun); @@ -232,8 +232,8 @@ public: INT32 get_vblank_watchdog_counter() const { return m_watchdog_counter; } // misc - void popmessage(const char *format, ...) const ATTR_PRINTF(2,3); - void logerror(const char *format, ...) const ATTR_PRINTF(2,3); + void popmessage(const char *format, ...) const; + void logerror(const char *format, ...) const; void vlogerror(const char *format, va_list args) const; UINT32 rand(); const char *describe_context(); diff --git a/src/emu/mconfig.cpp b/src/emu/mconfig.cpp index 9e86e2206ad..6c052d7ce23 100644 --- a/src/emu/mconfig.cpp +++ b/src/emu/mconfig.cpp @@ -40,9 +40,9 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options) { device_t &owner = slot->device(); std::string selval; - bool isdefault = (options.priority(owner.tag().c_str()+1)==OPTION_PRIORITY_DEFAULT); - if (is_selected_driver && options.exists(owner.tag().c_str()+1)) - selval = options.main_value(owner.tag().c_str()+1); + bool isdefault = (options.priority(owner.tag()+1)==OPTION_PRIORITY_DEFAULT); + if (is_selected_driver && options.exists(owner.tag()+1)) + selval = options.main_value(owner.tag()+1); else if (slot->default_option() != nullptr) selval.assign(slot->default_option()); @@ -67,7 +67,7 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options) device_t::static_set_input_default(*new_dev, input_device_defaults); } else - throw emu_fatalerror("Unknown slot option '%s' in slot '%s'", selval.c_str(), owner.tag().c_str()+1); + throw emu_fatalerror("Unknown slot option '%s' in slot '%s'", selval.c_str(), owner.tag()+1); } } @@ -108,10 +108,9 @@ screen_device *machine_config::first_screen() const // new device //------------------------------------------------- -device_t *machine_config::device_add(device_t *owner, std::string _tag, device_type type, UINT32 clock) +device_t *machine_config::device_add(device_t *owner, const char *tag, device_type type, UINT32 clock) { - const char *orig_tag = _tag.c_str(); - const char *tag = _tag.c_str(); + const char *orig_tag = tag; // if the device path is absolute, start from the root if (tag[0] == ':') @@ -159,14 +158,14 @@ device_t *machine_config::device_add(device_t *owner, std::string _tag, device_t // replace one device with a new device //------------------------------------------------- -device_t *machine_config::device_replace(device_t *owner, std::string tag, device_type type, UINT32 clock) +device_t *machine_config::device_replace(device_t *owner, const char *tag, device_type type, UINT32 clock) { // find the original device by this name (must exist) assert(owner != nullptr); device_t *device = owner->subdevice(tag); if (device == nullptr) { - osd_printf_warning("Warning: attempting to replace non-existent device '%s'\n", tag.c_str()); + osd_printf_warning("Warning: attempting to replace non-existent device '%s'\n", tag); return device_add(owner, tag, type, clock); } @@ -180,14 +179,14 @@ device_t *machine_config::device_replace(device_t *owner, std::string tag, devic // remove a device //------------------------------------------------- -device_t *machine_config::device_remove(device_t *owner, std::string tag) +device_t *machine_config::device_remove(device_t *owner, const char *tag) { // find the original device by this name (must exist) assert(owner != nullptr); device_t *device = owner->subdevice(tag); if (device == nullptr) { - osd_printf_warning("Warning: attempting to remove non-existent device '%s'\n", tag.c_str()); + osd_printf_warning("Warning: attempting to remove non-existent device '%s'\n", tag); return nullptr; } @@ -202,14 +201,14 @@ device_t *machine_config::device_remove(device_t *owner, std::string tag) // locate a device //------------------------------------------------- -device_t *machine_config::device_find(device_t *owner, std::string tag) +device_t *machine_config::device_find(device_t *owner, const char *tag) { // find the original device by this name (must exist) assert(owner != nullptr); device_t *device = owner->subdevice(tag); assert(device != nullptr); if (device == nullptr) - throw emu_fatalerror("Unable to find device '%s'\n", tag.c_str()); + throw emu_fatalerror("Unable to find device '%s'\n", tag); // return the device return device; diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index 1c0a5a85ea9..dc1a2e99b0a 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -54,8 +54,8 @@ public: device_t &root_device() const { assert(m_root_device != nullptr); return *m_root_device; } screen_device *first_screen() const; emu_options &options() const { return m_options; } - inline device_t *device(std::string tag) const { return root_device().subdevice(tag); } - template inline _DeviceClass *device(std::string tag) const { return downcast<_DeviceClass *>(device(tag)); } + inline device_t *device(const char *tag) const { return root_device().subdevice(tag); } + template inline _DeviceClass *device(const char *tag) const { return downcast<_DeviceClass *>(device(tag)); } // public state attotime m_minimum_quantum; // minimum scheduling quantum @@ -68,10 +68,10 @@ public: const char * m_default_layout; // default layout for this machine // helpers during configuration; not for general use - device_t *device_add(device_t *owner, std::string tag, device_type type, UINT32 clock); - device_t *device_replace(device_t *owner, std::string tag, device_type type, UINT32 clock); - device_t *device_remove(device_t *owner, std::string tag); - device_t *device_find(device_t *owner, std::string tag); + device_t *device_add(device_t *owner, const char *tag, device_type type, UINT32 clock); + device_t *device_replace(device_t *owner, const char *tag, device_type type, UINT32 clock); + device_t *device_remove(device_t *owner, const char *tag); + device_t *device_find(device_t *owner, const char *tag); private: // internal state diff --git a/src/emu/memory.cpp b/src/emu/memory.cpp index 3a4f581665c..598ffab9ac6 100644 --- a/src/emu/memory.cpp +++ b/src/emu/memory.cpp @@ -1583,13 +1583,13 @@ void memory_manager::dump(FILE *file) fprintf(file, "\n\n" "====================================================\n" "Device '%s' %s address space read handler dump\n" - "====================================================\n", space->device().tag().c_str(), space->name()); + "====================================================\n", space->device().tag(), space->name()); space->dump_map(file, ROW_READ); fprintf(file, "\n\n" "====================================================\n" "Device '%s' %s address space write handler dump\n" - "====================================================\n", space->device().tag().c_str(), space->name()); + "====================================================\n", space->device().tag(), space->name()); space->dump_map(file, ROW_WRITE); } } @@ -1833,7 +1833,7 @@ void address_space::prepare_map() adjust_addresses(entry->m_bytestart, entry->m_byteend, entry->m_bytemask, entry->m_bytemirror); // if we have a share entry, add it to our map - if (!entry->m_share.empty()) + if (entry->m_share != nullptr) { // if we can't find it, add it to our map std::string fulltag = entry->m_devbase.subtag(entry->m_share); @@ -1846,7 +1846,7 @@ void address_space::prepare_map() } // if this is a ROM handler without a specified region, attach it to the implicit region - if (m_spacenum == AS_0 && entry->m_read.m_type == AMH_ROM && entry->m_region.empty()) + if (m_spacenum == AS_0 && entry->m_read.m_type == AMH_ROM && entry->m_region == nullptr) { // make sure it fits within the memory region before doing so, however if (entry->m_byteend < devregionsize) @@ -1857,7 +1857,7 @@ void address_space::prepare_map() } // validate adjusted addresses against implicit regions - if (!entry->m_region.empty() && entry->m_share.empty()) + if (entry->m_region != nullptr && entry->m_share == nullptr) { // determine full tag std::string fulltag = entry->m_devbase.subtag(entry->m_region); @@ -1865,15 +1865,15 @@ void address_space::prepare_map() // find the region memory_region *region = machine().root_device().memregion(fulltag.c_str()); if (region == nullptr) - fatalerror("Error: device '%s' %s space memory map entry %X-%X references non-existant region \"%s\"\n", m_device.tag().c_str(), m_name, entry->m_addrstart, entry->m_addrend, entry->m_region.c_str()); + fatalerror("Error: device '%s' %s space memory map entry %X-%X references non-existant region \"%s\"\n", m_device.tag(), m_name, entry->m_addrstart, entry->m_addrend, entry->m_region); // validate the region if (entry->m_rgnoffs + (entry->m_byteend - entry->m_bytestart + 1) > region->bytes()) - fatalerror("Error: device '%s' %s space memory map entry %X-%X extends beyond region \"%s\" size (%X)\n", m_device.tag().c_str(), m_name, entry->m_addrstart, entry->m_addrend, entry->m_region.c_str(), region->bytes()); + fatalerror("Error: device '%s' %s space memory map entry %X-%X extends beyond region \"%s\" size (%X)\n", m_device.tag(), m_name, entry->m_addrstart, entry->m_addrend, entry->m_region, region->bytes()); } // convert any region-relative entries to their memory pointers - if (!entry->m_region.empty()) + if (entry->m_region != nullptr) { // determine full tag std::string fulltag = entry->m_devbase.subtag(entry->m_region); @@ -1976,18 +1976,18 @@ void address_space::populate_map_entry(const address_map_entry &entry, read_or_w case AMH_PORT: install_readwrite_port(entry.m_addrstart, entry.m_addrend, entry.m_addrmask, entry.m_addrmirror, - (readorwrite == ROW_READ) ? data.m_tag.c_str() : nullptr, - (readorwrite == ROW_WRITE) ? data.m_tag.c_str() : nullptr); + (readorwrite == ROW_READ) ? data.m_tag : nullptr, + (readorwrite == ROW_WRITE) ? data.m_tag : nullptr); break; case AMH_BANK: install_bank_generic(entry.m_addrstart, entry.m_addrend, entry.m_addrmask, entry.m_addrmirror, - (readorwrite == ROW_READ) ? data.m_tag.c_str() : nullptr, - (readorwrite == ROW_WRITE) ? data.m_tag.c_str() : nullptr); + (readorwrite == ROW_READ) ? data.m_tag : nullptr, + (readorwrite == ROW_WRITE) ? data.m_tag : nullptr); break; case AMH_DEVICE_SUBMAP: - throw emu_fatalerror("Internal mapping error: leftover mapping of '%s'.\n", data.m_tag.c_str()); + throw emu_fatalerror("Internal mapping error: leftover mapping of '%s'.\n", data.m_tag); } } @@ -2087,7 +2087,7 @@ void address_space::locate_memory() if (entry->m_bytestart == bank->bytestart() && entry->m_memory != nullptr) { bank->set_base(entry->m_memory); - VPRINTF(("assigned bank '%s' pointer to memory from range %08X-%08X [%p]\n", bank->tag().c_str(), entry->m_addrstart, entry->m_addrend, entry->m_memory)); + VPRINTF(("assigned bank '%s' pointer to memory from range %08X-%08X [%p]\n", bank->tag(), entry->m_addrstart, entry->m_addrend, entry->m_memory)); break; } @@ -2113,18 +2113,18 @@ address_map_entry *address_space::block_assign_intersecting(offs_t bytestart, of for (address_map_entry *entry = m_map->m_entrylist.first(); entry != nullptr; entry = entry->next()) { // if we haven't assigned this block yet, see if we have a mapped shared pointer for it - if (entry->m_memory == nullptr && !entry->m_share.empty()) + if (entry->m_memory == nullptr && entry->m_share != nullptr) { std::string fulltag = entry->m_devbase.subtag(entry->m_share); memory_share *share = manager().m_sharelist.find(fulltag.c_str()); if (share != nullptr && share->ptr() != nullptr) { entry->m_memory = share->ptr(); - VPRINTF(("memory range %08X-%08X -> shared_ptr '%s' [%p]\n", entry->m_addrstart, entry->m_addrend, entry->m_share.c_str(), entry->m_memory)); + VPRINTF(("memory range %08X-%08X -> shared_ptr '%s' [%p]\n", entry->m_addrstart, entry->m_addrend, entry->m_share, entry->m_memory)); } else { - VPRINTF(("memory range %08X-%08X -> shared_ptr '%s' but not found\n", entry->m_addrstart, entry->m_addrend, entry->m_share.c_str())); + VPRINTF(("memory range %08X-%08X -> shared_ptr '%s' but not found\n", entry->m_addrstart, entry->m_addrend, entry->m_share)); } } @@ -2136,14 +2136,14 @@ address_map_entry *address_space::block_assign_intersecting(offs_t bytestart, of } // if we're the first match on a shared pointer, assign it now - if (entry->m_memory != nullptr && !entry->m_share.empty()) + if (entry->m_memory != nullptr && entry->m_share != nullptr) { std::string fulltag = entry->m_devbase.subtag(entry->m_share); memory_share *share = manager().m_sharelist.find(fulltag.c_str()); if (share != nullptr && share->ptr() == nullptr) { share->set_ptr(entry->m_memory); - VPRINTF(("setting shared_ptr '%s' = %p\n", entry->m_share.c_str(), entry->m_memory)); + VPRINTF(("setting shared_ptr '%s' = %p\n", entry->m_share, entry->m_memory)); } } @@ -2256,7 +2256,7 @@ void address_space::install_readwrite_port(offs_t addrstart, offs_t addrend, off // find the port ioport_port *port = machine().root_device().ioport(device().siblingtag(rtag).c_str()); if (port == nullptr) - throw emu_fatalerror("Attempted to map non-existent port '%s' for read in space %s of device '%s'\n", rtag, m_name, m_device.tag().c_str()); + throw emu_fatalerror("Attempted to map non-existent port '%s' for read in space %s of device '%s'\n", rtag, m_name, m_device.tag()); // map the range and set the ioport read().handler_map_range(addrstart, addrend, addrmask, addrmirror).set_ioport(*port); @@ -2267,7 +2267,7 @@ void address_space::install_readwrite_port(offs_t addrstart, offs_t addrend, off // find the port ioport_port *port = machine().root_device().ioport(device().siblingtag(wtag).c_str()); if (port == nullptr) - fatalerror("Attempted to map non-existent port '%s' for write in space %s of device '%s'\n", wtag, m_name, m_device.tag().c_str()); + fatalerror("Attempted to map non-existent port '%s' for write in space %s of device '%s'\n", wtag, m_name, m_device.tag()); // map the range and set the ioport write().handler_map_range(addrstart, addrend, addrmask, addrmirror).set_ioport(*port); @@ -2316,7 +2316,7 @@ void address_space::install_bank_generic(offs_t addrstart, offs_t addrend, offs_ VPRINTF(("address_space::install_readwrite_bank(%s-%s mask=%s mirror=%s, read=\"%s\" / write=\"%s\")\n", core_i64_hex_format(addrstart, m_addrchars), core_i64_hex_format(addrend, m_addrchars), core_i64_hex_format(addrmask, m_addrchars), core_i64_hex_format(addrmirror, m_addrchars), - (rbank != nullptr) ? rbank->tag().c_str() : "(none)", (wbank != nullptr) ? wbank->tag().c_str() : "(none)")); + (rbank != nullptr) ? rbank->tag() : "(none)", (wbank != nullptr) ? wbank->tag() : "(none)")); // map the read bank if (rbank != nullptr) @@ -2352,7 +2352,7 @@ void *address_space::install_ram_generic(offs_t addrstart, offs_t addrend, offs_ if (readorwrite == ROW_READ || readorwrite == ROW_READWRITE) { // find a bank and map it - memory_bank &bank = bank_find_or_allocate(std::string(), addrstart, addrend, addrmask, addrmirror, ROW_READ); + memory_bank &bank = bank_find_or_allocate(nullptr, addrstart, addrend, addrmask, addrmirror, ROW_READ); read().map_range(addrstart, addrend, addrmask, addrmirror, bank.index()); // if we are provided a pointer, set it @@ -2381,7 +2381,7 @@ void *address_space::install_ram_generic(offs_t addrstart, offs_t addrend, offs_ if (readorwrite == ROW_WRITE || readorwrite == ROW_READWRITE) { // find a bank and map it - memory_bank &bank = bank_find_or_allocate(std::string(), addrstart, addrend, addrmask, addrmirror, ROW_WRITE); + memory_bank &bank = bank_find_or_allocate(nullptr, addrstart, addrend, addrmask, addrmirror, ROW_WRITE); write().map_range(addrstart, addrend, addrmask, addrmirror, bank.index()); // if we are provided a pointer, set it @@ -2553,7 +2553,7 @@ void *address_space::find_backing_memory(offs_t addrstart, offs_t addrend) offs_t bytestart = address_to_byte(addrstart); offs_t byteend = address_to_byte_end(addrend); - VPRINTF(("address_space::find_backing_memory('%s',%s,%08X-%08X) -> ", m_device.tag().c_str(), m_name, bytestart, byteend)); + VPRINTF(("address_space::find_backing_memory('%s',%s,%08X-%08X) -> ", m_device.tag(), m_name, bytestart, byteend)); if (m_map == nullptr) return nullptr; @@ -2592,7 +2592,7 @@ void *address_space::find_backing_memory(offs_t addrstart, offs_t addrend) bool address_space::needs_backing_store(const address_map_entry *entry) { // if we are sharing, and we don't have a pointer yet, create one - if (!entry->m_share.empty()) + if (entry->m_share != nullptr) { std::string fulltag = entry->m_devbase.subtag(entry->m_share); memory_share *share = manager().m_sharelist.find(fulltag.c_str()); @@ -2626,7 +2626,7 @@ bool address_space::needs_backing_store(const address_map_entry *entry) // read/write handler //------------------------------------------------- -memory_bank &address_space::bank_find_or_allocate(std::string tag, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, read_or_write readorwrite) +memory_bank &address_space::bank_find_or_allocate(const char *tag, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, read_or_write readorwrite) { // adjust the addresses, handling mirrors and such offs_t bytemirror = addrmirror; @@ -2637,7 +2637,7 @@ memory_bank &address_space::bank_find_or_allocate(std::string tag, offs_t addrst // if this bank is named, look it up memory_bank *membank = nullptr; - if (!tag.empty()) + if (tag != nullptr) membank = manager().bank(tag); // else try to find an exact match @@ -2653,8 +2653,8 @@ memory_bank &address_space::bank_find_or_allocate(std::string tag, offs_t addrst int banknum = manager().m_banknext++; if (banknum > STATIC_BANKMAX) { - if (!tag.empty()) - throw emu_fatalerror("Unable to allocate new bank '%s'", tag.c_str()); + if (tag != nullptr) + throw emu_fatalerror("Unable to allocate new bank '%s'", tag); else throw emu_fatalerror("Unable to allocate bank for RAM/ROM area %X-%X\n", bytestart, byteend); } @@ -2662,11 +2662,11 @@ memory_bank &address_space::bank_find_or_allocate(std::string tag, offs_t addrst // if no tag, create a unique one membank = global_alloc(memory_bank(*this, banknum, bytestart, byteend, tag)); std::string temptag; - if (tag.empty()) { + if (tag == nullptr) { strprintf(temptag, "anon_%p", (void *) membank); tag = temptag.c_str(); } - manager().m_banklist.append(tag.c_str(), *membank); + manager().m_banklist.append(tag, *membank); } // add a reference for this space @@ -3819,7 +3819,7 @@ memory_block::memory_block(address_space &space, offs_t bytestart, offs_t byteen m_byteend(byteend), m_data(reinterpret_cast(memory)) { - VPRINTF(("block_allocate('%s',%s,%08X,%08X,%p)\n", space.device().tag().c_str(), space.name(), bytestart, byteend, memory)); + VPRINTF(("block_allocate('%s',%s,%08X,%08X,%p)\n", space.device().tag(), space.name(), bytestart, byteend, memory)); // allocate a block if needed if (m_data == nullptr) @@ -3877,18 +3877,18 @@ memory_block::~memory_block() // memory_bank - constructor //------------------------------------------------- -memory_bank::memory_bank(address_space &space, int index, offs_t bytestart, offs_t byteend, std::string tag) +memory_bank::memory_bank(address_space &space, int index, offs_t bytestart, offs_t byteend, const char *tag) : m_next(nullptr), m_machine(space.machine()), m_baseptr(space.manager().bank_pointer_addr(index)), m_index(index), - m_anonymous(tag.empty()), + m_anonymous(tag == nullptr), m_bytestart(bytestart), m_byteend(byteend), m_curentry(BANK_ENTRY_UNSPECIFIED) { // generate an internal tag if we don't have one - if (tag.empty()) + if (tag == nullptr) { strprintf(m_tag,"~%d~", index); strprintf(m_name,"Internal bank #%d", index); @@ -3896,7 +3896,7 @@ memory_bank::memory_bank(address_space &space, int index, offs_t bytestart, offs else { m_tag.assign(tag); - strprintf(m_name,"Bank '%s'", tag.c_str()); + strprintf(m_name,"Bank '%s'", tag); } if (!m_anonymous && space.machine().save().registration_allowed()) @@ -4484,13 +4484,13 @@ void handler_entry_read::set_ioport(ioport_port &ioport) { m_ioport = &ioport; if (m_datawidth == 8) - set_delegate(read8_delegate(&handler_entry_read::read_stub_ioport, ioport.tag().c_str(), this)); + set_delegate(read8_delegate(&handler_entry_read::read_stub_ioport, ioport.tag(), this)); else if (m_datawidth == 16) - set_delegate(read16_delegate(&handler_entry_read::read_stub_ioport, ioport.tag().c_str(), this)); + set_delegate(read16_delegate(&handler_entry_read::read_stub_ioport, ioport.tag(), this)); else if (m_datawidth == 32) - set_delegate(read32_delegate(&handler_entry_read::read_stub_ioport, ioport.tag().c_str(), this)); + set_delegate(read32_delegate(&handler_entry_read::read_stub_ioport, ioport.tag(), this)); else if (m_datawidth == 64) - set_delegate(read64_delegate(&handler_entry_read::read_stub_ioport, ioport.tag().c_str(), this)); + set_delegate(read64_delegate(&handler_entry_read::read_stub_ioport, ioport.tag(), this)); } @@ -4778,13 +4778,13 @@ void handler_entry_write::set_ioport(ioport_port &ioport) { m_ioport = &ioport; if (m_datawidth == 8) - set_delegate(write8_delegate(&handler_entry_write::write_stub_ioport, ioport.tag().c_str(), this)); + set_delegate(write8_delegate(&handler_entry_write::write_stub_ioport, ioport.tag(), this)); else if (m_datawidth == 16) - set_delegate(write16_delegate(&handler_entry_write::write_stub_ioport, ioport.tag().c_str(), this)); + set_delegate(write16_delegate(&handler_entry_write::write_stub_ioport, ioport.tag(), this)); else if (m_datawidth == 32) - set_delegate(write32_delegate(&handler_entry_write::write_stub_ioport, ioport.tag().c_str(), this)); + set_delegate(write32_delegate(&handler_entry_write::write_stub_ioport, ioport.tag(), this)); else if (m_datawidth == 64) - set_delegate(write64_delegate(&handler_entry_write::write_stub_ioport, ioport.tag().c_str(), this)); + set_delegate(write64_delegate(&handler_entry_write::write_stub_ioport, ioport.tag(), this)); } diff --git a/src/emu/memory.h b/src/emu/memory.h index 1727fc8abd1..e04ac52f1b4 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -370,9 +370,9 @@ public: void install_read_port(offs_t addrstart, offs_t addrend, const char *rtag) { install_read_port(addrstart, addrend, 0, 0, rtag); } void install_write_port(offs_t addrstart, offs_t addrend, const char *wtag) { install_write_port(addrstart, addrend, 0, 0, wtag); } void install_readwrite_port(offs_t addrstart, offs_t addrend, const char *rtag, const char *wtag) { install_readwrite_port(addrstart, addrend, 0, 0, rtag, wtag); } - void install_read_bank(offs_t addrstart, offs_t addrend, std::string tag) { install_read_bank(addrstart, addrend, 0, 0, tag); } - void install_write_bank(offs_t addrstart, offs_t addrend, std::string tag) { install_write_bank(addrstart, addrend, 0, 0, tag); } - void install_readwrite_bank(offs_t addrstart, offs_t addrend, std::string tag) { install_readwrite_bank(addrstart, addrend, 0, 0, tag); } + void install_read_bank(offs_t addrstart, offs_t addrend, const char *tag) { install_read_bank(addrstart, addrend, 0, 0, tag); } + void install_write_bank(offs_t addrstart, offs_t addrend, const char *tag) { install_write_bank(addrstart, addrend, 0, 0, tag); } + void install_readwrite_bank(offs_t addrstart, offs_t addrend, const char *tag) { install_readwrite_bank(addrstart, addrend, 0, 0, tag); } void install_read_bank(offs_t addrstart, offs_t addrend, memory_bank *bank) { install_read_bank(addrstart, addrend, 0, 0, bank); } void install_write_bank(offs_t addrstart, offs_t addrend, memory_bank *bank) { install_write_bank(addrstart, addrend, 0, 0, bank); } void install_readwrite_bank(offs_t addrstart, offs_t addrend, memory_bank *bank) { install_readwrite_bank(addrstart, addrend, 0, 0, bank); } @@ -384,9 +384,9 @@ public: void install_read_port(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag) { install_readwrite_port(addrstart, addrend, addrmask, addrmirror, rtag, nullptr); } void install_write_port(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *wtag) { install_readwrite_port(addrstart, addrend, addrmask, addrmirror, nullptr, wtag); } void install_readwrite_port(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag, const char *wtag); - void install_read_bank(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, std::string tag) { install_bank_generic(addrstart, addrend, addrmask, addrmirror, tag.c_str(), nullptr); } - void install_write_bank(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, std::string tag) { install_bank_generic(addrstart, addrend, addrmask, addrmirror, nullptr, tag.c_str()); } - void install_readwrite_bank(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, std::string tag) { install_bank_generic(addrstart, addrend, addrmask, addrmirror, tag.c_str(), tag.c_str()); } + void install_read_bank(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *tag) { install_bank_generic(addrstart, addrend, addrmask, addrmirror, tag, nullptr); } + void install_write_bank(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *tag) { install_bank_generic(addrstart, addrend, addrmask, addrmirror, nullptr, tag); } + void install_readwrite_bank(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *tag) { install_bank_generic(addrstart, addrend, addrmask, addrmirror, tag, tag); } void install_read_bank(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, memory_bank *bank) { install_bank_generic(addrstart, addrend, addrmask, addrmirror, bank, nullptr); } void install_write_bank(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, memory_bank *bank) { install_bank_generic(addrstart, addrend, addrmask, addrmirror, nullptr, bank); } void install_readwrite_bank(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, memory_bank *bank) { install_bank_generic(addrstart, addrend, addrmask, addrmirror, bank, bank); } @@ -455,7 +455,7 @@ private: void adjust_addresses(offs_t &start, offs_t &end, offs_t &mask, offs_t &mirror); void *find_backing_memory(offs_t addrstart, offs_t addrend); bool needs_backing_store(const address_map_entry *entry); - memory_bank &bank_find_or_allocate(std::string tag, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, read_or_write readorwrite); + memory_bank &bank_find_or_allocate(const char *tag, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, read_or_write readorwrite); address_map_entry *block_assign_intersecting(offs_t bytestart, offs_t byteend, UINT8 *base); protected: @@ -568,7 +568,7 @@ class memory_bank public: // construction/destruction - memory_bank(address_space &space, int index, offs_t bytestart, offs_t byteend, std::string tag = nullptr); + memory_bank(address_space &space, int index, offs_t bytestart, offs_t byteend, const char *tag = nullptr); ~memory_bank(); // getters @@ -579,7 +579,7 @@ public: bool anonymous() const { return m_anonymous; } offs_t bytestart() const { return m_bytestart; } void *base() const { return *m_baseptr; } - std::string tag() const { return m_tag.c_str(); } + const char *tag() const { return m_tag.c_str(); } const char *name() const { return m_name.c_str(); } // compare a range against our range @@ -744,9 +744,9 @@ public: private: // internal helpers memory_bank *first_bank() const { return m_banklist.first(); } - memory_bank *bank(std::string tag) const { return m_banklist.find(tag); } - memory_region *region(std::string tag) { return m_regionlist.find(tag); } - memory_share *shared(std::string tag) { return m_sharelist.find(tag); } + memory_bank *bank(const char *tag) const { return m_banklist.find(tag); } + memory_region *region(const char *tag) { return m_regionlist.find(tag); } + memory_share *shared(const char *tag) { return m_sharelist.find(tag); } void bank_reattach(); // internal state diff --git a/src/emu/network.cpp b/src/emu/network.cpp index 25ab4fdfb58..0f5db2fd703 100644 --- a/src/emu/network.cpp +++ b/src/emu/network.cpp @@ -46,7 +46,7 @@ void network_manager::config_load(config_type cfg_type, xml_data_node *parentnod network_interface_iterator iter(machine().root_device()); for (device_network_interface *network = iter.first(); network != nullptr; network = iter.next()) { - if (!strcmp(tag, network->device().tag().c_str())) { + if (!strcmp(tag, network->device().tag())) { int interface = xml_get_attribute_int(node, "interface", 0); network->set_interface(interface); const char *mac_addr = xml_get_attribute_string(node, "mac", nullptr); @@ -82,7 +82,7 @@ void network_manager::config_save(config_type cfg_type, xml_data_node *parentnod node = xml_add_child(parentnode, "device", nullptr); if (node != nullptr) { - xml_set_attribute(node, "tag", network->device().tag().c_str()); + xml_set_attribute(node, "tag", network->device().tag()); xml_set_attribute_int(node, "interface", network->get_interface()); const char *mac = network->get_mac(); char mac_addr[6 * 3]; diff --git a/src/emu/profiler.cpp b/src/emu/profiler.cpp index f48c3cb9627..102f0358e09 100644 --- a/src/emu/profiler.cpp +++ b/src/emu/profiler.cpp @@ -210,7 +210,7 @@ void real_profiler_state::update_text(running_machine &machine) // and then the text if (curtype >= PROFILER_DEVICE_FIRST && curtype <= PROFILER_DEVICE_MAX) - strcatprintf(m_text, "'%s'", iter.byindex(curtype - PROFILER_DEVICE_FIRST)->tag().c_str()); + strcatprintf(m_text, "'%s'", iter.byindex(curtype - PROFILER_DEVICE_FIRST)->tag()); else for (auto & name : names) if (name.type == curtype) diff --git a/src/emu/romload.cpp b/src/emu/romload.cpp index d52dbb6d97f..28cc994402c 100644 --- a/src/emu/romload.cpp +++ b/src/emu/romload.cpp @@ -310,7 +310,7 @@ void rom_load_manager::determine_bios_rom(device_t *device, const char *specbios device->set_system_bios(default_no); } device->set_default_bios(default_no); - LOG(("For \"%s\" using System BIOS: %d\n", device->tag().c_str(), device->system_bios())); + LOG(("For \"%s\" using System BIOS: %d\n", device->tag(), device->system_bios())); } @@ -1460,7 +1460,7 @@ rom_load_manager::rom_load_manager(running_machine &machine) if (device->owner() == nullptr) { specbios.assign(machine.options().bios()); } else { - specbios = machine.options().sub_value(std::string(device->owner()->tag()).c_str()+1,"bios"); + specbios = machine.options().sub_value(device->owner()->tag()+1,"bios"); if (specbios.empty()) { specbios = device->default_bios_tag(); } diff --git a/src/emu/save.cpp b/src/emu/save.cpp index 0a6cffd3983..4a5b3ef7ebf 100644 --- a/src/emu/save.cpp +++ b/src/emu/save.cpp @@ -146,24 +146,24 @@ void save_manager::register_postload(save_prepost_delegate func) // memory //------------------------------------------------- -void save_manager::save_memory(device_t *device, const char *module, std::string tag, UINT32 index, const char *name, void *val, UINT32 valsize, UINT32 valcount) +void save_manager::save_memory(device_t *device, const char *module, const char *tag, UINT32 index, const char *name, void *val, UINT32 valsize, UINT32 valcount) { assert(valsize == 1 || valsize == 2 || valsize == 4 || valsize == 8); // check for invalid timing if (!m_reg_allowed) { - machine().logerror("Attempt to register save state entry after state registration is closed!\nModule %s tag %s name %s\n", module, tag.c_str(), name); + machine().logerror("Attempt to register save state entry after state registration is closed!\nModule %s tag %s name %s\n", module, tag, name); if (machine().system().flags & MACHINE_SUPPORTS_SAVE) - fatalerror("Attempt to register save state entry after state registration is closed!\nModule %s tag %s name %s\n", module, tag.c_str(), name); + fatalerror("Attempt to register save state entry after state registration is closed!\nModule %s tag %s name %s\n", module, tag, name); m_illegal_regs++; return; } // create the full name std::string totalname; - if (!tag.empty()) - strprintf(totalname, "%s/%s/%X/%s", module, tag.c_str(), index, name); + if (tag != nullptr) + strprintf(totalname, "%s/%s/%X/%s", module, tag, index, name); else strprintf(totalname, "%s/%X/%s", module, index, name); @@ -182,7 +182,7 @@ void save_manager::save_memory(device_t *device, const char *module, std::string } // insert us into the list - m_entry_list.insert_after(*global_alloc(state_entry(val, totalname.c_str(), device, module, tag, index, valsize, valcount)), insert_after); + m_entry_list.insert_after(*global_alloc(state_entry(val, totalname.c_str(), device, module, tag ? tag : "", index, valsize, valcount)), insert_after); } @@ -418,7 +418,7 @@ save_manager::state_callback::state_callback(save_prepost_delegate callback) // state_entry - constructor //------------------------------------------------- -state_entry::state_entry(void *data, const char *name, device_t *device, const char *module, std::string tag, int index, UINT8 size, UINT32 count) +state_entry::state_entry(void *data, const char *name, device_t *device, const char *module, const char *tag, int index, UINT8 size, UINT32 count) : m_next(nullptr), m_data(data), m_name(name), diff --git a/src/emu/save.h b/src/emu/save.h index e461749102b..b4c2c3c2186 100644 --- a/src/emu/save.h +++ b/src/emu/save.h @@ -51,7 +51,7 @@ typedef delegate save_prepost_delegate; // use this as above, but also to declare that std::vector is safe as well #define ALLOW_SAVE_TYPE_AND_ARRAY(TYPE) \ ALLOW_SAVE_TYPE(TYPE); \ - template<> inline void save_manager::save_item(device_t *device, const char *module, std::string tag, int index, std::vector &value, const char *name) { save_memory(device, module, tag, index, name, &value[0], sizeof(TYPE), value.size()); } + template<> inline void save_manager::save_item(device_t *device, const char *module, const char *tag, int index, std::vector &value, const char *name) { save_memory(device, module, tag, index, name, &value[0], sizeof(TYPE), value.size()); } //************************************************************************** @@ -62,7 +62,7 @@ class state_entry { public: // construction/destruction - state_entry(void *data, const char *name, device_t *device, const char *module, std::string tag, int index, UINT8 size, UINT32 count); + state_entry(void *data, const char *name, device_t *device, const char *module, const char *tag, int index, UINT8 size, UINT32 count); // getters state_entry *next() const { return m_next; } @@ -111,11 +111,11 @@ public: void dispatch_postload(); // generic memory registration - void save_memory(device_t *device, const char *module, std::string tag, UINT32 index, const char *name, void *val, UINT32 valsize, UINT32 valcount = 1); + void save_memory(device_t *device, const char *module, const char *tag, UINT32 index, const char *name, void *val, UINT32 valsize, UINT32 valcount = 1); // templatized wrapper for general objects template - void save_item(device_t *device, const char *module, std::string tag, int index, _ItemType &value, const char *valname) + void save_item(device_t *device, const char *module, const char *tag, int index, _ItemType &value, const char *valname) { if (type_checker<_ItemType>::is_pointer) throw emu_fatalerror("Called save_item on a pointer with no count!"); if (!type_checker<_ItemType>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); @@ -124,7 +124,7 @@ public: // templatized wrapper for 1-dimensional arrays template - void save_item(device_t *device, const char *module, std::string tag, int index, _ItemType (&value)[N], const char *valname) + void save_item(device_t *device, const char *module, const char *tag, int index, _ItemType (&value)[N], const char *valname) { if (!type_checker<_ItemType>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); save_memory(device, module, tag, index, valname, &value[0], sizeof(value[0]), N); @@ -132,7 +132,7 @@ public: // templatized wrapper for 2-dimensional arrays template - void save_item(device_t *device, const char *module, std::string tag, int index, _ItemType (&value)[M][N], const char *valname) + void save_item(device_t *device, const char *module, const char *tag, int index, _ItemType (&value)[M][N], const char *valname) { if (!type_checker<_ItemType>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); save_memory(device, module, tag, index, valname, &value[0][0], sizeof(value[0][0]), M * N); @@ -140,7 +140,7 @@ public: // templatized wrapper for pointers template - void save_pointer(device_t *device, const char *module, std::string tag, int index, _ItemType *value, const char *valname, UINT32 count) + void save_pointer(device_t *device, const char *module, const char *tag, int index, _ItemType *value, const char *valname, UINT32 count) { if (!type_checker<_ItemType>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); save_memory(device, module, tag, index, valname, value, sizeof(*value), count); @@ -148,9 +148,9 @@ public: // global memory registration template - void save_item(_ItemType &value, const char *valname, int index = 0) { save_item(nullptr, "global", std::string(), index, value, valname); } + void save_item(_ItemType &value, const char *valname, int index = 0) { save_item(nullptr, "global", nullptr, index, value, valname); } template - void save_pointer(_ItemType *value, const char *valname, UINT32 count, int index = 0) { save_pointer(nullptr, "global", std::string(), index, value, valname, count); } + void save_pointer(_ItemType *value, const char *valname, UINT32 count, int index = 0) { save_pointer(nullptr, "global", nullptr, index, value, valname, count); } // file processing static save_error check_file(running_machine &machine, emu_file &file, const char *gamename, void (CLIB_DECL *errormsg)(const char *fmt, ...)); @@ -218,25 +218,25 @@ ALLOW_SAVE_TYPE_AND_ARRAY(rgb_t) //------------------------------------------------- template<> -inline void save_manager::save_item(device_t *device, const char *module, std::string tag, int index, bitmap_ind8 &value, const char *name) +inline void save_manager::save_item(device_t *device, const char *module, const char *tag, int index, bitmap_ind8 &value, const char *name) { save_memory(device, module, tag, index, name, &value.pix(0), value.bpp() / 8, value.rowpixels() * value.height()); } template<> -inline void save_manager::save_item(device_t *device, const char *module, std::string tag, int index, bitmap_ind16 &value, const char *name) +inline void save_manager::save_item(device_t *device, const char *module, const char *tag, int index, bitmap_ind16 &value, const char *name) { save_memory(device, module, tag, index, name, &value.pix(0), value.bpp() / 8, value.rowpixels() * value.height()); } template<> -inline void save_manager::save_item(device_t *device, const char *module, std::string tag, int index, bitmap_ind32 &value, const char *name) +inline void save_manager::save_item(device_t *device, const char *module, const char *tag, int index, bitmap_ind32 &value, const char *name) { save_memory(device, module, tag, index, name, &value.pix(0), value.bpp() / 8, value.rowpixels() * value.height()); } template<> -inline void save_manager::save_item(device_t *device, const char *module, std::string tag, int index, bitmap_rgb32 &value, const char *name) +inline void save_manager::save_item(device_t *device, const char *module, const char *tag, int index, bitmap_rgb32 &value, const char *name) { save_memory(device, module, tag, index, name, &value.pix(0), value.bpp() / 8, value.rowpixels() * value.height()); } @@ -247,7 +247,7 @@ inline void save_manager::save_item(device_t *device, const char *module, std::s //------------------------------------------------- template<> -inline void save_manager::save_item(device_t *device, const char *module, std::string tag, int index, attotime &value, const char *name) +inline void save_manager::save_item(device_t *device, const char *module, const char *tag, int index, attotime &value, const char *name) { std::string tempstr = std::string(name).append(".attoseconds"); save_memory(device, module, tag, index, tempstr.c_str(), &value.m_attoseconds, sizeof(value.m_attoseconds)); diff --git a/src/emu/schedule.cpp b/src/emu/schedule.cpp index 9437149708b..925364aab07 100644 --- a/src/emu/schedule.cpp +++ b/src/emu/schedule.cpp @@ -252,7 +252,7 @@ void emu_timer::register_save() // for device timers, it is an index based on the device and timer ID else { - strprintf(name,"%s/%d", m_device->tag().c_str(), m_id); + strprintf(name,"%s/%d", m_device->tag(), m_id); for (emu_timer *curtimer = machine().scheduler().first_timer(); curtimer != nullptr; curtimer = curtimer->next()) if (!curtimer->m_temporary && curtimer->m_device != nullptr && curtimer->m_device == m_device && curtimer->m_id == m_id) index++; @@ -296,7 +296,7 @@ void emu_timer::dump() const if (m_device == nullptr) machine().logerror(" cb=%s\n", m_callback.name()); else - machine().logerror(" dev=%s id=%d\n", m_device->tag().c_str(), m_id); + machine().logerror(" dev=%s id=%d\n", m_device->tag(), m_id); } @@ -457,7 +457,7 @@ void device_scheduler::timeslice() { // compute how many cycles we want to execute int ran = exec->m_cycles_running = divu_64x32((UINT64)delta >> exec->m_divshift, exec->m_divisor); - LOG((" cpu '%s': %" I64FMT"d (%d cycles)\n", exec->device().tag().c_str(), delta, exec->m_cycles_running)); + LOG((" cpu '%s': %" I64FMT"d (%d cycles)\n", exec->device().tag(), delta, exec->m_cycles_running)); // if we're not suspended, actually execute if (exec->m_suspend == 0) @@ -895,7 +895,7 @@ inline void device_scheduler::execute_timers() if (timer.m_device != nullptr) { - LOG(("execute_timers: timer device %s timer %d\n", timer.m_device->tag().c_str(), timer.m_id)); + LOG(("execute_timers: timer device %s timer %d\n", timer.m_device->tag(), timer.m_id)); timer.m_device->timer_expired(timer, timer.m_id, timer.m_param, timer.m_ptr); } else if (!timer.m_callback.isnull()) diff --git a/src/emu/screen.cpp b/src/emu/screen.cpp index fc33c2e342f..2ae1269cdd8 100644 --- a/src/emu/screen.cpp +++ b/src/emu/screen.cpp @@ -43,7 +43,7 @@ UINT32 screen_device::m_id_counter = 0; // screen_device - constructor //------------------------------------------------- -screen_device::screen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +screen_device::screen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SCREEN, "Video Screen", tag, owner, clock, "screen", __FILE__), m_type(SCREEN_TYPE_RASTER), m_oldstyle_vblank_supplied(false), @@ -224,7 +224,7 @@ void screen_device::static_set_screen_vblank(device_t &device, screen_vblank_del // configuration //------------------------------------------------- -void screen_device::static_set_palette(device_t &device, std::string tag) +void screen_device::static_set_palette(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } @@ -481,7 +481,7 @@ void screen_device::configure(int width, int height, const rectangle &visarea, a if (m_oldstyle_vblank_supplied) { m_vblank_period = m_vblank; - logerror("%s: Deprecated legacy Old Style screen configured (MCFG_SCREEN_VBLANK_TIME), please use MCFG_SCREEN_RAW_PARAMS instead.\n",this->tag().c_str()); + logerror("%s: Deprecated legacy Old Style screen configured (MCFG_SCREEN_VBLANK_TIME), please use MCFG_SCREEN_RAW_PARAMS instead.\n",this->tag()); } else m_vblank_period = m_scantime * (height - visarea.height()); @@ -590,7 +590,7 @@ bool screen_device::update_partial(int scanline) // validate arguments assert(scanline >= 0); - LOG_PARTIAL_UPDATES(("Partial: update_partial(%s, %d): ", tag().c_str(), scanline)); + LOG_PARTIAL_UPDATES(("Partial: update_partial(%s, %d): ", tag(), scanline)); // these two checks only apply if we're allowed to skip frames if (!(m_video_attributes & VIDEO_ALWAYS_UPDATE)) @@ -1140,7 +1140,7 @@ void screen_device::finalize_burnin() // compute the name and create the file emu_file file(machine().options().snapshot_directory(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS); - file_error filerr = file.open(machine().basename(), PATH_SEPARATOR "burnin-", this->tag().c_str() + 1, ".png") ; + file_error filerr = file.open(machine().basename(), PATH_SEPARATOR "burnin-", this->tag()+1, ".png") ; if (filerr == FILERR_NONE) { png_info pnginfo = { nullptr }; diff --git a/src/emu/screen.h b/src/emu/screen.h index c8d1520db0d..31487c7d4ea 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -161,7 +161,7 @@ class screen_device : public device_t public: // construction/destruction - screen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + screen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~screen_device(); // configuration readers @@ -191,7 +191,7 @@ public: static void static_set_screen_update(device_t &device, screen_update_ind16_delegate callback); static void static_set_screen_update(device_t &device, screen_update_rgb32_delegate callback); static void static_set_screen_vblank(device_t &device, screen_vblank_delegate callback); - static void static_set_palette(device_t &device, std::string tag); + static void static_set_palette(device_t &device, const char *tag); static void static_set_video_attributes(device_t &device, UINT32 flags); // information getters diff --git a/src/emu/softlist.cpp b/src/emu/softlist.cpp index 0f2973de6e6..6631fa82124 100644 --- a/src/emu/softlist.cpp +++ b/src/emu/softlist.cpp @@ -273,7 +273,7 @@ bool software_info::has_multiple_parts(const char *interface) const // software_list_device - constructor //------------------------------------------------- -software_list_device::software_list_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +software_list_device::software_list_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SOFTWARE_LIST, "Software list", tag, owner, clock, "software_list", __FILE__), m_list_type(SOFTWARE_LIST_ORIGINAL_SYSTEM), m_filter(nullptr), diff --git a/src/emu/softlist.h b/src/emu/softlist.h index 59ac3571556..63ce6f0da20 100644 --- a/src/emu/softlist.h +++ b/src/emu/softlist.h @@ -187,7 +187,7 @@ class software_list_device : public device_t public: // construction/destruction - software_list_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + software_list_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers static void static_set_type(device_t &device, const char *list, softlist_type list_type); diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp index bf0aa97826e..1b007a303ea 100644 --- a/src/emu/sound.cpp +++ b/src/emu/sound.cpp @@ -167,13 +167,13 @@ const char *sound_stream::input_name(int inputnum, std::string &str) const { // start with our device name and tag assert(inputnum >= 0 && inputnum < m_input.size()); - strprintf(str, "%s '%s': ", m_device.name(), m_device.tag().c_str()); + strprintf(str, "%s '%s': ", m_device.name(), m_device.tag()); // if we have a source, indicate where the sound comes from by device name and tag if (m_input[inputnum].m_source != nullptr && m_input[inputnum].m_source->m_stream != nullptr) { device_t &source = m_input[inputnum].m_source->m_stream->device(); - strcatprintf(str, "%s '%s'", source.name(), source.tag().c_str()); + strcatprintf(str, "%s '%s'", source.name(), source.tag()); // get the sound interface; if there is more than 1 output we need to figure out which one device_sound_interface *sound; @@ -225,7 +225,7 @@ int sound_stream::input_source_outputnum(int inputnum) const void sound_stream::set_input(int index, sound_stream *input_stream, int output_index, float gain) { - VPRINTF(("stream_set_input(%p, '%s', %d, %p, %d, %f)\n", (void *)this, m_device.tag().c_str(), + VPRINTF(("stream_set_input(%p, '%s', %d, %p, %d, %f)\n", (void *)this, m_device.tag(), index, (void *)input_stream, output_index, (double) gain)); // make sure it's a valid input diff --git a/src/emu/speaker.cpp b/src/emu/speaker.cpp index 8b31d10064f..485a6be73ca 100644 --- a/src/emu/speaker.cpp +++ b/src/emu/speaker.cpp @@ -39,7 +39,7 @@ const device_type SPEAKER = &device_creator; // speaker_device - constructor //------------------------------------------------- -speaker_device::speaker_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +speaker_device::speaker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SPEAKER, "Speaker", tag, owner, clock, "speaker", __FILE__), device_mixer_interface(mconfig, *this), m_x(0.0), @@ -64,7 +64,7 @@ speaker_device::~speaker_device() #ifdef MAME_DEBUG // log the maximum sample values for all speakers if (m_max_sample > 0) - osd_printf_debug("Speaker \"%s\" - max = %d (gain *= %f) - %d%% samples clipped\n", tag().c_str(), m_max_sample, 32767.0 / (m_max_sample ? m_max_sample : 1), (int)((double)m_clipped_samples * 100.0 / m_total_samples)); + osd_printf_debug("Speaker \"%s\" - max = %d (gain *= %f) - %d%% samples clipped\n", tag(), m_max_sample, 32767.0 / (m_max_sample ? m_max_sample : 1), (int)((double)m_clipped_samples * 100.0 / m_total_samples)); #endif } diff --git a/src/emu/speaker.h b/src/emu/speaker.h index c9759b208e3..dc814a26911 100644 --- a/src/emu/speaker.h +++ b/src/emu/speaker.h @@ -57,7 +57,7 @@ class speaker_device : public device_t, public: // construction/destruction - speaker_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + speaker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~speaker_device(); // inline configuration helpers diff --git a/src/emu/sprite.h b/src/emu/sprite.h index 81f5b8e4b1c..f10537f9900 100644 --- a/src/emu/sprite.h +++ b/src/emu/sprite.h @@ -85,7 +85,7 @@ class sprite_device : public device_t protected: // construction/destruction - only for subclasses - sprite_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file, int dirty_granularity = 3) + sprite_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file, int dirty_granularity = 3) : device_t(mconfig, type, name, tag, owner, 0, shortname, file), m_xorigin(0), m_yorigin(0), diff --git a/src/emu/tilemap.cpp b/src/emu/tilemap.cpp index 2a8d8ae7f73..2c7334bb068 100644 --- a/src/emu/tilemap.cpp +++ b/src/emu/tilemap.cpp @@ -409,17 +409,17 @@ tilemap_t &tilemap_t::init(tilemap_manager &manager, device_gfx_interface &decod // save relevant state int instance = manager.alloc_instance(); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_enable)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_attributes)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_palette_offset)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_scrollrows)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_scrollcols)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_rowscroll)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_colscroll)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_dx)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_dx_flipped)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_dy)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_dy_flipped)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_enable)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_attributes)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_palette_offset)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_scrollrows)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_scrollcols)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_rowscroll)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_colscroll)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_dx)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_dx_flipped)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_dy)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_dy_flipped)); // reset everything after a load machine().save().register_postload(save_prepost_delegate(FUNC(tilemap_t::postload), this)); @@ -1586,7 +1586,7 @@ const device_type TILEMAP = &device_creator; // tilemap_device - constructor //------------------------------------------------- -tilemap_device::tilemap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tilemap_device::tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TILEMAP, "Tilemap", tag, owner, clock, "tilemap", __FILE__), m_gfxdecode(*this), m_standard_mapper(TILEMAP_STANDARD_COUNT), @@ -1606,7 +1606,7 @@ tilemap_device::tilemap_device(const machine_config &mconfig, std::string tag, d // gfx decoder //------------------------------------------------- -void tilemap_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void tilemap_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -1764,9 +1764,9 @@ void tilemap_device::device_start() { // check configuration if (m_get_info.isnull()) - throw emu_fatalerror("Tilemap device '%s' has no get info callback!", tag().c_str()); + throw emu_fatalerror("Tilemap device '%s' has no get info callback!", tag()); if (m_standard_mapper == TILEMAP_STANDARD_COUNT && m_mapper.isnull()) - throw emu_fatalerror("Tilemap device '%s' has no mapper callback!", tag().c_str()); + throw emu_fatalerror("Tilemap device '%s' has no mapper callback!", tag()); if(!m_gfxdecode->started()) throw device_missing_dependencies(); diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h index ebba7666deb..aaba8818d53 100644 --- a/src/emu/tilemap.h +++ b/src/emu/tilemap.h @@ -724,10 +724,10 @@ class tilemap_device : public device_t, { public: // construction/destruction - tilemap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void static_set_bytes_per_entry(device_t &device, int bpe); static void static_set_info_callback(device_t &device, tilemap_get_info_delegate tile_get_info); static void static_set_layout(device_t &device, tilemap_standard_mapper mapper, int columns, int rows); diff --git a/src/emu/timer.cpp b/src/emu/timer.cpp index da5ea876c68..605a16a7d4f 100644 --- a/src/emu/timer.cpp +++ b/src/emu/timer.cpp @@ -32,7 +32,7 @@ const device_type TIMER = &device_creator; // timer_device - constructor //------------------------------------------------- -timer_device::timer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +timer_device::timer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TIMER, "Timer", tag, owner, clock, "timer", __FILE__), m_type(TIMER_TYPE_GENERIC), m_callback(timer_device_expired_delegate()), @@ -40,6 +40,7 @@ timer_device::timer_device(const machine_config &mconfig, std::string tag, devic m_start_delay(attotime::zero), m_period(attotime::zero), m_param(0), + m_screen_tag(nullptr), m_screen(nullptr), m_first_vpos(0), m_increment(0), @@ -81,7 +82,7 @@ void timer_device::static_configure_periodic(device_t &device, timer_device_expi // helper to set up a scanline timer //------------------------------------------------- -void timer_device::static_configure_scanline(device_t &device, timer_device_expired_delegate callback, std::string screen, int first_vpos, int increment) +void timer_device::static_configure_scanline(device_t &device, timer_device_expired_delegate callback, const char *screen, int first_vpos, int increment) { timer_device &timer = downcast(device); timer.m_type = TIMER_TYPE_SCANLINE; @@ -151,14 +152,14 @@ void timer_device::device_validity_check(validity_checker &valid) const switch (m_type) { case TIMER_TYPE_GENERIC: - if (!m_screen_tag.empty() || m_first_vpos != 0 || m_start_delay != attotime::zero) + if (m_screen_tag != nullptr || m_first_vpos != 0 || m_start_delay != attotime::zero) osd_printf_warning("Generic timer specified parameters for a scanline timer\n"); if (m_period != attotime::zero || m_start_delay != attotime::zero) osd_printf_warning("Generic timer specified parameters for a periodic timer\n"); break; case TIMER_TYPE_PERIODIC: - if (!m_screen_tag.empty() || m_first_vpos != 0) + if (m_screen_tag != nullptr || m_first_vpos != 0) osd_printf_warning("Periodic timer specified parameters for a scanline timer\n"); if (m_period <= attotime::zero) osd_printf_error("Periodic timer specified invalid period\n"); @@ -190,7 +191,7 @@ void timer_device::device_validity_check(validity_checker &valid) const void timer_device::device_start() { // fetch the screen - if (!m_screen_tag.empty()) + if (m_screen_tag != nullptr) m_screen = machine().device(m_screen_tag); // allocate the timer @@ -234,7 +235,7 @@ void timer_device::device_reset() case TIMER_TYPE_SCANLINE: if (m_screen == nullptr) - fatalerror("timer '%s': unable to find screen '%s'\n", tag().c_str(), m_screen_tag.c_str()); + fatalerror("timer '%s': unable to find screen '%s'\n", tag(), m_screen_tag); // set the timer to fire immediately m_first_time = true; diff --git a/src/emu/timer.h b/src/emu/timer.h index 6faa51318ec..55db37c267b 100644 --- a/src/emu/timer.h +++ b/src/emu/timer.h @@ -81,12 +81,12 @@ class timer_device : public device_t { public: // construction/destruction - timer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + timer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers static void static_configure_generic(device_t &device, timer_device_expired_delegate callback); static void static_configure_periodic(device_t &device, timer_device_expired_delegate callback, const attotime &period); - static void static_configure_scanline(device_t &device, timer_device_expired_delegate callback, std::string screen, int first_vpos, int increment); + static void static_configure_scanline(device_t &device, timer_device_expired_delegate callback, const char *screen, int first_vpos, int increment); static void static_set_callback(device_t &device, timer_device_expired_delegate callback); static void static_set_start_delay(device_t &device, const attotime &delay); static void static_set_param(device_t &device, int param); @@ -138,7 +138,7 @@ private: INT32 m_param; // the integer parameter passed to the timer callback // scanline timers only - std::string m_screen_tag; // the tag of the screen this timer tracks + const char * m_screen_tag; // the tag of the screen this timer tracks screen_device * m_screen; // pointer to the screen device UINT32 m_first_vpos; // the first vertical scanline position the timer fires on UINT32 m_increment; // the number of scanlines between firings diff --git a/src/emu/ui/devopt.cpp b/src/emu/ui/devopt.cpp index 18b73c6dce6..3d217e92025 100644 --- a/src/emu/ui/devopt.cpp +++ b/src/emu/ui/devopt.cpp @@ -29,7 +29,7 @@ ui_menu_device_config::ui_menu_device_config(running_machine &machine, render_co device_iterator deviter(machine.config().root_device()); for (device_t *device = deviter.first(); device != nullptr; device = deviter.next()) { - if (device->tag() == tmp_tag) + if (strcmp(device->tag(), tmp_tag.c_str()) == 0) { m_mounted = true; break; @@ -100,7 +100,7 @@ void ui_menu_device_config::populate() str.append("* Video:\n"); for (screen_device *screen = scriter.first(); screen != nullptr; screen = scriter.next()) { - strcatprintf(str," Screen '%s': ", screen->tag().c_str()); + strcatprintf(str," Screen '%s': ", screen->tag()); if (screen->screen_type() == SCREEN_TYPE_VECTOR) str.append("Vector\n"); @@ -263,7 +263,7 @@ void ui_menu_device_config::populate() { str.append("* Media Options:\n"); for (const device_image_interface *imagedev = imgiter.first(); imagedev != nullptr; imagedev = imgiter.next()) - strcatprintf(str," %s [tag: %s]\n", imagedev->image_type_name(), imagedev->device().tag().c_str()); + strcatprintf(str," %s [tag: %s]\n", imagedev->image_type_name(), imagedev->device().tag()); } slot_interface_iterator slotiter(*dev); @@ -271,7 +271,7 @@ void ui_menu_device_config::populate() { str.append("* Slot Options:\n"); for (const device_slot_interface *slot = slotiter.first(); slot != nullptr; slot = slotiter.next()) - strcatprintf(str," %s [default: %s]\n", slot->device().tag().c_str(), slot->default_option() ? slot->default_option() : "----"); + strcatprintf(str," %s [default: %s]\n", slot->device().tag(), slot->default_option() ? slot->default_option() : "----"); } if ((execiter.count() + scriter.count() + snditer.count() + imgiter.count() + slotiter.count() + bios + dips + confs diff --git a/src/emu/ui/filemngr.cpp b/src/emu/ui/filemngr.cpp index de32d25d2db..d277d0bd847 100644 --- a/src/emu/ui/filemngr.cpp +++ b/src/emu/ui/filemngr.cpp @@ -130,7 +130,7 @@ void ui_menu_file_manager::populate() for (device_image_interface *scan = subiterator.first(); scan != nullptr; scan = subiterator.next()) { // if it is a children device, and not something further down the device tree, we want it in the menu! - if (scan->device().owner()->tag() == dev->tag()) + if (strcmp(scan->device().owner()->tag(), dev->tag()) == 0) if (devtags.insert(scan->device().tag()).second) { // check whether we already had some devices with the same owner: if not, output the owner tag! @@ -140,7 +140,7 @@ void ui_menu_file_manager::populate() first_entry = false; else item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); - strprintf(buffer, "[root%s]", dev->tag().c_str()); + strprintf(buffer, "[root%s]", dev->tag()); item_append(buffer.c_str(), nullptr, 0, nullptr); tag_appended = true; } diff --git a/src/emu/ui/info_pty.cpp b/src/emu/ui/info_pty.cpp index 9d2710c82e0..e0e44fa7833 100644 --- a/src/emu/ui/info_pty.cpp +++ b/src/emu/ui/info_pty.cpp @@ -28,7 +28,7 @@ void ui_menu_pty_info::populate() pty_interface_iterator iter(machine().root_device()); for (device_pty_interface *pty = iter.first(); pty != nullptr; pty = iter.next()) { - const char *port_name = pty->device().owner()->tag().c_str() + 1; + const char *port_name = pty->device().owner()->tag() + 1; if (pty->is_open()) { item_append(port_name , pty->slave_name() , MENU_FLAG_DISABLE , nullptr); } else { diff --git a/src/emu/ui/inputmap.cpp b/src/emu/ui/inputmap.cpp index 1778591400a..1fc0d046e1f 100644 --- a/src/emu/ui/inputmap.cpp +++ b/src/emu/ui/inputmap.cpp @@ -180,7 +180,7 @@ void ui_menu_input_specific::populate() if (field->type() >= IPT_START1 && field->type() < IPT_ANALOG_LAST) { sortorder = (field->type() << 2) | (field->player() << 12); - if (field->device().tag()!=":") + if (strcmp(field->device().tag(), ":")) sortorder |= (port_count & 0xfff) * 0x10000; } else @@ -201,7 +201,7 @@ void ui_menu_input_specific::populate() item->sortorder = sortorder + suborder[seqtype]; item->type = field->is_analog() ? (INPUT_TYPE_ANALOG + seqtype) : INPUT_TYPE_DIGITAL; item->name = name; - item->owner_name = field->device().tag().c_str(); + item->owner_name = field->device().tag(); item->next = itemlist; itemlist = item; @@ -565,13 +565,13 @@ void ui_menu_settings::populate() flags |= MENU_FLAG_RIGHT_ARROW; /* add the menu item */ - if (field->device().tag()!=prev_owner) + if (strcmp(field->device().tag(), prev_owner.c_str()) != 0) { if (first_entry) first_entry = false; else item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); - strprintf(name, "[root%s]", field->device().tag().c_str()); + strprintf(name, "[root%s]", field->device().tag()); item_append(name.c_str(), nullptr, 0, nullptr); prev_owner.assign(field->device().tag()); } @@ -869,13 +869,13 @@ void ui_menu_analog::populate() analog_item_data *data; UINT32 flags = 0; std::string name; - if (field->device().tag() != prev_owner.c_str()) + if (strcmp(field->device().tag(), prev_owner.c_str()) != 0) { if (first_entry) first_entry = false; else item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); - strprintf(name,"[root%s]", field->device().tag().c_str()); + strprintf(name,"[root%s]", field->device().tag()); item_append(name.c_str(), nullptr, 0, nullptr); prev_owner.assign(field->device().tag()); } diff --git a/src/emu/ui/miscmenu.cpp b/src/emu/ui/miscmenu.cpp index e9b095e97f3..1eaa9fe1366 100644 --- a/src/emu/ui/miscmenu.cpp +++ b/src/emu/ui/miscmenu.cpp @@ -81,7 +81,7 @@ void ui_menu_bios_selection::populate() val = ROM_GETHASHDATA(rom); } } - item_append(device->tag()==":" ? "driver" : device->tag().c_str()+1, val, MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW, (void *)device); + item_append(strcmp(device->tag(),":")==0 ? "driver" : device->tag()+1, val, MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW, (void *)device); } } @@ -118,15 +118,15 @@ void ui_menu_bios_selection::handle() if (val<1) val=cnt; if (val>cnt) val=1; dev->set_system_bios(val); - if (dev->tag()!=":") { + if (strcmp(dev->tag(),":")==0) { std::string error; machine().options().set_value("bios", val-1, OPTION_PRIORITY_CMDLINE, error); assert(error.empty()); } else { std::string error; - std::string value = machine().options().main_value(dev->owner()->tag().c_str()+1); + std::string value = machine().options().main_value(dev->owner()->tag()+1); strcatprintf(value,",bios=%d",val-1); - machine().options().set_value(dev->owner()->tag().c_str()+1, value.c_str(), OPTION_PRIORITY_CMDLINE, error); + machine().options().set_value(dev->owner()->tag()+1, value.c_str(), OPTION_PRIORITY_CMDLINE, error); assert(error.empty()); } reset(UI_MENU_RESET_REMEMBER_REF); @@ -166,7 +166,7 @@ void ui_menu_network_devices::populate() entry = entry->m_next; } - item_append(network->device().tag().c_str(), (title) ? title : "------", MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW, (void *)network); + item_append(network->device().tag(), (title) ? title : "------", MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW, (void *)network); } } diff --git a/src/emu/ui/slotopt.cpp b/src/emu/ui/slotopt.cpp index 7dd12a302a1..cce17353532 100644 --- a/src/emu/ui/slotopt.cpp +++ b/src/emu/ui/slotopt.cpp @@ -29,7 +29,7 @@ device_slot_option *ui_menu_slot_devices::slot_get_current_option(device_slot_in } else { - current = machine().options().main_value(slot->device().tag().c_str() + 1); + current = machine().options().main_value(slot->device().tag() + 1); } return slot->option(current.c_str()); @@ -135,7 +135,7 @@ const char *ui_menu_slot_devices::slot_get_option(device_slot_interface *slot, i void ui_menu_slot_devices::set_slot_device(device_slot_interface *slot, const char *val) { std::string error; - machine().options().set_value(slot->device().tag().c_str()+1, val, OPTION_PRIORITY_CMDLINE, error); + machine().options().set_value(slot->device().tag()+1, val, OPTION_PRIORITY_CMDLINE, error); assert(error.empty()); } @@ -166,7 +166,7 @@ void ui_menu_slot_devices::populate() opt_name.append(" [internal]"); } - item_append(slot->device().tag().c_str() + 1, opt_name.c_str(), (slot->fixed() || slot_get_length(slot) == 0) ? 0 : (MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW), (void *)slot); + item_append(slot->device().tag() + 1, opt_name.c_str(), (slot->fixed() || slot_get_length(slot) == 0) ? 0 : (MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW), (void *)slot); } item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); item_append("Reset", nullptr, 0, (void *)1); diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp index 989905ba550..0048936ea20 100644 --- a/src/emu/ui/ui.cpp +++ b/src/emu/ui/ui.cpp @@ -1879,7 +1879,7 @@ static slider_state *slider_init(running_machine &machine) for (device_execute_interface *exec = iter.first(); exec != nullptr; exec = iter.next()) { void *param = (void *)&exec->device(); - strprintf(str, "Overclock CPU %s", exec->device().tag().c_str()); + strprintf(str, "Overclock CPU %s", exec->device().tag()); *tailptr = slider_alloc(machine, str.c_str(), 10, 1000, 2000, 1, slider_overclock, param); tailptr = &(*tailptr)->next; } @@ -1942,16 +1942,16 @@ static slider_state *slider_init(running_machine &machine) void *param = (void *)laserdisc; // add scale and offset controls per-overlay - strprintf(str,"Laserdisc '%s' Horiz Stretch", laserdisc->tag().c_str()); + strprintf(str,"Laserdisc '%s' Horiz Stretch", laserdisc->tag()); *tailptr = slider_alloc(machine, str.c_str(), 500, (defxscale == 0) ? 1000 : defxscale, 1500, 2, slider_overxscale, param); tailptr = &(*tailptr)->next; - strprintf(str,"Laserdisc '%s' Horiz Position", laserdisc->tag().c_str()); + strprintf(str,"Laserdisc '%s' Horiz Position", laserdisc->tag()); *tailptr = slider_alloc(machine, str.c_str(), -500, defxoffset, 500, 2, slider_overxoffset, param); tailptr = &(*tailptr)->next; - strprintf(str,"Laserdisc '%s' Vert Stretch", laserdisc->tag().c_str()); + strprintf(str,"Laserdisc '%s' Vert Stretch", laserdisc->tag()); *tailptr = slider_alloc(machine, str.c_str(), 500, (defyscale == 0) ? 1000 : defyscale, 1500, 2, slider_overyscale, param); tailptr = &(*tailptr)->next; - strprintf(str,"Laserdisc '%s' Vert Position", laserdisc->tag().c_str()); + strprintf(str,"Laserdisc '%s' Vert Position", laserdisc->tag()); *tailptr = slider_alloc(machine, str.c_str(), -500, defyoffset, 500, 2, slider_overyoffset, param); tailptr = &(*tailptr)->next; } @@ -2406,7 +2406,7 @@ static char *slider_get_screen_desc(screen_device &screen) static char descbuf[256]; if (scrcount > 1) - sprintf(descbuf, "Screen '%s'", screen.tag().c_str()); + sprintf(descbuf, "Screen '%s'", screen.tag()); else strcpy(descbuf, "Screen"); diff --git a/src/emu/ui/viewgfx.cpp b/src/emu/ui/viewgfx.cpp index b334ed324d5..74d21da7585 100644 --- a/src/emu/ui/viewgfx.cpp +++ b/src/emu/ui/viewgfx.cpp @@ -389,7 +389,7 @@ static void palette_handler(running_machine &machine, render_container *containe // figure out the title and expand the outer box to fit const char *suffix = palette->indirect_entries() == 0 ? "" : state.palette.which ? " COLORS" : " PENS"; - sprintf(title, "'%s'%s", palette->tag().c_str(), suffix); + sprintf(title, "'%s'%s", palette->tag(), suffix); titlewidth = ui_font->string_width(chheight, machine.render().ui_aspect(), title); x0 = 0.0f; if (boxbounds.x1 - boxbounds.x0 < titlewidth + chwidth) @@ -649,7 +649,7 @@ static void gfxset_handler(running_machine &machine, render_container *container // figure out the title and expand the outer box to fit sprintf(title, "'%s' %d/%d %dx%d COLOR %X", - interface.device().tag().c_str(), + interface.device().tag(), set, info.setcount - 1, gfx.width(), gfx.height(), info.color[set]); diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp index 23aba1dfd04..f1d685e7cd3 100644 --- a/src/emu/validity.cpp +++ b/src/emu/validity.cpp @@ -852,7 +852,7 @@ void validity_checker::validate_condition(ioport_condition &condition, device_t // resolve the tag // then find a matching port if (port_map.find(device.subtag(condition.tag())) == port_map.end()) - osd_printf_error("Condition referencing non-existent ioport tag '%s'\n", condition.tag().c_str()); + osd_printf_error("Condition referencing non-existent ioport tag '%s'\n", condition.tag()); } @@ -887,12 +887,12 @@ void validity_checker::validate_inputs() // do a first pass over ports to add their names and find duplicates for (ioport_port *port = portlist.first(); port != nullptr; port = port->next()) if (!port_map.insert(port->tag()).second) - osd_printf_error("Multiple I/O ports with the same tag '%s' defined\n", port->tag().c_str()); + osd_printf_error("Multiple I/O ports with the same tag '%s' defined\n", port->tag()); // iterate over ports for (ioport_port *port = portlist.first(); port != nullptr; port = port->next()) { - m_current_ioport = port->tag().c_str(); + m_current_ioport = port->tag(); // iterate through the fields on this port for (ioport_field *field = port->first_field(); field != nullptr; field = field->next()) @@ -983,7 +983,7 @@ void validity_checker::validate_devices() // look for duplicates if (!device_map.insert(device->tag()).second) - osd_printf_error("Multiple devices with the same tag '%s' defined\n", device->tag().c_str()); + osd_printf_error("Multiple devices with the same tag '%s' defined\n", device->tag()); // all devices must have a shortname if (strcmp(device->shortname(), "") == 0) @@ -1042,7 +1042,7 @@ void validity_checker::build_output_prefix(std::string &str) // if we have a current (non-root) device, indicate that if (m_current_device != nullptr && m_current_device->owner() != nullptr) - str.append(m_current_device->name()).append(" device '").append(m_current_device->tag().c_str()+1).append("': "); + str.append(m_current_device->name()).append(" device '").append(m_current_device->tag()+1).append("': "); // if we have a current port, indicate that as well if (m_current_ioport != nullptr) diff --git a/src/emu/video/vector.cpp b/src/emu/video/vector.cpp index 6ea77d2edb1..36c303eda42 100644 --- a/src/emu/video/vector.cpp +++ b/src/emu/video/vector.cpp @@ -128,7 +128,7 @@ static render_texture *get_vector_texture(float dx, float dy, float intensity) // device type definition const device_type VECTOR = &device_creator; -vector_device::vector_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +vector_device::vector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), m_vector_list(nullptr), @@ -137,7 +137,7 @@ vector_device::vector_device(const machine_config &mconfig, device_type type, co { } -vector_device::vector_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vector_device::vector_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VECTOR, "VECTOR", tag, owner, clock, "vector_device", __FILE__), device_video_interface(mconfig, *this), m_vector_list(nullptr), diff --git a/src/emu/video/vector.h b/src/emu/video/vector.h index f1fb3539708..9ec843b76fe 100644 --- a/src/emu/video/vector.h +++ b/src/emu/video/vector.h @@ -36,8 +36,8 @@ class vector_device : public device_t, public device_video_interface { public: // construction/destruction - vector_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - vector_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + vector_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + vector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void clear_list(); diff --git a/src/ldplayer/ldplayer.cpp b/src/ldplayer/ldplayer.cpp index 010a8cd25c9..bbd309dd0b9 100644 --- a/src/ldplayer/ldplayer.cpp +++ b/src/ldplayer/ldplayer.cpp @@ -73,7 +73,7 @@ class ldplayer_state : public driver_device { public: // construction/destruction - ldplayer_state(const machine_config &mconfig, device_type type, std::string tag) + ldplayer_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_last_controls(0), m_playing(false) { } @@ -142,7 +142,7 @@ class pr8210_state : public ldplayer_state { public: // construction/destruction - pr8210_state(const machine_config &mconfig, device_type type, std::string tag) + pr8210_state(const machine_config &mconfig, device_type type, const char *tag) : ldplayer_state(mconfig, type, tag), m_laserdisc(*this, "laserdisc"), m_command_buffer_in(0), @@ -181,7 +181,7 @@ class ldv1000_state : public ldplayer_state { public: // construction/destruction - ldv1000_state(const machine_config &mconfig, device_type type, std::string tag) + ldv1000_state(const machine_config &mconfig, device_type type, const char *tag) : ldplayer_state(mconfig, type, tag), m_laserdisc(*this, "laserdisc") { } diff --git a/src/lib/formats/mfm_hd.cpp b/src/lib/formats/mfm_hd.cpp index 609dcc12cfb..617ebf2b992 100644 --- a/src/lib/formats/mfm_hd.cpp +++ b/src/lib/formats/mfm_hd.cpp @@ -320,7 +320,7 @@ chd_error mfmhd_generic_format::load(chd_file* chdfile, UINT16* trackimage, int int sec_il_start = (m_param.cylskew * cylinder + m_param.headskew * head) % sectorcount; int delta = (sectorcount + m_param.interleave-1) / m_param.interleave; - if (TRACE_RWTRACK) osd_printf_verbose("%s: Load track (c=%d,h=%d) from CHD, interleave=%d, cylskew=%d, headskew=%d\n", tag().c_str(), cylinder, head, m_param.interleave, m_param.cylskew, m_param.headskew); + if (TRACE_RWTRACK) osd_printf_verbose("%s: Load track (c=%d,h=%d) from CHD, interleave=%d, cylskew=%d, headskew=%d\n", tag(), cylinder, head, m_param.interleave, m_param.cylskew, m_param.headskew); m_lastbit = false; @@ -337,7 +337,7 @@ chd_error mfmhd_generic_format::load(chd_file* chdfile, UINT16* trackimage, int // Gap 1 mfm_encode(trackimage, position, 0x4e, m_param.gap1); - if (TRACE_LAYOUT) osd_printf_verbose("%s: cyl=%d head=%d: sector sequence = ", tag().c_str(), cylinder, head); + if (TRACE_LAYOUT) osd_printf_verbose("%s: cyl=%d head=%d: sector sequence = ", tag(), cylinder, head); sec_number = sec_il_start; for (int sector = 0; sector < sectorcount; sector++) @@ -388,7 +388,7 @@ chd_error mfmhd_generic_format::load(chd_file* chdfile, UINT16* trackimage, int } else { - osd_printf_verbose("%s: Invalid CHS data (%d,%d,%d); not loading from CHD\n", tag().c_str(), cylinder, head, sector); + osd_printf_verbose("%s: Invalid CHS data (%d,%d,%d); not loading from CHD\n", tag(), cylinder, head, sector); } for (int i=0; i < size; i++) @@ -436,7 +436,7 @@ enum chd_error mfmhd_generic_format::save(chd_file* chdfile, UINT16* trackimage, int tracksize, int current_cylinder, int current_head) { - if (TRACE_RWTRACK) osd_printf_verbose("%s: write back (c=%d,h=%d) to CHD\n", tag().c_str(), current_cylinder, current_head); + if (TRACE_RWTRACK) osd_printf_verbose("%s: write back (c=%d,h=%d) to CHD\n", tag(), current_cylinder, current_head); UINT8 buffer[16384]; // for header or sector content @@ -550,7 +550,7 @@ chd_error mfmhd_generic_format::save(chd_file* chdfile, UINT16* trackimage, int case FOUND_A1: crc = ccitt_crc16_one(crc, byte); - // osd_printf_verbose("%s: MFM HD: Byte = %02x, CRC=%04x\n", tag().c_str(), byte, crc); + // osd_printf_verbose("%s: MFM HD: Byte = %02x, CRC=%04x\n", tag(), byte, crc); // Put byte into buffer // but not the data mark and the CRC @@ -576,7 +576,7 @@ chd_error mfmhd_generic_format::save(chd_file* chdfile, UINT16* trackimage, int if (m_param.headerlen == 5) cylinder |= ((buffer[2]&0x70)<<4); else { - osd_printf_verbose("%s: Unexpected header size: %d, cylinder=%d, position=%04x\n", tag().c_str(), m_param.headerlen, cylinder, bytepos); + osd_printf_verbose("%s: Unexpected header size: %d, cylinder=%d, position=%04x\n", tag(), m_param.headerlen, cylinder, bytepos); showtrack(trackimage, tracksize); } @@ -586,17 +586,17 @@ chd_error mfmhd_generic_format::save(chd_file* chdfile, UINT16* trackimage, int if (identexp != ident) { - osd_printf_verbose("%s: Field error; ident = %02x (expected %02x) for sector chs=(%d,%d,%d)\n", tag().c_str(), ident, identexp, cylinder, head, sector); + osd_printf_verbose("%s: Field error; ident = %02x (expected %02x) for sector chs=(%d,%d,%d)\n", tag(), ident, identexp, cylinder, head, sector); } if (cylinder != current_cylinder) { - osd_printf_verbose("%s: Sector header of sector %d defines cylinder = %02x (should be %02x)\n", tag().c_str(), sector, cylinder, current_cylinder); + osd_printf_verbose("%s: Sector header of sector %d defines cylinder = %02x (should be %02x)\n", tag(), sector, cylinder, current_cylinder); } if (head != current_head) { - osd_printf_verbose("%s: Sector header of sector %d defines head = %02x (should be %02x)\n", tag().c_str(), sector, head, current_head); + osd_printf_verbose("%s: Sector header of sector %d defines head = %02x (should be %02x)\n", tag(), sector, head, current_head); } // Check skew @@ -629,7 +629,7 @@ chd_error mfmhd_generic_format::save(chd_file* chdfile, UINT16* trackimage, int } search_header = false; - if (TRACE_DETAIL) osd_printf_verbose("%s: Found sector chs=(%d,%d,%d)\n", tag().c_str(), cylinder, head, sector); + if (TRACE_DETAIL) osd_printf_verbose("%s: Found sector chs=(%d,%d,%d)\n", tag(), cylinder, head, sector); headerpos = pos; // Start the GAP2 counter (if not already determined) if (m_param.gap2==0) countgap2 = true; @@ -641,17 +641,17 @@ chd_error mfmhd_generic_format::save(chd_file* chdfile, UINT16* trackimage, int int lbaposition = chs_to_lba(cylinder, head, sector); if (lbaposition>=0) { - if (TRACE_DETAIL) osd_printf_verbose("%s: Writing sector chs=(%d,%d,%d) to CHD\n", tag().c_str(), current_cylinder, current_head, sector); + if (TRACE_DETAIL) osd_printf_verbose("%s: Writing sector chs=(%d,%d,%d) to CHD\n", tag(), current_cylinder, current_head, sector); chdstate = chdfile->write_units(chs_to_lba(current_cylinder, current_head, sector), buffer); if (chdstate != CHDERR_NONE) { - osd_printf_verbose("%s: Write error while writing sector chs=(%d,%d,%d)\n", tag().c_str(), cylinder, head, sector); + osd_printf_verbose("%s: Write error while writing sector chs=(%d,%d,%d)\n", tag(), cylinder, head, sector); } } else { - osd_printf_verbose("%s: Invalid CHS data in track image: (%d,%d,%d); not saving to CHD\n", tag().c_str(), cylinder, head, sector); + osd_printf_verbose("%s: Invalid CHS data in track image: (%d,%d,%d); not saving to CHD\n", tag(), cylinder, head, sector); } if (m_param.gap3==0) countgap3 = true; search_header = true; @@ -662,7 +662,7 @@ chd_error mfmhd_generic_format::save(chd_file* chdfile, UINT16* trackimage, int // Let's test for a 5-byte header if (search_header && m_param.headerlen==4 && current_cylinder==0 && current_head==0) { - if (TRACE_DETAIL) osd_printf_verbose("%s: CRC error for 4-byte header; trying 5 bytes\n", tag().c_str()); + if (TRACE_DETAIL) osd_printf_verbose("%s: CRC error for 4-byte header; trying 5 bytes\n", tag()); m_param.headerlen=5; count = 1; bytepos++; @@ -670,7 +670,7 @@ chd_error mfmhd_generic_format::save(chd_file* chdfile, UINT16* trackimage, int } else { - osd_printf_verbose("%s: CRC error in %s of (%d,%d,%d)\n", tag().c_str(), search_header? "header" : "data", cylinder, head, sector); + osd_printf_verbose("%s: CRC error in %s of (%d,%d,%d)\n", tag(), search_header? "header" : "data", cylinder, head, sector); search_header = true; } } @@ -679,7 +679,7 @@ chd_error mfmhd_generic_format::save(chd_file* chdfile, UINT16* trackimage, int if (!search_header && (pos - headerpos) > 30) { - osd_printf_verbose("%s: Error; missing DAM; searching next header\n", tag().c_str()); + osd_printf_verbose("%s: Error; missing DAM; searching next header\n", tag()); search_header = true; } } @@ -693,7 +693,7 @@ chd_error mfmhd_generic_format::save(chd_file* chdfile, UINT16* trackimage, int // Successfully determined the interleave m_param.interleave = interleave; if (TRACE_FORMAT) - if (current_cylinder==0 && current_head==0) osd_printf_verbose("%s: Determined interleave = %d\n", tag().c_str(), m_param.interleave); + if (current_cylinder==0 && current_head==0) osd_printf_verbose("%s: Determined interleave = %d\n", tag(), m_param.interleave); } if (check_skew == false) @@ -703,12 +703,12 @@ chd_error mfmhd_generic_format::save(chd_file* chdfile, UINT16* trackimage, int if (m_secnumber[1] != -1) { if (save_param(MFMHD_HSKEW)) m_param.headskew = m_secnumber[1]-m_secnumber[0]; - if (TRACE_FORMAT) osd_printf_verbose("%s: Determined head skew = %d\n", tag().c_str(), m_param.headskew); + if (TRACE_FORMAT) osd_printf_verbose("%s: Determined head skew = %d\n", tag(), m_param.headskew); } if (m_secnumber[2] != -1) { if (save_param(MFMHD_CSKEW)) m_param.cylskew = m_secnumber[2]-m_secnumber[0]; - if (TRACE_FORMAT) osd_printf_verbose("%s: Determined cylinder skew = %d\n", tag().c_str(), m_param.cylskew); + if (TRACE_FORMAT) osd_printf_verbose("%s: Determined cylinder skew = %d\n", tag(), m_param.cylskew); } } } diff --git a/src/lib/formats/mfm_hd.h b/src/lib/formats/mfm_hd.h index aa22967f266..4e583f46db8 100644 --- a/src/lib/formats/mfm_hd.h +++ b/src/lib/formats/mfm_hd.h @@ -189,7 +189,7 @@ protected: // Debugging void showtrack(UINT16* enctrack, int length); - virtual std::string tag() { return m_devtag; } + virtual const char* tag() { return m_devtag.c_str(); } }; class mfmhd_generic_format : public mfmhd_image_format_t diff --git a/src/lib/util/tagmap.h b/src/lib/util/tagmap.h index b93807c208c..cdbaf63d7fe 100644 --- a/src/lib/util/tagmap.h +++ b/src/lib/util/tagmap.h @@ -34,8 +34,8 @@ enum tagmap_error class add_exception { public: - add_exception(std::string tag) : m_tag(tag) { } - std::string tag() const { return m_tag; } + add_exception(const char *tag) : m_tag(tag) { } + const char *tag() const { return m_tag.c_str(); } private: std::string m_tag; }; @@ -61,7 +61,7 @@ public: void reset() { m_list.reset(); m_map.clear(); } // add the given object to the head of the list - _ElementType &prepend(std::string tag, _ElementType &object) + _ElementType &prepend(const char *tag, _ElementType &object) { if (!m_map.insert(std::make_pair(tag, &object)).second) throw add_exception(tag); @@ -69,7 +69,7 @@ public: } // add the given object to the tail of the list - _ElementType &append(std::string tag, _ElementType &object) + _ElementType &append(const char *tag, _ElementType &object) { if (!m_map.insert(std::make_pair(tag, &object)).second) throw add_exception(tag); @@ -77,8 +77,8 @@ public: } // operations by tag - void remove(std::string tag) { auto search = m_map.find(tag); if (search != m_map.end()) { m_list.remove(*search->second); m_map.erase(search); } } - _ElementType *find(std::string tag) const { auto search = m_map.find(tag); return (search == m_map.end()) ? nullptr : search->second; } + void remove(const char *tag) { auto search = m_map.find(tag); if (search != m_map.end()) { m_list.remove(*search->second); m_map.erase(search); } } + _ElementType *find(const char *tag) const { auto search = m_map.find(tag); return (search == m_map.end()) ? nullptr : search->second; } private: // internal state diff --git a/src/mame/audio/alesis.cpp b/src/mame/audio/alesis.cpp index 1547cd2cd33..7a253db43a2 100644 --- a/src/mame/audio/alesis.cpp +++ b/src/mame/audio/alesis.cpp @@ -34,7 +34,7 @@ MACHINE_CONFIG_END // alesis_dm3ag_device - constructor //------------------------------------------------- -alesis_dm3ag_device::alesis_dm3ag_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +alesis_dm3ag_device::alesis_dm3ag_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ALESIS_DM3AG, "Alesis DM3AG", tag, owner, clock, "alesis_dm3ag", __FILE__), m_dac(*this, "dac"), m_samples(*this, DEVICE_SELF) @@ -97,7 +97,7 @@ void alesis_dm3ag_device::device_timer(emu_timer &timer, device_timer_id id, int */ m_shift--; - if (LOG) logerror("DM3AG '%s' shift: %02x\n", tag().c_str(), m_shift); + if (LOG) logerror("DM3AG '%s' shift: %02x\n", tag(), m_shift); } // every block ends with three or more -1 samples @@ -106,7 +106,7 @@ void alesis_dm3ag_device::device_timer(emu_timer &timer, device_timer_id id, int m_output_active = false; sample = 0; - if (LOG) logerror("DM3AG '%s' stop: %d, len: %d\n", tag().c_str(), m_cur_sample, m_cur_sample-((m_cmd[0]<<12) | (m_cmd[1]<<4) | ((m_cmd[2]>>4) & 0x0f))); + if (LOG) logerror("DM3AG '%s' stop: %d, len: %d\n", tag(), m_cur_sample, m_cur_sample-((m_cmd[0]<<12) | (m_cmd[1]<<4) | ((m_cmd[2]>>4) & 0x0f))); break; } @@ -120,7 +120,7 @@ void alesis_dm3ag_device::device_timer(emu_timer &timer, device_timer_id id, int WRITE8_MEMBER(alesis_dm3ag_device::write) { - if (LOG) logerror("DM3AG '%s' write: %02x\n", tag().c_str(), data); + if (LOG) logerror("DM3AG '%s' write: %02x\n", tag(), data); m_cmd[m_count++] = data; @@ -148,7 +148,7 @@ WRITE8_MEMBER(alesis_dm3ag_device::write) { bool good_pos = (m_cur_sample<2 || m_samples[m_cur_sample-2] == -128); - logerror("DM3AG '%s' start: %d (%s), vol: %02x out: %d pan: %d\n", tag().c_str(), m_cur_sample, good_pos ? "ok": "no", m_cmd[3], m_cmd[4] & 0x10 ? 1 : 2, (m_cmd[4]>>5)&7); + logerror("DM3AG '%s' start: %d (%s), vol: %02x out: %d pan: %d\n", tag(), m_cur_sample, good_pos ? "ok": "no", m_cmd[3], m_cmd[4] & 0x10 ? 1 : 2, (m_cmd[4]>>5)&7); } } diff --git a/src/mame/audio/arcadia.cpp b/src/mame/audio/arcadia.cpp index 5bbbcac47c2..306932a0b44 100644 --- a/src/mame/audio/arcadia.cpp +++ b/src/mame/audio/arcadia.cpp @@ -47,7 +47,7 @@ const device_type ARCADIA_SOUND = &device_creator; // arcadia_sound_device - constructor //------------------------------------------------- -arcadia_sound_device::arcadia_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +arcadia_sound_device::arcadia_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ARCADIA_SOUND, "Arcadia Audio Custom", tag, owner, clock, "arcadia_sound", __FILE__), device_sound_interface(mconfig, *this) { diff --git a/src/mame/audio/arcadia.h b/src/mame/audio/arcadia.h index dac54545d57..14a4f298294 100644 --- a/src/mame/audio/arcadia.h +++ b/src/mame/audio/arcadia.h @@ -21,7 +21,7 @@ class arcadia_sound_device : public device_t, { public: // construction/destruction - arcadia_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + arcadia_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER(write); protected: diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp index 998a484ddac..6b9781c9e49 100644 --- a/src/mame/audio/atarijsa.cpp +++ b/src/mame/audio/atarijsa.cpp @@ -285,7 +285,7 @@ INPUT_PORTS_END // atari_jsa_base_device - constructor //------------------------------------------------- -atari_jsa_base_device::atari_jsa_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int channels) +atari_jsa_base_device::atari_jsa_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int channels) : device_t(mconfig, devtype, name, tag, owner, clock, shortname, __FILE__), device_mixer_interface(mconfig, *this, channels), m_soundcomm(*this, "soundcomm"), @@ -411,7 +411,7 @@ WRITE_LINE_MEMBER( atari_jsa_base_device::main_int_write_line ) // atari_jsa_oki_base_device: Constructor //------------------------------------------------- -atari_jsa_oki_base_device::atari_jsa_oki_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int channels) +atari_jsa_oki_base_device::atari_jsa_oki_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int channels) : atari_jsa_base_device(mconfig, devtype, name, tag, owner, clock, shortname, channels), m_oki1(*this, "oki1"), m_oki2(*this, "oki2"), @@ -625,7 +625,7 @@ void atari_jsa_oki_base_device::update_all_volumes() // atari_jsa_i_device: Constructor //------------------------------------------------- -atari_jsa_i_device::atari_jsa_i_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_jsa_i_device::atari_jsa_i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : atari_jsa_base_device(mconfig, ATARI_JSA_I, "Atari JSA I Sound Board", tag, owner, clock, "atjsa1", 2), m_pokey(*this, "pokey"), m_tms5220(*this, "tms"), @@ -840,7 +840,7 @@ void atari_jsa_i_device::update_all_volumes() // atari_jsa_ii_device: Constructor //------------------------------------------------- -atari_jsa_ii_device::atari_jsa_ii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_jsa_ii_device::atari_jsa_ii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : atari_jsa_oki_base_device(mconfig, ATARI_JSA_II, "Atari JSA II Sound Board", tag, owner, clock, "atjsa2", 1) , m_jsaii(*this, "JSAII") { @@ -904,13 +904,13 @@ ioport_constructor atari_jsa_ii_device::device_input_ports() const // atari_jsa_iii_device: Constructor //------------------------------------------------- -atari_jsa_iii_device::atari_jsa_iii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_jsa_iii_device::atari_jsa_iii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : atari_jsa_oki_base_device(mconfig, ATARI_JSA_III, "Atari JSA III Sound Board", tag, owner, clock, "atjsa3", 1) , m_jsaiii(*this, "JSAIII") { } -atari_jsa_iii_device::atari_jsa_iii_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int channels) +atari_jsa_iii_device::atari_jsa_iii_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int channels) : atari_jsa_oki_base_device(mconfig, devtype, name, tag, owner, clock, shortname, channels) , m_jsaiii(*this, "JSAIII") { @@ -973,7 +973,7 @@ ioport_constructor atari_jsa_iii_device::device_input_ports() const // atari_jsa_iiis_device: Constructor //------------------------------------------------- -atari_jsa_iiis_device::atari_jsa_iiis_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_jsa_iiis_device::atari_jsa_iiis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : atari_jsa_iii_device(mconfig, ATARI_JSA_IIIS, "Atari JSA IIIs Sound Board", tag, owner, clock, "atjsa3s", 2) { } diff --git a/src/mame/audio/atarijsa.h b/src/mame/audio/atarijsa.h index e2d16045068..38ce437b4d2 100644 --- a/src/mame/audio/atarijsa.h +++ b/src/mame/audio/atarijsa.h @@ -80,7 +80,7 @@ class atari_jsa_base_device : public device_t, { protected: // construction/destruction - atari_jsa_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int channels); + atari_jsa_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int channels); public: // static configuration @@ -137,7 +137,7 @@ class atari_jsa_oki_base_device : public atari_jsa_base_device { protected: // derived construction/destruction - atari_jsa_oki_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int channels); + atari_jsa_oki_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int channels); public: // read/write handlers @@ -177,7 +177,7 @@ class atari_jsa_i_device : public atari_jsa_base_device { public: // construction/destruction - atari_jsa_i_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_jsa_i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // read/write handlers DECLARE_READ8_MEMBER( rdio_r ); @@ -214,7 +214,7 @@ class atari_jsa_ii_device : public atari_jsa_oki_base_device { public: // construction/destruction - atari_jsa_ii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_jsa_ii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // read/write handlers DECLARE_READ8_MEMBER( rdio_r ); @@ -234,11 +234,11 @@ class atari_jsa_iii_device : public atari_jsa_oki_base_device { public: // construction/destruction - atari_jsa_iii_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_jsa_iii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // derived construction/destruction - atari_jsa_iii_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, int channels); + atari_jsa_iii_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int channels); public: // read/write handlers @@ -259,7 +259,7 @@ class atari_jsa_iiis_device : public atari_jsa_iii_device { public: // construction/destruction - atari_jsa_iiis_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_jsa_iiis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device level overrides diff --git a/src/mame/audio/beezer.cpp b/src/mame/audio/beezer.cpp index 9e11ceeb481..3a295208073 100644 --- a/src/mame/audio/beezer.cpp +++ b/src/mame/audio/beezer.cpp @@ -69,7 +69,7 @@ const device_type BEEZER = &device_creator; -beezer_sound_device::beezer_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +beezer_sound_device::beezer_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BEEZER, "beezer SFX", tag, owner, clock, "beezer_sound", __FILE__), device_sound_interface(mconfig, *this), //m_ptm_irq_state(0), diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp index 522701d210a..62387ef1e0d 100644 --- a/src/mame/audio/cage.cpp +++ b/src/mame/audio/cage.cpp @@ -112,13 +112,13 @@ const device_type ATARI_CAGE = &device_creator; // atari_cage_device - constructor //------------------------------------------------- -atari_cage_device::atari_cage_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +atari_cage_device::atari_cage_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ATARI_CAGE, "Atari CAGE", tag, owner, clock, "atari_cage", __FILE__), m_irqhandler(*this) { } -atari_cage_device::atari_cage_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +atari_cage_device::atari_cage_device(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_irqhandler(*this) { @@ -684,7 +684,7 @@ const device_type ATARI_CAGE_SEATTLE = &device_creator(device).m_speedup = speedup; } template static devcb_base &set_irqhandler_callback(device_t &device, _Object object) { return downcast(device).m_irqhandler.set_callback(object); } @@ -97,7 +97,7 @@ class atari_cage_seattle_device : public atari_cage_device { public: // construction/destruction - atari_cage_seattle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_cage_seattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/audio/cclimber.cpp b/src/mame/audio/cclimber.cpp index 1248af80592..23ed02302b7 100644 --- a/src/mame/audio/cclimber.cpp +++ b/src/mame/audio/cclimber.cpp @@ -43,7 +43,7 @@ const device_type CCLIMBER_AUDIO = &device_creator; // cclimber_audio_device: Constructor //------------------------------------------------- -cclimber_audio_device::cclimber_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cclimber_audio_device::cclimber_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CCLIMBER_AUDIO, "Crazy Climber Sound Board", tag, owner, clock, "cclimber_audio", __FILE__), m_sample_buf(nullptr), m_sample_num(0), diff --git a/src/mame/audio/cclimber.h b/src/mame/audio/cclimber.h index 3e7c7d457fc..6007aa0a831 100644 --- a/src/mame/audio/cclimber.h +++ b/src/mame/audio/cclimber.h @@ -35,7 +35,7 @@ class cclimber_audio_device : public device_t { public: // construction/destruction - cclimber_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cclimber_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( sample_trigger_w ); DECLARE_WRITE8_MEMBER( sample_rate_w ); diff --git a/src/mame/audio/channelf.cpp b/src/mame/audio/channelf.cpp index 8eed4ac9cc5..2cf03d70aa0 100644 --- a/src/mame/audio/channelf.cpp +++ b/src/mame/audio/channelf.cpp @@ -8,7 +8,7 @@ const device_type CHANNELF_SOUND = &device_creator; -channelf_sound_device::channelf_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +channelf_sound_device::channelf_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CHANNELF_SOUND, "Channel F Sound", tag, owner, clock, "channelf_sound", __FILE__), device_sound_interface(mconfig, *this), m_channel(nullptr), diff --git a/src/mame/audio/channelf.h b/src/mame/audio/channelf.h index 9fbe3fc2540..17ad5add8df 100644 --- a/src/mame/audio/channelf.h +++ b/src/mame/audio/channelf.h @@ -13,7 +13,7 @@ class channelf_sound_device : public device_t, public device_sound_interface { public: - channelf_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + channelf_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void sound_w(int mode); protected: diff --git a/src/mame/audio/cps3.cpp b/src/mame/audio/cps3.cpp index 1812b7c61f9..7038ec5adf8 100644 --- a/src/mame/audio/cps3.cpp +++ b/src/mame/audio/cps3.cpp @@ -22,7 +22,7 @@ const device_type CPS3 = &device_creator; // cps3_sound_device - constructor //------------------------------------------------- -cps3_sound_device::cps3_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cps3_sound_device::cps3_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CPS3, "CPS3 Audio Custom", tag, owner, clock, "cps3_custom", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/mame/audio/cps3.h b/src/mame/audio/cps3.h index c76b951f42b..03c5e4f1642 100644 --- a/src/mame/audio/cps3.h +++ b/src/mame/audio/cps3.h @@ -30,7 +30,7 @@ class cps3_sound_device : public device_t, public device_sound_interface { public: - cps3_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cps3_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~cps3_sound_device() { } void set_base(INT8* base) { m_base = base; } diff --git a/src/mame/audio/dai_snd.cpp b/src/mame/audio/dai_snd.cpp index fc7abb69613..ae0bf3c79c3 100644 --- a/src/mame/audio/dai_snd.cpp +++ b/src/mame/audio/dai_snd.cpp @@ -21,7 +21,7 @@ const device_type DAI_SOUND = &device_creator; // dai_sound_device - constructor //------------------------------------------------- -dai_sound_device::dai_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dai_sound_device::dai_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DAI_SOUND, "DAI Audio Custom", tag, owner, clock, "dai_sound", __FILE__), device_sound_interface(mconfig, *this) { diff --git a/src/mame/audio/dai_snd.h b/src/mame/audio/dai_snd.h index 7a466478210..484002161ff 100644 --- a/src/mame/audio/dai_snd.h +++ b/src/mame/audio/dai_snd.h @@ -18,7 +18,7 @@ class dai_sound_device : public device_t, { public: // construction/destruction - dai_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dai_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER(set_input_ch0); DECLARE_WRITE_LINE_MEMBER(set_input_ch1); diff --git a/src/mame/audio/dave.cpp b/src/mame/audio/dave.cpp index f227d05b605..138b8d9ac40 100644 --- a/src/mame/audio/dave.cpp +++ b/src/mame/audio/dave.cpp @@ -52,7 +52,7 @@ ADDRESS_MAP_END // dave_device - constructor //------------------------------------------------- -dave_device::dave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dave_device::dave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DAVE, "DAVE", tag, owner, clock, "dave", __FILE__), device_memory_interface(mconfig, *this), device_sound_interface(mconfig, *this), diff --git a/src/mame/audio/dave.h b/src/mame/audio/dave.h index 0906f934a12..de534c51bda 100644 --- a/src/mame/audio/dave.h +++ b/src/mame/audio/dave.h @@ -56,7 +56,7 @@ class dave_device : public device_t, public device_sound_interface { public: - dave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_lh_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_lh.set_callback(object); } diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp index 6669ad245e5..cad34e38130 100644 --- a/src/mame/audio/dcs.cpp +++ b/src/mame/audio/dcs.cpp @@ -785,7 +785,7 @@ void dcs_audio_device::dcs_register_state() // dcs_audio_device - constructor //------------------------------------------------- -dcs_audio_device::dcs_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, int rev) : +dcs_audio_device::dcs_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, int rev) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_cpu(nullptr), m_program(nullptr), @@ -2378,7 +2378,7 @@ const device_type DCS_AUDIO_2K = &device_creator; // dcs_audio_2k_device - constructor //------------------------------------------------- -dcs_audio_2k_device::dcs_audio_2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dcs_audio_2k_device::dcs_audio_2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : dcs_audio_device(mconfig, DCS_AUDIO_2K, "DCS Audio 2K", tag, owner, clock, "dcs_audio_2k", __FILE__) { } @@ -2394,7 +2394,7 @@ const device_type DCS_AUDIO_2K_UART = &device_creator; // dcs_audio_2k_uart_device - constructor //------------------------------------------------- -dcs_audio_2k_uart_device::dcs_audio_2k_uart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dcs_audio_2k_uart_device::dcs_audio_2k_uart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : dcs_audio_device(mconfig, DCS_AUDIO_2K_UART, "DCS Audio 2K UART", tag, owner, clock, "dcs_audio_2k_uart", __FILE__) { } @@ -2410,7 +2410,7 @@ const device_type DCS_AUDIO_8K = &device_creator; // dcs_audio_8k_device - constructor //------------------------------------------------- -dcs_audio_8k_device::dcs_audio_8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dcs_audio_8k_device::dcs_audio_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : dcs_audio_device(mconfig, DCS_AUDIO_8K, "DCS Audio 8K", tag, owner, clock, "dcs_audio_8k", __FILE__) { } @@ -2426,7 +2426,7 @@ const device_type DCS_AUDIO_WPC = &device_creator; // dcs_audio_wpc_device - constructor //------------------------------------------------- -dcs_audio_wpc_device::dcs_audio_wpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dcs_audio_wpc_device::dcs_audio_wpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : dcs_audio_device(mconfig, DCS_AUDIO_WPC, "DCS Audio WPC", tag, owner, clock, "dcs_audio_wpc", __FILE__, 15) { } @@ -2442,7 +2442,7 @@ machine_config_constructor dcs_audio_wpc_device::device_mconfig_additions() cons // dcs2_audio_device - constructor //------------------------------------------------- -dcs2_audio_device::dcs2_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) : +dcs2_audio_device::dcs2_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) : dcs_audio_device(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -2454,7 +2454,7 @@ const device_type DCS2_AUDIO_2115 = &device_creator; // dcs2_audio_2115_device - constructor //------------------------------------------------- -dcs2_audio_2115_device::dcs2_audio_2115_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dcs2_audio_2115_device::dcs2_audio_2115_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : dcs2_audio_device(mconfig, DCS2_AUDIO_2115, "DCS2 Audio 2115", tag, owner, clock, "dcs2_audio_2115", __FILE__) { } @@ -2470,7 +2470,7 @@ const device_type DCS2_AUDIO_2104 = &device_creator; // dcs2_audio_2104_device - constructor //------------------------------------------------- -dcs2_audio_2104_device::dcs2_audio_2104_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dcs2_audio_2104_device::dcs2_audio_2104_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : dcs2_audio_device(mconfig, DCS2_AUDIO_2104, "DCS2 Audio 2104", tag, owner, clock, "dcs2_audio_2104", __FILE__) { } @@ -2487,7 +2487,7 @@ const device_type DCS2_AUDIO_DSIO = &device_creator; // dcs2_audio_dsio_device - constructor //------------------------------------------------- -dcs2_audio_dsio_device::dcs2_audio_dsio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dcs2_audio_dsio_device::dcs2_audio_dsio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : dcs2_audio_device(mconfig, DCS2_AUDIO_DSIO, "DCS2 Audio DSIO", tag, owner, clock, "dcs2_audio_dsio", __FILE__) { } @@ -2503,7 +2503,7 @@ const device_type DCS2_AUDIO_DENVER = &device_creator; // dcs2_audio_denver_device - constructor //------------------------------------------------- -dcs2_audio_denver_device::dcs2_audio_denver_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dcs2_audio_denver_device::dcs2_audio_denver_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : dcs2_audio_device(mconfig, DCS2_AUDIO_DENVER, "DCS2 Audio Denver", tag, owner, clock, "dcs2_audio_denver", __FILE__) { } diff --git a/src/mame/audio/dcs.h b/src/mame/audio/dcs.h index b436f2709bb..7f84d5fed96 100644 --- a/src/mame/audio/dcs.h +++ b/src/mame/audio/dcs.h @@ -23,7 +23,7 @@ class dcs_audio_device : public device_t { public: // construction/destruction - dcs_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, int rev = 1); + dcs_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, int rev = 1); // for dcs2 (int dram_in_mb, offs_t polling_offset) static void static_set_dram_in_mb(device_t &device, int dram_in_mb) { downcast(device).m_dram_in_mb = dram_in_mb; } @@ -212,7 +212,7 @@ class dcs_audio_2k_device : public dcs_audio_device { public: // construction/destruction - dcs_audio_2k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dcs_audio_2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -228,7 +228,7 @@ class dcs_audio_2k_uart_device : public dcs_audio_device { public: // construction/destruction - dcs_audio_2k_uart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dcs_audio_2k_uart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -244,7 +244,7 @@ class dcs_audio_8k_device : public dcs_audio_device { public: // construction/destruction - dcs_audio_8k_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dcs_audio_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -260,7 +260,7 @@ class dcs_audio_wpc_device : public dcs_audio_device { public: // construction/destruction - dcs_audio_wpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dcs_audio_wpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -276,7 +276,7 @@ class dcs2_audio_device : public dcs_audio_device { public: // construction/destruction - dcs2_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); + dcs2_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); protected: // device-level overrides @@ -289,7 +289,7 @@ class dcs2_audio_2115_device : public dcs2_audio_device { public: // construction/destruction - dcs2_audio_2115_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dcs2_audio_2115_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -305,7 +305,7 @@ class dcs2_audio_2104_device : public dcs2_audio_device { public: // construction/destruction - dcs2_audio_2104_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dcs2_audio_2104_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -321,7 +321,7 @@ class dcs2_audio_dsio_device : public dcs2_audio_device { public: // construction/destruction - dcs2_audio_dsio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dcs2_audio_dsio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -337,7 +337,7 @@ class dcs2_audio_denver_device : public dcs2_audio_device { public: // construction/destruction - dcs2_audio_denver_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dcs2_audio_denver_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp index b47d578c64b..c0b3aae1be8 100644 --- a/src/mame/audio/decobsmt.cpp +++ b/src/mame/audio/decobsmt.cpp @@ -73,7 +73,7 @@ machine_config_constructor decobsmt_device::device_mconfig_additions() const // decobsmt_device - constructor //------------------------------------------------- -decobsmt_device::decobsmt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +decobsmt_device::decobsmt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECOBSMT, "Data East/Sega/Stern BSMT2000 Sound Board", tag, owner, clock, "decobsmt", __FILE__), m_ourcpu(*this, M6809_TAG), m_bsmt(*this, BSMT_TAG) diff --git a/src/mame/audio/decobsmt.h b/src/mame/audio/decobsmt.h index 09230ea8490..715607f47b9 100644 --- a/src/mame/audio/decobsmt.h +++ b/src/mame/audio/decobsmt.h @@ -22,7 +22,7 @@ class decobsmt_device : public device_t { public: // construction/destruction - decobsmt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + decobsmt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER(bsmt_reset_w); DECLARE_READ8_MEMBER(bsmt_status_r); diff --git a/src/mame/audio/dsbz80.cpp b/src/mame/audio/dsbz80.cpp index 89dcd4976f2..dfc97fd6028 100644 --- a/src/mame/audio/dsbz80.cpp +++ b/src/mame/audio/dsbz80.cpp @@ -61,7 +61,7 @@ machine_config_constructor dsbz80_device::device_mconfig_additions() const // dsbz80_device - constructor //------------------------------------------------- -dsbz80_device::dsbz80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dsbz80_device::dsbz80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DSBZ80, "Sega Z80-based Digital Sound Board", tag, owner, clock, "dsbz80", __FILE__), device_sound_interface(mconfig, *this), m_ourcpu(*this, Z80_TAG) diff --git a/src/mame/audio/dsbz80.h b/src/mame/audio/dsbz80.h index 635efd33129..fb642566245 100644 --- a/src/mame/audio/dsbz80.h +++ b/src/mame/audio/dsbz80.h @@ -22,7 +22,7 @@ class dsbz80_device : public device_t, public device_sound_interface { public: // construction/destruction - dsbz80_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dsbz80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp index 8f68642efa5..c8bbaaf25ba 100644 --- a/src/mame/audio/exidy.cpp +++ b/src/mame/audio/exidy.cpp @@ -205,13 +205,13 @@ void exidy_sound_device::common_sh_start() const device_type EXIDY = &device_creator; -exidy_sound_device::exidy_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +exidy_sound_device::exidy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, EXIDY, "Exidy SFX", tag, owner, clock, "exidy_sfx", __FILE__), device_sound_interface(mconfig, *this) { } -exidy_sound_device::exidy_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +exidy_sound_device::exidy_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_riot_irq_state(0), @@ -669,7 +669,7 @@ WRITE8_MEMBER( venture_sound_device::filter_w ) const device_type EXIDY_VENTURE = &device_creator; -venture_sound_device::venture_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +venture_sound_device::venture_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : exidy_sound_device(mconfig, EXIDY_VENTURE, "Exidy SFX+PSG", tag, owner, clock, "venture_sound", __FILE__) { } @@ -924,7 +924,7 @@ WRITE_LINE_MEMBER( victory_sound_device::main_ack_w ) const device_type EXIDY_VICTORY = &device_creator; -victory_sound_device::victory_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +victory_sound_device::victory_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : exidy_sound_device(mconfig, EXIDY_VICTORY, "Exidy SFX+PSG+Speech", tag, owner, clock, "victory_sound", __FILE__), m_victory_sound_response_ack_clk(0) { diff --git a/src/mame/audio/exidy.h b/src/mame/audio/exidy.h index 9f49ecaa567..6f2eef49b56 100644 --- a/src/mame/audio/exidy.h +++ b/src/mame/audio/exidy.h @@ -37,8 +37,8 @@ class exidy_sound_device : public device_t, public device_sound_interface { public: - exidy_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - exidy_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + exidy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + exidy_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~exidy_sound_device() {} DECLARE_READ8_MEMBER( sh6840_r ); @@ -117,7 +117,7 @@ extern const device_type EXIDY; class venture_sound_device : public exidy_sound_device { public: - venture_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + venture_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( mtrap_voiceio_w ); DECLARE_READ8_MEMBER( mtrap_voiceio_r ); @@ -139,7 +139,7 @@ extern const device_type EXIDY_VENTURE; class victory_sound_device : public exidy_sound_device { public: - victory_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + victory_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER( response_r ); DECLARE_READ8_MEMBER( status_r ); diff --git a/src/mame/audio/exidy440.cpp b/src/mame/audio/exidy440.cpp index aa020f35f74..78c122a9caf 100644 --- a/src/mame/audio/exidy440.cpp +++ b/src/mame/audio/exidy440.cpp @@ -48,7 +48,7 @@ static const int channel_bits[4] = const device_type EXIDY440 = &device_creator; -exidy440_sound_device::exidy440_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +exidy440_sound_device::exidy440_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, EXIDY440, "Exidy 440 CVSD", tag, owner, clock, "exidy440_sound", __FILE__), device_sound_interface(mconfig, *this), m_sound_command(0), diff --git a/src/mame/audio/exidy440.h b/src/mame/audio/exidy440.h index a10e831e18f..0dafc17adf6 100644 --- a/src/mame/audio/exidy440.h +++ b/src/mame/audio/exidy440.h @@ -36,7 +36,7 @@ class exidy440_sound_device : public device_t, public device_sound_interface { public: - exidy440_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + exidy440_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~exidy440_sound_device() {} DECLARE_READ8_MEMBER( sound_command_r ); diff --git a/src/mame/audio/flower.cpp b/src/mame/audio/flower.cpp index cdf6da57aa1..fc8ef87b559 100644 --- a/src/mame/audio/flower.cpp +++ b/src/mame/audio/flower.cpp @@ -23,7 +23,7 @@ TODO: const device_type FLOWER = &device_creator; -flower_sound_device::flower_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +flower_sound_device::flower_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, FLOWER, "Flower Audio Custom", tag, owner, clock, "flower_sound", __FILE__), device_sound_interface(mconfig, *this) { diff --git a/src/mame/audio/galaxian.cpp b/src/mame/audio/galaxian.cpp index c247164bcaa..95598d41d1d 100644 --- a/src/mame/audio/galaxian.cpp +++ b/src/mame/audio/galaxian.cpp @@ -389,7 +389,7 @@ DISCRETE_SOUND_END const device_type GALAXIAN = &device_creator; -galaxian_sound_device::galaxian_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +galaxian_sound_device::galaxian_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GALAXIAN, "Galaxian Audio Custom", tag, owner, clock, "galaxian_sound", __FILE__), device_sound_interface(mconfig, *this), m_lfo_val(0) diff --git a/src/mame/audio/galaxian.h b/src/mame/audio/galaxian.h index f9628daffa0..5f763e7792f 100644 --- a/src/mame/audio/galaxian.h +++ b/src/mame/audio/galaxian.h @@ -8,7 +8,7 @@ class galaxian_sound_device : public device_t, public device_sound_interface { public: - galaxian_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + galaxian_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~galaxian_sound_device() {} DECLARE_WRITE8_MEMBER( sound_w ); diff --git a/src/mame/audio/gamate.cpp b/src/mame/audio/gamate.cpp index a2533d3eda8..79913845058 100644 --- a/src/mame/audio/gamate.cpp +++ b/src/mame/audio/gamate.cpp @@ -27,7 +27,7 @@ const int EnvelopeVolumes[]={ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // gamate_sound_device - constructor //------------------------------------------------- -gamate_sound_device::gamate_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gamate_sound_device::gamate_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GAMATE_SND, "Gamate Audio Custom", tag, owner, clock, "gamate_sound", __FILE__) , device_sound_interface(mconfig, *this) , m_mixer_channel(nullptr) diff --git a/src/mame/audio/gb.cpp b/src/mame/audio/gb.cpp index 4ac7a5c9976..181eb7ad2fb 100644 --- a/src/mame/audio/gb.cpp +++ b/src/mame/audio/gb.cpp @@ -105,7 +105,7 @@ const device_type GAMEBOY = &device_creator; // gameboy_sound_device - constructor //------------------------------------------------- -gameboy_sound_device::gameboy_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gameboy_sound_device::gameboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GAMEBOY, "LR35902 Sound", tag, owner, clock, "gameboy_sound", __FILE__), device_sound_interface(mconfig, *this) { diff --git a/src/mame/audio/gb.h b/src/mame/audio/gb.h index 3f5fa23f5a2..5ce8cb389f9 100644 --- a/src/mame/audio/gb.h +++ b/src/mame/audio/gb.h @@ -60,7 +60,7 @@ class gameboy_sound_device : public device_t, public device_sound_interface { public: - gameboy_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gameboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(sound_r); DECLARE_READ8_MEMBER(wave_r); diff --git a/src/mame/audio/geebee.cpp b/src/mame/audio/geebee.cpp index 01abe93986c..d16f3c68cb5 100644 --- a/src/mame/audio/geebee.cpp +++ b/src/mame/audio/geebee.cpp @@ -15,7 +15,7 @@ const device_type GEEBEE = &device_creator; -geebee_sound_device::geebee_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +geebee_sound_device::geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GEEBEE, "Gee Bee Audio Custom", tag, owner, clock, "geebee_sound", __FILE__), device_sound_interface(mconfig, *this), m_decay(nullptr), diff --git a/src/mame/audio/gomoku.cpp b/src/mame/audio/gomoku.cpp index a405e7cfebc..9743ea2884e 100644 --- a/src/mame/audio/gomoku.cpp +++ b/src/mame/audio/gomoku.cpp @@ -27,7 +27,7 @@ const device_type GOMOKU = &device_creator; // gomoku_sound_device - constructor //------------------------------------------------- -gomoku_sound_device::gomoku_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gomoku_sound_device::gomoku_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GOMOKU, "Gomoku Narabe Renju Audio Custom", tag, owner, clock, "gomoku_sound", __FILE__), device_sound_interface(mconfig, *this), m_last_channel(nullptr), diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp index 8b15a3855bd..6a5eb46f0e8 100644 --- a/src/mame/audio/gottlieb.cpp +++ b/src/mame/audio/gottlieb.cpp @@ -255,7 +255,7 @@ MACHINE_CONFIG_END // gottlieb_sound_r0_device - constructors //------------------------------------------------- -gottlieb_sound_r0_device::gottlieb_sound_r0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gottlieb_sound_r0_device::gottlieb_sound_r0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GOTTLIEB_SOUND_REV1, "Gottlieb Sound rev. 0", tag, owner, clock, "gotsndr0", __FILE__) , device_mixer_interface(mconfig, *this) , m_audiocpu(*this, "audiocpu") @@ -380,7 +380,7 @@ void gottlieb_sound_r0_device::device_start() // gottlieb_sound_r1_device - constructors //------------------------------------------------- -gottlieb_sound_r1_device::gottlieb_sound_r1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gottlieb_sound_r1_device::gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GOTTLIEB_SOUND_REV1, "Gottlieb Sound rev. 1", tag, owner, clock, "gotsndr1", __FILE__), device_mixer_interface(mconfig, *this), m_audiocpu(*this, "audiocpu"), @@ -398,7 +398,7 @@ gottlieb_sound_r1_device::gottlieb_sound_r1_device(const machine_config &mconfig { } -gottlieb_sound_r1_device::gottlieb_sound_r1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, bool populate_votrax) +gottlieb_sound_r1_device::gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, bool populate_votrax) : device_t(mconfig, GOTTLIEB_SOUND_REV1, "Gottlieb Sound rev. 1", tag, owner, clock, "gotsndr1", __FILE__), device_mixer_interface(mconfig, *this), m_audiocpu(*this, "audiocpu"), @@ -625,7 +625,7 @@ void gottlieb_sound_r1_device::device_start() // constructor //------------------------------------------------- -gottlieb_sound_r1_with_votrax_device::gottlieb_sound_r1_with_votrax_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gottlieb_sound_r1_with_votrax_device::gottlieb_sound_r1_with_votrax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gottlieb_sound_r1_device(mconfig, tag, owner, clock, true) { } @@ -662,7 +662,7 @@ ioport_constructor gottlieb_sound_r1_with_votrax_device::device_input_ports() co // gottlieb_sound_r2_device - constructor //------------------------------------------------- -gottlieb_sound_r2_device::gottlieb_sound_r2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gottlieb_sound_r2_device::gottlieb_sound_r2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GOTTLIEB_SOUND_REV2, "Gottlieb Sound rev. 2", tag, owner, clock, "gotsndr2", __FILE__), device_mixer_interface(mconfig, *this), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/audio/gottlieb.h b/src/mame/audio/gottlieb.h index 813cf44e9ee..6295af33542 100644 --- a/src/mame/audio/gottlieb.h +++ b/src/mame/audio/gottlieb.h @@ -62,7 +62,7 @@ class gottlieb_sound_r0_device : public device_t, public device_mixer_interface { public: // construction/destruction - gottlieb_sound_r0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gottlieb_sound_r0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // read/write DECLARE_WRITE8_MEMBER( write ); @@ -93,8 +93,8 @@ class gottlieb_sound_r1_device : public device_t, public device_mixer_interface { public: // construction/destruction - gottlieb_sound_r1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - gottlieb_sound_r1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, bool populate_votrax); + gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, bool populate_votrax); // read/write DECLARE_WRITE8_MEMBER( write ); @@ -142,7 +142,7 @@ class gottlieb_sound_r1_with_votrax_device : public gottlieb_sound_r1_device { public: // construction/destruction - gottlieb_sound_r1_with_votrax_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gottlieb_sound_r1_with_votrax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides @@ -158,7 +158,7 @@ class gottlieb_sound_r2_device : public device_t, public device_mixer_interface { public: // construction/destruction - gottlieb_sound_r2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gottlieb_sound_r2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers static void static_enable_cobram3_mods(device_t &device); diff --git a/src/mame/audio/gridlee.cpp b/src/mame/audio/gridlee.cpp index 409c912557b..b7575c2c34f 100644 --- a/src/mame/audio/gridlee.cpp +++ b/src/mame/audio/gridlee.cpp @@ -22,7 +22,7 @@ const device_type GRIDLEE = &device_creator; // gridlee_sound_device - constructor //------------------------------------------------- -gridlee_sound_device::gridlee_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gridlee_sound_device::gridlee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GRIDLEE, "Gridlee Audio Custom", tag, owner, clock, "gridlee_sound", __FILE__), device_sound_interface(mconfig, *this), m_tone_step(0), diff --git a/src/mame/audio/harddriv.cpp b/src/mame/audio/harddriv.cpp index 44d39c14fd3..c629eb7f32c 100644 --- a/src/mame/audio/harddriv.cpp +++ b/src/mame/audio/harddriv.cpp @@ -27,7 +27,7 @@ const device_type HARDDRIV_SOUND_BOARD_DEVICE = &device_creator; -harddriv_sound_board_device::harddriv_sound_board_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +harddriv_sound_board_device::harddriv_sound_board_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, HARDDRIV_SOUND_BOARD_DEVICE, "Hard Drivin' Sound Board", tag, owner, clock, "harddriv_sound", __FILE__), m_soundcpu(*this, "soundcpu"), m_dac(*this, "dac"), diff --git a/src/mame/audio/hyprolyb.cpp b/src/mame/audio/hyprolyb.cpp index 75b8cd7df6b..c816e4bb603 100644 --- a/src/mame/audio/hyprolyb.cpp +++ b/src/mame/audio/hyprolyb.cpp @@ -6,7 +6,7 @@ const device_type HYPROLYB_ADPCM = &device_creator; -hyprolyb_adpcm_device::hyprolyb_adpcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +hyprolyb_adpcm_device::hyprolyb_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, HYPROLYB_ADPCM, "Hyper Olympics Audio", tag, owner, clock, "hyprolyb_adpcm", __FILE__), device_sound_interface(mconfig, *this), m_adpcm_ready(0), diff --git a/src/mame/audio/hyprolyb.h b/src/mame/audio/hyprolyb.h index 35fe4f3ef13..f5b1c3dc116 100644 --- a/src/mame/audio/hyprolyb.h +++ b/src/mame/audio/hyprolyb.h @@ -6,7 +6,7 @@ class hyprolyb_adpcm_device : public device_t, public device_sound_interface { public: - hyprolyb_adpcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hyprolyb_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~hyprolyb_adpcm_device() {} DECLARE_WRITE8_MEMBER( write ); diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp index 3e2a55cd006..43cbf08b594 100644 --- a/src/mame/audio/irem.cpp +++ b/src/mame/audio/irem.cpp @@ -16,7 +16,7 @@ const device_type IREM_M62_AUDIO = &device_creator; const device_type IREM_M52_SOUNDC_AUDIO = &device_creator; const device_type IREM_M52_LARGE_AUDIO = &device_creator; -irem_audio_device::irem_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) +irem_audio_device::irem_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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_port1(0), m_port2(0) @@ -25,17 +25,17 @@ irem_audio_device::irem_audio_device(const machine_config &mconfig, device_type { } -m62_audio_device::m62_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m62_audio_device::m62_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : irem_audio_device(mconfig, IREM_M62_AUDIO, "Irem M62 Audio", tag, owner, clock, "irem_m62_audio", __FILE__) { } -m52_soundc_audio_device::m52_soundc_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m52_soundc_audio_device::m52_soundc_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : irem_audio_device(mconfig, IREM_M52_SOUNDC_AUDIO, "Irem M52 SoundC Audio", tag, owner, clock, "irem_m52_soundc_audio", __FILE__) { } -m52_large_audio_device::m52_large_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m52_large_audio_device::m52_large_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : irem_audio_device(mconfig, IREM_M52_LARGE_AUDIO, "Irem M52 Large Audio", tag, owner, clock, "irem_m52_large_audio", __FILE__) { } diff --git a/src/mame/audio/irem.h b/src/mame/audio/irem.h index 6b1b89f891a..c8b156ffaab 100644 --- a/src/mame/audio/irem.h +++ b/src/mame/audio/irem.h @@ -7,7 +7,7 @@ class irem_audio_device : public device_t { public: - irem_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); + irem_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); ~irem_audio_device() {} DECLARE_WRITE8_MEMBER( cmd_w ); @@ -52,21 +52,21 @@ private: class m62_audio_device : public irem_audio_device { public: - m62_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m62_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; class m52_soundc_audio_device : public irem_audio_device { public: - m52_soundc_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m52_soundc_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; class m52_large_audio_device : public irem_audio_device { public: - m52_large_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m52_large_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp index 34696b3d6ae..6cf7e4740ad 100644 --- a/src/mame/audio/leland.cpp +++ b/src/mame/audio/leland.cpp @@ -329,7 +329,7 @@ void leland_80186_sound_device::device_reset() const device_type LELAND_80186 = &device_creator; -leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, LELAND_80186, "80186 DAC (Leland)", tag, owner, clock, "leland_80186_sound", __FILE__), m_dac1(*this, "dac1"), m_dac2(*this, "dac2"), @@ -347,7 +347,7 @@ leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconf m_type = TYPE_LELAND; } -leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_dac1(*this, "dac1"), m_dac2(*this, "dac2"), @@ -366,7 +366,7 @@ leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconf const device_type REDLINE_80186 = &device_creator; -redline_80186_sound_device::redline_80186_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +redline_80186_sound_device::redline_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : leland_80186_sound_device(mconfig, REDLINE_80186, "80186 DAC (Redline Racer)", tag, owner, clock, "redline_80186_sound", __FILE__) { m_type = TYPE_REDLINE; @@ -374,7 +374,7 @@ redline_80186_sound_device::redline_80186_sound_device(const machine_config &mco const device_type ATAXX_80186 = &device_creator; -ataxx_80186_sound_device::ataxx_80186_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ataxx_80186_sound_device::ataxx_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : leland_80186_sound_device(mconfig, REDLINE_80186, "80186 DAC (Ataxx)", tag, owner, clock, "ataxx_80186_sound", __FILE__) { m_type = TYPE_ATAXX; @@ -382,7 +382,7 @@ ataxx_80186_sound_device::ataxx_80186_sound_device(const machine_config &mconfig const device_type WSF_80186 = &device_creator; -wsf_80186_sound_device::wsf_80186_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +wsf_80186_sound_device::wsf_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : leland_80186_sound_device(mconfig, REDLINE_80186, "80186 DAC (WSF)", tag, owner, clock, "wsf_80186_sound", __FILE__) { m_type = TYPE_WSF; diff --git a/src/mame/audio/lynx.cpp b/src/mame/audio/lynx.cpp index ca8af4d5eda..2d58677f373 100644 --- a/src/mame/audio/lynx.cpp +++ b/src/mame/audio/lynx.cpp @@ -96,21 +96,21 @@ const device_type LYNX2_SND = &device_creator; // lynx_sound_device - constructor //------------------------------------------------- -lynx_sound_device::lynx_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +lynx_sound_device::lynx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, LYNX_SND, "Mikey", tag, owner, clock, "lynx_sound", __FILE__), device_sound_interface(mconfig, *this) { m_timer_delegate = lynx_sound_timer_delegate(); } -lynx_sound_device::lynx_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +lynx_sound_device::lynx_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this) { } -lynx2_sound_device::lynx2_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +lynx2_sound_device::lynx2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : lynx_sound_device(mconfig, LYNX2_SND, "Mikey (Lynx II)", tag, owner, clock, "lynx2_sound", __FILE__) { } diff --git a/src/mame/audio/lynx.h b/src/mame/audio/lynx.h index e8c38daee57..8bd8bdd3067 100644 --- a/src/mame/audio/lynx.h +++ b/src/mame/audio/lynx.h @@ -29,8 +29,8 @@ class lynx_sound_device : public device_t, public device_sound_interface { public: - lynx_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - lynx_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + lynx_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + lynx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -68,7 +68,7 @@ protected: class lynx2_sound_device : public lynx_sound_device { public: - lynx2_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + lynx2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/mame/audio/m72.cpp b/src/mame/audio/m72.cpp index 31fd62b6369..69566d713b8 100644 --- a/src/mame/audio/m72.cpp +++ b/src/mame/audio/m72.cpp @@ -48,7 +48,7 @@ Shisensho II 1993 Rev 3.34 M81 Yes const device_type M72 = &device_creator; -m72_audio_device::m72_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m72_audio_device::m72_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, M72, "Irem M72 Audio Custom", tag, owner, clock, "m72_audio", __FILE__), device_sound_interface(mconfig, *this), m_irqvector(0), diff --git a/src/mame/audio/m72.h b/src/mame/audio/m72.h index 709eb3ccbf4..71ed62fa35d 100644 --- a/src/mame/audio/m72.h +++ b/src/mame/audio/m72.h @@ -13,7 +13,7 @@ class m72_audio_device : public device_t, public device_sound_interface { public: - m72_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m72_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~m72_audio_device() {} enum diff --git a/src/mame/audio/mac.cpp b/src/mame/audio/mac.cpp index d20218fe341..821c15a9afb 100644 --- a/src/mame/audio/mac.cpp +++ b/src/mame/audio/mac.cpp @@ -32,7 +32,7 @@ const device_type MAC_SOUND = &device_creator; -mac_sound_device::mac_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mac_sound_device::mac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MAC_SOUND, "Mac Audio Custom", tag, owner, clock, "mac_sound", __FILE__), device_sound_interface(mconfig, *this), m_sample_enable(0), diff --git a/src/mame/audio/mea8000.cpp b/src/mame/audio/mea8000.cpp index b26e21e62ec..306fec1ac3e 100644 --- a/src/mame/audio/mea8000.cpp +++ b/src/mame/audio/mea8000.cpp @@ -114,7 +114,7 @@ static const int pi_table[32] = const device_type MEA8000 = &device_creator; -mea8000_device::mea8000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +mea8000_device::mea8000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MEA8000, "Philips / Signetics MEA 8000 speech synthesizer", tag, owner, clock, "mea8000", __FILE__), m_write_req(*this), m_dac(*this) diff --git a/src/mame/audio/mea8000.h b/src/mame/audio/mea8000.h index aa42db156c3..fcda2267a80 100644 --- a/src/mame/audio/mea8000.h +++ b/src/mame/audio/mea8000.h @@ -57,10 +57,10 @@ struct filter_t class mea8000_device : public device_t { public: - mea8000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mea8000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mea8000_device() {} - static void static_set_dac_tag(device_t &device, std::string tag) { downcast(device).m_dac.set_tag(tag); } + static void static_set_dac_tag(device_t &device, const char *tag) { downcast(device).m_dac.set_tag(tag); } template static devcb_base &set_req_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_req.set_callback(object); } DECLARE_READ8_MEMBER(read); diff --git a/src/mame/audio/micro3d.cpp b/src/mame/audio/micro3d.cpp index e47f531eb72..aeed7f03bdf 100644 --- a/src/mame/audio/micro3d.cpp +++ b/src/mame/audio/micro3d.cpp @@ -167,7 +167,7 @@ void micro3d_sound_device::noise_sh_w(UINT8 data) const device_type MICRO3D = &device_creator; -micro3d_sound_device::micro3d_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +micro3d_sound_device::micro3d_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MICRO3D, "Microprose Audio Custom", tag, owner, clock, "micro3d_sound", __FILE__), device_sound_interface(mconfig, *this), m_gain(0), diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp index bdeb723d81c..4aea1c337ad 100644 --- a/src/mame/audio/midway.cpp +++ b/src/mame/audio/midway.cpp @@ -47,7 +47,7 @@ extern const device_type MIDWAY_SQUAWK_N_TALK = &device_creator; -namco_52xx_device::namco_52xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_52xx_device::namco_52xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_52XX, "Namco 52xx", tag, owner, clock, "namco52", __FILE__), m_cpu(*this, "mcu"), m_discrete(*this), diff --git a/src/mame/audio/namco52.h b/src/mame/audio/namco52.h index 4811995f0db..5ca62330947 100644 --- a/src/mame/audio/namco52.h +++ b/src/mame/audio/namco52.h @@ -28,9 +28,9 @@ class namco_52xx_device : public device_t { public: - namco_52xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_52xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void set_discrete(device_t &device, std::string tag) { downcast(device).m_discrete.set_tag(tag); } + static void set_discrete(device_t &device, const char *tag) { downcast(device).m_discrete.set_tag(tag); } static void set_basenote(device_t &device, int node) { downcast(device).m_basenode = node; } static void set_extclock(device_t &device, attoseconds_t clk) { downcast(device).m_extclock = clk; } template static devcb_base &set_romread_callback(device_t &device, _Object object) { return downcast(device).m_romread.set_callback(object); } diff --git a/src/mame/audio/namco54.cpp b/src/mame/audio/namco54.cpp index 00b4a65d60a..0b19a142529 100644 --- a/src/mame/audio/namco54.cpp +++ b/src/mame/audio/namco54.cpp @@ -130,7 +130,7 @@ ROM_END const device_type NAMCO_54XX = &device_creator; -namco_54xx_device::namco_54xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_54xx_device::namco_54xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_54XX, "Namco 54xx", tag, owner, clock, "namco54", __FILE__), m_cpu(*this, "mcu"), m_discrete(*this), diff --git a/src/mame/audio/namco54.h b/src/mame/audio/namco54.h index 725458918c8..e05f5c6446b 100644 --- a/src/mame/audio/namco54.h +++ b/src/mame/audio/namco54.h @@ -20,9 +20,9 @@ class namco_54xx_device : public device_t { public: - namco_54xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_54xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void set_discrete(device_t &device, std::string tag) { downcast(device).m_discrete.set_tag(tag); } + static void set_discrete(device_t &device, const char *tag) { downcast(device).m_discrete.set_tag(tag); } static void set_basenote(device_t &device, int node) { downcast(device).m_basenode = node; } DECLARE_READ8_MEMBER( K_r ); diff --git a/src/mame/audio/phoenix.cpp b/src/mame/audio/phoenix.cpp index cc878ea9e8e..3bcd72661ea 100644 --- a/src/mame/audio/phoenix.cpp +++ b/src/mame/audio/phoenix.cpp @@ -50,7 +50,7 @@ const device_type PHOENIX = &device_creator; -phoenix_sound_device::phoenix_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +phoenix_sound_device::phoenix_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PHOENIX, "Phoenix Audio Custom", tag, owner, clock, "phoenix_sound", __FILE__), device_sound_interface(mconfig, *this) { diff --git a/src/mame/audio/pleiads.cpp b/src/mame/audio/pleiads.cpp index 36eaafa1b00..b838998c971 100644 --- a/src/mame/audio/pleiads.cpp +++ b/src/mame/audio/pleiads.cpp @@ -20,13 +20,13 @@ const device_type PLEIADS = &device_creator; -pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PLEIADS, "Pleiads Audio Custom", tag, owner, clock, "pleiads_sound", __FILE__), device_sound_interface(mconfig, *this) { } -pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_channel(nullptr), @@ -119,7 +119,7 @@ void pleiads_sound_device::device_start() const device_type NAUGHTYB = &device_creator; -naughtyb_sound_device::naughtyb_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +naughtyb_sound_device::naughtyb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pleiads_sound_device(mconfig, NAUGHTYB, "Naughty Boy Audio Custom", tag, owner, clock, "naughtyb_sound", __FILE__) { } @@ -197,7 +197,7 @@ void naughtyb_sound_device::device_start() const device_type POPFLAME = &device_creator; -popflame_sound_device::popflame_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +popflame_sound_device::popflame_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pleiads_sound_device(mconfig, POPFLAME, "Pop Flamer Audio Custom", tag, owner, clock, "popflame_sound", __FILE__) { } diff --git a/src/mame/audio/pleiads.h b/src/mame/audio/pleiads.h index b802018971b..e47b1b8e659 100644 --- a/src/mame/audio/pleiads.h +++ b/src/mame/audio/pleiads.h @@ -44,8 +44,8 @@ class pleiads_sound_device : public device_t, public device_sound_interface { public: - pleiads_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - pleiads_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pleiads_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pleiads_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~pleiads_sound_device() {} DECLARE_WRITE8_MEMBER( control_a_w ); @@ -106,7 +106,7 @@ extern const device_type PLEIADS; class naughtyb_sound_device : public pleiads_sound_device { public: - naughtyb_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + naughtyb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_config_complete() override; @@ -123,7 +123,7 @@ extern const device_type NAUGHTYB; class popflame_sound_device : public pleiads_sound_device { public: - popflame_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + popflame_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_config_complete() override; diff --git a/src/mame/audio/polepos.cpp b/src/mame/audio/polepos.cpp index b42f0e6f8a8..e3e23b2fdef 100644 --- a/src/mame/audio/polepos.cpp +++ b/src/mame/audio/polepos.cpp @@ -51,7 +51,7 @@ const device_type POLEPOS = &device_creator; // polepos_sound_device - constructor //------------------------------------------------- -polepos_sound_device::polepos_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +polepos_sound_device::polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, POLEPOS, "Pole Position Audio Custom", tag, owner, clock, "polepos_sound", __FILE__), device_sound_interface(mconfig, *this), m_current_position(0), diff --git a/src/mame/audio/redbaron.cpp b/src/mame/audio/redbaron.cpp index 19e80fabc39..b8f71f1d5f2 100644 --- a/src/mame/audio/redbaron.cpp +++ b/src/mame/audio/redbaron.cpp @@ -35,7 +35,7 @@ const device_type REDBARON = &device_creator; // redbaron_sound_device - constructor //------------------------------------------------- -redbaron_sound_device::redbaron_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +redbaron_sound_device::redbaron_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, REDBARON, "Red Baron Audio Custom", tag, owner, clock, "redbaron_custom", __FILE__), device_sound_interface(mconfig, *this), m_vol_lookup(nullptr), diff --git a/src/mame/audio/redbaron.h b/src/mame/audio/redbaron.h index ef7ed4c125d..b7d11ae2ab7 100644 --- a/src/mame/audio/redbaron.h +++ b/src/mame/audio/redbaron.h @@ -10,7 +10,7 @@ class redbaron_sound_device : public device_t, public device_sound_interface { public: - redbaron_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + redbaron_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( sounds_w ); diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp index da8a08e06b5..bc5a10566d0 100644 --- a/src/mame/audio/s11c_bg.cpp +++ b/src/mame/audio/s11c_bg.cpp @@ -12,7 +12,7 @@ const device_type S11C_BG = &device_creator; -s11c_bg_device::s11c_bg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s11c_bg_device::s11c_bg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig,S11C_BG,"Williams System 11C Background Music",tag,owner,clock, "s11c_bg", __FILE__), m_cpu(*this,"bgcpu"), m_ym2151(*this,"ym2151"), @@ -110,7 +110,7 @@ void s11c_bg_device::device_reset() m_cpu->set_input_line(INPUT_LINE_RESET,PULSE_LINE); } -void s11c_bg_device::static_set_gfxregion(device_t &device, std::string tag) +void s11c_bg_device::static_set_gfxregion(device_t &device, const char *tag) { s11c_bg_device &cpuboard = downcast(device); cpuboard.m_regiontag = tag; diff --git a/src/mame/audio/s11c_bg.h b/src/mame/audio/s11c_bg.h index e7d8ebfbf6a..136bd037825 100644 --- a/src/mame/audio/s11c_bg.h +++ b/src/mame/audio/s11c_bg.h @@ -25,7 +25,7 @@ class s11c_bg_device : public device_t { public: // construction/destruction - s11c_bg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + s11c_bg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_cpu; required_device m_ym2151; @@ -46,7 +46,7 @@ public: void ctrl_w(UINT8 data); void data_w(UINT8 data); - static void static_set_gfxregion(device_t &device, std::string tag); + static void static_set_gfxregion(device_t &device, const char *tag); protected: // overrides @@ -55,7 +55,7 @@ protected: virtual machine_config_constructor device_mconfig_additions() const override; private: - std::string m_regiontag; + const char* m_regiontag; }; diff --git a/src/mame/audio/segag80r.cpp b/src/mame/audio/segag80r.cpp index 4442ae74b85..60cdcc7a93a 100644 --- a/src/mame/audio/segag80r.cpp +++ b/src/mame/audio/segag80r.cpp @@ -30,7 +30,7 @@ const device_type SEGA005 = &device_creator; -sega005_sound_device::sega005_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega005_sound_device::sega005_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA005, "Sega 005 Audio Custom", tag, owner, clock, "sega005_sound", __FILE__), device_sound_interface(mconfig, *this), m_sega005_sound_timer(nullptr), diff --git a/src/mame/audio/segam1audio.cpp b/src/mame/audio/segam1audio.cpp index f8b879c408b..3e5a37120a3 100644 --- a/src/mame/audio/segam1audio.cpp +++ b/src/mame/audio/segam1audio.cpp @@ -81,7 +81,7 @@ machine_config_constructor segam1audio_device::device_mconfig_additions() const // segam1audio_device - constructor //------------------------------------------------- -segam1audio_device::segam1audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +segam1audio_device::segam1audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGAM1AUDIO, "Sega Model 1 Sound Board", tag, owner, clock, "segam1audio", __FILE__), m_audiocpu(*this, M68000_TAG), m_multipcm_1(*this, MULTIPCM_1_TAG), diff --git a/src/mame/audio/segam1audio.h b/src/mame/audio/segam1audio.h index d996ad899a6..e188a5502a4 100644 --- a/src/mame/audio/segam1audio.h +++ b/src/mame/audio/segam1audio.h @@ -26,7 +26,7 @@ class segam1audio_device : public device_t { public: // construction/destruction - segam1audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segam1audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp index 2b65cea25ed..abc5df498d4 100644 --- a/src/mame/audio/segasnd.cpp +++ b/src/mame/audio/segasnd.cpp @@ -66,7 +66,7 @@ static inline double step_cr_filter(g80_filter_state *state, double input) const device_type SEGASPEECH = &device_creator; -speech_sound_device::speech_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +speech_sound_device::speech_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGASPEECH, "Sega Speech Sound Board", tag, owner, clock, "sega_speech_sound", __FILE__), device_sound_interface(mconfig, *this), m_drq(0), @@ -239,7 +239,7 @@ MACHINE_CONFIG_END const device_type SEGAUSB = &device_creator; -usb_sound_device::usb_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +usb_sound_device::usb_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_ourcpu(*this, "ourcpu"), @@ -258,7 +258,7 @@ usb_sound_device::usb_sound_device(const machine_config &mconfig, device_type ty { } -usb_sound_device::usb_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +usb_sound_device::usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGAUSB, "Sega Universal Sound Board", tag, owner, clock, "segausb", __FILE__), device_sound_interface(mconfig, *this), m_ourcpu(*this, "ourcpu"), @@ -881,7 +881,7 @@ machine_config_constructor usb_sound_device::device_mconfig_additions() const const device_type SEGAUSBROM = &device_creator; -usb_rom_sound_device::usb_rom_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +usb_rom_sound_device::usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : usb_sound_device(mconfig, SEGAUSBROM, "Sega Universal Sound Board with ROM", tag, owner, clock, "segausbrom", __FILE__) { } diff --git a/src/mame/audio/segasnd.h b/src/mame/audio/segasnd.h index 6814d77e6fb..8436d8427e7 100644 --- a/src/mame/audio/segasnd.h +++ b/src/mame/audio/segasnd.h @@ -12,7 +12,7 @@ class speech_sound_device : public device_t, public device_sound_interface { public: - speech_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + speech_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~speech_sound_device() {} DECLARE_WRITE8_MEMBER( data_w ); @@ -115,8 +115,8 @@ class usb_sound_device : public device_t, public device_sound_interface { public: - usb_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - usb_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + usb_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~usb_sound_device() {} required_device m_ourcpu; /* CPU index of the 8035 */ @@ -176,7 +176,7 @@ extern const device_type SEGAUSB; class usb_rom_sound_device : public usb_sound_device { public: - usb_rom_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~usb_rom_sound_device() {} protected: diff --git a/src/mame/audio/seibu.cpp b/src/mame/audio/seibu.cpp index 2279adbddee..9883e9b9a25 100644 --- a/src/mame/audio/seibu.cpp +++ b/src/mame/audio/seibu.cpp @@ -76,8 +76,8 @@ const device_type SEIBU_SOUND = &device_creator; -seibu_sound_device::seibu_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) - : device_t(mconfig, SEIBU_SOUND, "Seibu Sound System", tag, owner, clock, "seibu_sound", __FILE__), m_sound_cpu(nullptr), +seibu_sound_device::seibu_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : device_t(mconfig, SEIBU_SOUND, "Seibu Sound System", tag, owner, clock, "seibu_sound", __FILE__), m_main2sub_pending(0), m_sub2main_pending(0), m_rst10_irq(0xff), @@ -506,7 +506,7 @@ ADDRESS_MAP_END const device_type SEIBU_ADPCM = &device_creator; -seibu_adpcm_device::seibu_adpcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +seibu_adpcm_device::seibu_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEIBU_ADPCM, "Seibu ADPCM (MSM5205)", tag, owner, clock, "seibu_adpcm", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), @@ -514,6 +514,7 @@ seibu_adpcm_device::seibu_adpcm_device(const machine_config &mconfig, std::strin m_end(0), m_nibble(0), m_playing(0), + m_rom_tag(nullptr), m_base(nullptr) { } diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h index 8efbbb3f04c..732ab5af314 100644 --- a/src/mame/audio/seibu.h +++ b/src/mame/audio/seibu.h @@ -43,7 +43,7 @@ ADDRESS_MAP_EXTERN(seibu3_adpcm_sound_map, 8); class seibu_sound_device : public device_t { public: - seibu_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + seibu_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~seibu_sound_device() {} DECLARE_READ16_MEMBER( main_word_r ); @@ -102,10 +102,10 @@ class seibu_adpcm_device : public device_t, public device_sound_interface { public: - seibu_adpcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + seibu_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~seibu_adpcm_device() {} - static void set_adpcm_rom_tag(device_t &device, std::string tag) { downcast(device).m_rom_tag = tag; } + static void set_adpcm_rom_tag(device_t &device, const char *tag) { downcast(device).m_rom_tag = tag; } void decrypt(const char *region); DECLARE_WRITE8_MEMBER( adr_w ); @@ -126,7 +126,7 @@ protected: UINT32 m_end; UINT8 m_nibble; UINT8 m_playing; - std::string m_rom_tag; + const char *m_rom_tag; UINT8 *m_base; }; diff --git a/src/mame/audio/snes_snd.cpp b/src/mame/audio/snes_snd.cpp index 5dd418295ce..a9295fd560c 100644 --- a/src/mame/audio/snes_snd.cpp +++ b/src/mame/audio/snes_snd.cpp @@ -155,7 +155,7 @@ static const int ENVCNT[0x20] const device_type SNES = &device_creator; -snes_sound_device::snes_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +snes_sound_device::snes_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNES, "SNES Custom DSP (SPC700)", tag, owner, clock, "snes_sound", __FILE__), device_sound_interface(mconfig, *this) { diff --git a/src/mame/audio/snes_snd.h b/src/mame/audio/snes_snd.h index c5b1cab5afd..6d4e97b14a1 100644 --- a/src/mame/audio/snes_snd.h +++ b/src/mame/audio/snes_snd.h @@ -63,7 +63,7 @@ class snes_sound_device : public device_t, public device_sound_interface { public: - snes_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + snes_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~snes_sound_device() {} void set_volume(int volume); diff --git a/src/mame/audio/snk6502.cpp b/src/mame/audio/snk6502.cpp index 570d3e68bae..61a5bc8e959 100644 --- a/src/mame/audio/snk6502.cpp +++ b/src/mame/audio/snk6502.cpp @@ -130,7 +130,7 @@ DISCRETE_SOUND_END const device_type SNK6502 = &device_creator; -snk6502_sound_device::snk6502_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +snk6502_sound_device::snk6502_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNK6502, "SNK6502 Audio Custom", tag, owner, clock, "snk6502_sound", __FILE__), device_sound_interface(mconfig, *this), //m_tone_channels[CHANNELS], diff --git a/src/mame/audio/socrates.cpp b/src/mame/audio/socrates.cpp index a0cec702591..c35896e5c25 100644 --- a/src/mame/audio/socrates.cpp +++ b/src/mame/audio/socrates.cpp @@ -23,7 +23,7 @@ const device_type SOCRATES_SOUND = &device_creator; // socrates_snd_device - constructor //------------------------------------------------- -socrates_snd_device::socrates_snd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +socrates_snd_device::socrates_snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SOCRATES_SOUND, "Socrates Sound", tag, owner, clock, "socrates_snd", __FILE__), device_sound_interface(mconfig, *this) { diff --git a/src/mame/audio/socrates.h b/src/mame/audio/socrates.h index dd31bdd1bce..14498844809 100644 --- a/src/mame/audio/socrates.h +++ b/src/mame/audio/socrates.h @@ -9,7 +9,7 @@ class socrates_snd_device : public device_t, public device_sound_interface { public: - socrates_snd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + socrates_snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void reg0_w(int data); void reg1_w(int data); diff --git a/src/mame/audio/specimx_snd.cpp b/src/mame/audio/specimx_snd.cpp index c252a62dfc6..ec64bc096cc 100644 --- a/src/mame/audio/specimx_snd.cpp +++ b/src/mame/audio/specimx_snd.cpp @@ -24,7 +24,7 @@ const device_type SPECIMX_SND = &device_creator; // specimx_sound_device - constructor //------------------------------------------------- -specimx_sound_device::specimx_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +specimx_sound_device::specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SPECIMX_SND, "Specialist MX Audio Custom", tag, owner, clock, "specimx_sound", __FILE__), device_sound_interface(mconfig, *this), m_mixer_channel(nullptr) diff --git a/src/mame/audio/specimx_snd.h b/src/mame/audio/specimx_snd.h index 45758a4b39f..0f682a37c0c 100644 --- a/src/mame/audio/specimx_snd.h +++ b/src/mame/audio/specimx_snd.h @@ -15,7 +15,7 @@ class specimx_sound_device : public device_t, public device_sound_interface { public: - specimx_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~specimx_sound_device() { } DECLARE_WRITE_LINE_MEMBER(set_input_ch0); diff --git a/src/mame/audio/svis_snd.cpp b/src/mame/audio/svis_snd.cpp index 0c95de6984e..cc2bec2b821 100644 --- a/src/mame/audio/svis_snd.cpp +++ b/src/mame/audio/svis_snd.cpp @@ -22,7 +22,7 @@ const device_type SVISION_SND = &device_creator; // svision_sound_device - constructor //------------------------------------------------- -svision_sound_device::svision_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +svision_sound_device::svision_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SVISION_SND, "Super Vision Audio Custom", tag, owner, clock, "svision_sound", __FILE__), device_sound_interface(mconfig, *this), m_mixer_channel(nullptr) diff --git a/src/mame/audio/svis_snd.h b/src/mame/audio/svis_snd.h index 867a649c57a..d6ca0228688 100644 --- a/src/mame/audio/svis_snd.h +++ b/src/mame/audio/svis_snd.h @@ -105,7 +105,7 @@ class svision_sound_device : public device_t, public device_sound_interface { public: - svision_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + svision_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~svision_sound_device() { } // static configuration diff --git a/src/mame/audio/t5182.cpp b/src/mame/audio/t5182.cpp index d101f8137cc..a40349de0d0 100644 --- a/src/mame/audio/t5182.cpp +++ b/src/mame/audio/t5182.cpp @@ -153,7 +153,7 @@ rom. const device_type T5182 = &device_creator; -t5182_device::t5182_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +t5182_device::t5182_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, T5182, "T5182 MCU", tag, owner, clock, "t5182", __FILE__), m_ourcpu(*this, "t5182_z80"), m_sharedram(*this, "sharedram"), diff --git a/src/mame/audio/t5182.h b/src/mame/audio/t5182.h index c60910057de..cef7d593c2b 100644 --- a/src/mame/audio/t5182.h +++ b/src/mame/audio/t5182.h @@ -7,7 +7,7 @@ class t5182_device : public device_t { public: - t5182_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + t5182_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~t5182_device() {} enum diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp index 310128dae9e..7fc4a193a17 100644 --- a/src/mame/audio/taito_en.cpp +++ b/src/mame/audio/taito_en.cpp @@ -18,7 +18,7 @@ const device_type TAITO_EN = &device_creator; -taito_en_device::taito_en_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +taito_en_device::taito_en_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TAITO_EN, "Taito Ensoniq Sound System", tag, owner, clock, "taito_en", __FILE__), m_audiocpu(*this, ":audiocpu"), m_ensoniq(*this, ":ensoniq"), diff --git a/src/mame/audio/taito_en.h b/src/mame/audio/taito_en.h index bfb81f2a384..395a313a07a 100644 --- a/src/mame/audio/taito_en.h +++ b/src/mame/audio/taito_en.h @@ -15,7 +15,7 @@ class taito_en_device : public device_t { public: - taito_en_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + taito_en_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~taito_en_device() {} DECLARE_READ8_MEMBER( en_68000_share_r ); diff --git a/src/mame/audio/taito_zm.cpp b/src/mame/audio/taito_zm.cpp index bae627fb502..a23967134c3 100644 --- a/src/mame/audio/taito_zm.cpp +++ b/src/mame/audio/taito_zm.cpp @@ -37,7 +37,7 @@ const device_type TAITO_ZOOM = &device_creator; // taito_zoom_device - constructor //------------------------------------------------- -taito_zoom_device::taito_zoom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +taito_zoom_device::taito_zoom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TAITO_ZOOM, "Taito Zoom Sound System", tag, owner, clock, "taito_zoom", __FILE__), m_soundcpu(*this, ":mn10200"), m_zsg2(*this, ":zsg2"), diff --git a/src/mame/audio/taito_zm.h b/src/mame/audio/taito_zm.h index 64b220e273e..610cdc807a8 100644 --- a/src/mame/audio/taito_zm.h +++ b/src/mame/audio/taito_zm.h @@ -16,7 +16,7 @@ class taito_zoom_device : public device_t { public: - taito_zoom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + taito_zoom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~taito_zoom_device() {} DECLARE_WRITE16_MEMBER(sound_irq_w); diff --git a/src/mame/audio/taitosnd.cpp b/src/mame/audio/taitosnd.cpp index b0689cfeaee..b36b81dc030 100644 --- a/src/mame/audio/taitosnd.cpp +++ b/src/mame/audio/taitosnd.cpp @@ -40,7 +40,7 @@ const device_type TC0140SYT = &device_creator; // tc0140syt_device - constructor //------------------------------------------------- -tc0140syt_device::tc0140syt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0140syt_device::tc0140syt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0140SYT, "Taito TC0140SYT", tag, owner, clock, "tc0140syt", __FILE__), m_mainmode(0), m_submode(0), diff --git a/src/mame/audio/taitosnd.h b/src/mame/audio/taitosnd.h index 05e707324d4..b74f13d0307 100644 --- a/src/mame/audio/taitosnd.h +++ b/src/mame/audio/taitosnd.h @@ -24,11 +24,11 @@ class tc0140syt_device : public device_t { public: - tc0140syt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0140syt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0140syt_device() { } - static void set_master_tag(device_t &device, std::string tag) { downcast(device).m_mastercpu.set_tag(tag); } - static void set_slave_tag(device_t &device, std::string tag) { downcast(device).m_slavecpu.set_tag(tag); } + static void set_master_tag(device_t &device, const char *tag) { downcast(device).m_mastercpu.set_tag(tag); } + static void set_slave_tag(device_t &device, const char *tag) { downcast(device).m_slavecpu.set_tag(tag); } // MASTER (4-bit bus) control functions DECLARE_WRITE8_MEMBER( master_port_w ); diff --git a/src/mame/audio/tiamc1.cpp b/src/mame/audio/tiamc1.cpp index 2153eab68c7..9c896429fcd 100644 --- a/src/mame/audio/tiamc1.cpp +++ b/src/mame/audio/tiamc1.cpp @@ -57,7 +57,7 @@ const device_type TIAMC1 = &device_creator; // tiamc1_sound_device - constructor //------------------------------------------------- -tiamc1_sound_device::tiamc1_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tiamc1_sound_device::tiamc1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TIAMC1, "TIA-MC1 Audio Custom", tag, owner, clock, "tiamc1_sound", __FILE__), device_sound_interface(mconfig, *this), m_channel(nullptr), diff --git a/src/mame/audio/timeplt.cpp b/src/mame/audio/timeplt.cpp index 51a7516459a..eb1dd3ef6e9 100644 --- a/src/mame/audio/timeplt.cpp +++ b/src/mame/audio/timeplt.cpp @@ -21,7 +21,7 @@ const device_type TIMEPLT_AUDIO = &device_creator; -timeplt_audio_device::timeplt_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +timeplt_audio_device::timeplt_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TIMEPLT_AUDIO, "Time Pilot Audio", tag, owner, clock, "timeplt_audio", __FILE__), device_sound_interface(mconfig, *this), m_last_irq_state(0) diff --git a/src/mame/audio/timeplt.h b/src/mame/audio/timeplt.h index b16570ae657..ec58d71bbf3 100644 --- a/src/mame/audio/timeplt.h +++ b/src/mame/audio/timeplt.h @@ -8,7 +8,7 @@ class timeplt_audio_device : public device_t, public device_sound_interface { public: - timeplt_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + timeplt_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~timeplt_audio_device() {} DECLARE_WRITE8_MEMBER( sh_irqtrigger_w ); diff --git a/src/mame/audio/trackfld.cpp b/src/mame/audio/trackfld.cpp index c884132b696..6f78f861712 100644 --- a/src/mame/audio/trackfld.cpp +++ b/src/mame/audio/trackfld.cpp @@ -13,7 +13,7 @@ const device_type TRACKFLD_AUDIO = &device_creator; -trackfld_audio_device::trackfld_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +trackfld_audio_device::trackfld_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TRACKFLD_AUDIO, "Track And Field Audio", tag, owner, clock, "trackfld_audio", __FILE__), device_sound_interface(mconfig, *this), m_last_addr(0), diff --git a/src/mame/audio/trackfld.h b/src/mame/audio/trackfld.h index c0c15552020..e1cf446f6a8 100644 --- a/src/mame/audio/trackfld.h +++ b/src/mame/audio/trackfld.h @@ -7,7 +7,7 @@ class trackfld_audio_device : public device_t, public device_sound_interface { public: - trackfld_audio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + trackfld_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~trackfld_audio_device() {} DECLARE_WRITE8_MEMBER(konami_sh_irqtrigger_w ); diff --git a/src/mame/audio/turrett.cpp b/src/mame/audio/turrett.cpp index 188d91e0315..bb1fee907b4 100644 --- a/src/mame/audio/turrett.cpp +++ b/src/mame/audio/turrett.cpp @@ -15,7 +15,7 @@ // turrett_device - constructor //------------------------------------------------- -turrett_device::turrett_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +turrett_device::turrett_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TURRETT, "Turret Tower Sound", tag, owner, clock, "ttsnd", __FILE__), device_sound_interface(mconfig, *this), device_memory_interface(mconfig, *this), diff --git a/src/mame/audio/tvc_snd.cpp b/src/mame/audio/tvc_snd.cpp index d7eb902994b..29d61b5dc7c 100644 --- a/src/mame/audio/tvc_snd.cpp +++ b/src/mame/audio/tvc_snd.cpp @@ -16,7 +16,7 @@ const device_type TVC_SOUND = &device_creator; // tvc_sound_device - constructor //------------------------------------------------- -tvc_sound_device::tvc_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +tvc_sound_device::tvc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TVC_SOUND, "TVC 64 Audio Custom", tag, owner, clock, "tvc_sound", __FILE__), device_sound_interface(mconfig, *this), m_write_sndint(*this) diff --git a/src/mame/audio/tvc_snd.h b/src/mame/audio/tvc_snd.h index 54f2e4594b0..1103a9c116c 100644 --- a/src/mame/audio/tvc_snd.h +++ b/src/mame/audio/tvc_snd.h @@ -25,7 +25,7 @@ class tvc_sound_device : public device_t, { public: // construction/destruction - tvc_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tvc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_sndint_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_sndint.set_callback(object); } diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp index 95c6dc0f694..93de637e22d 100644 --- a/src/mame/audio/tx1.cpp +++ b/src/mame/audio/tx1.cpp @@ -53,13 +53,13 @@ static const double tx1_engine_gains[16] = const device_type TX1 = &device_creator; -tx1_sound_device::tx1_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tx1_sound_device::tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TX1, "TX-1 Audio Custom", tag, owner, clock, "tx1_sound", __FILE__), device_sound_interface(mconfig, *this) { } -tx1_sound_device::tx1_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +tx1_sound_device::tx1_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_stream(nullptr), @@ -346,7 +346,7 @@ static const double bb_engine_gains[16] = const device_type BUGGYBOY = &device_creator; -buggyboy_sound_device::buggyboy_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +buggyboy_sound_device::buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tx1_sound_device(mconfig, BUGGYBOY, "Buggy Boy Audio Custom", tag, owner, clock, "buggyboy_sound", __FILE__) { } diff --git a/src/mame/audio/upd1771.cpp b/src/mame/audio/upd1771.cpp index c04bf96ff7a..e826aafee0f 100644 --- a/src/mame/audio/upd1771.cpp +++ b/src/mame/audio/upd1771.cpp @@ -233,7 +233,7 @@ static unsigned char noise_tbl[]= const device_type UPD1771C = &device_creator; -upd1771c_device::upd1771c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd1771c_device::upd1771c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, UPD1771C, "NEC uPD1771C 017", tag, owner, clock, "upd1771c", __FILE__), device_sound_interface(mconfig, *this), m_ack_handler(*this) diff --git a/src/mame/audio/upd1771.h b/src/mame/audio/upd1771.h index 9653c447a53..46ca16e0158 100644 --- a/src/mame/audio/upd1771.h +++ b/src/mame/audio/upd1771.h @@ -25,7 +25,7 @@ class upd1771c_device : public device_t, public device_sound_interface { public: - upd1771c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + upd1771c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~upd1771c_device() {} template static devcb_base &set_ack_handler(device_t &device, _Object object) { return downcast(device).m_ack_handler.set_callback(object); } diff --git a/src/mame/audio/vboy.cpp b/src/mame/audio/vboy.cpp index e27c77cbb36..f6b77630522 100644 --- a/src/mame/audio/vboy.cpp +++ b/src/mame/audio/vboy.cpp @@ -195,7 +195,7 @@ static inline void mputb(UINT8 *ptr, INT8 data) { *ptr = data; } // vboysnd_device - constructor //------------------------------------------------- -vboysnd_device::vboysnd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vboysnd_device::vboysnd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VBOYSND, "Virtual Boy audio", tag, owner, clock, "vboysnd", __FILE__), device_sound_interface(mconfig, *this) { diff --git a/src/mame/audio/vboy.h b/src/mame/audio/vboy.h index 0f028ae3796..f3d85d60c6f 100644 --- a/src/mame/audio/vboy.h +++ b/src/mame/audio/vboy.h @@ -73,7 +73,7 @@ class vboysnd_device : public device_t, public device_sound_interface { public: // construction/destruction - vboysnd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + vboysnd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); diff --git a/src/mame/audio/vc4000snd.cpp b/src/mame/audio/vc4000snd.cpp index 2d25524cb88..72a8e46b349 100644 --- a/src/mame/audio/vc4000snd.cpp +++ b/src/mame/audio/vc4000snd.cpp @@ -12,7 +12,7 @@ const device_type VC4000_SND = &device_creator; -vc4000_sound_device::vc4000_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vc4000_sound_device::vc4000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VC4000_SND, "Intertion Electronic VC 4000 Audio Custom", tag, owner, clock, "vc4000_sound", __FILE__), device_sound_interface(mconfig, *this), m_channel(nullptr), diff --git a/src/mame/audio/vc4000snd.h b/src/mame/audio/vc4000snd.h index 6b0ede4b485..d528fd501bc 100644 --- a/src/mame/audio/vc4000snd.h +++ b/src/mame/audio/vc4000snd.h @@ -21,7 +21,7 @@ class vc4000_sound_device : public device_t, public device_sound_interface { public: - vc4000_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + vc4000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~vc4000_sound_device() { } protected: diff --git a/src/mame/audio/warpwarp.cpp b/src/mame/audio/warpwarp.cpp index f5393f3434c..d0c17d54d77 100644 --- a/src/mame/audio/warpwarp.cpp +++ b/src/mame/audio/warpwarp.cpp @@ -18,7 +18,7 @@ const device_type WARPWARP = &device_creator; -warpwarp_sound_device::warpwarp_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +warpwarp_sound_device::warpwarp_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WARPWARP, "Warp Warp Audio Custom", tag, owner, clock, "warpwarp_sound", __FILE__), device_sound_interface(mconfig, *this), m_decay(nullptr), diff --git a/src/mame/audio/warpwarp.h b/src/mame/audio/warpwarp.h index 78a49135d1c..c14c61f63b5 100644 --- a/src/mame/audio/warpwarp.h +++ b/src/mame/audio/warpwarp.h @@ -4,7 +4,7 @@ class geebee_sound_device : public device_t, public device_sound_interface { public: - geebee_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); enum { @@ -43,7 +43,7 @@ class warpwarp_sound_device : public device_t, public device_sound_interface { public: - warpwarp_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + warpwarp_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); enum { diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp index 9577849d904..94d9a39673a 100644 --- a/src/mame/audio/williams.cpp +++ b/src/mame/audio/williams.cpp @@ -69,7 +69,7 @@ extern const device_type WILLIAMS_ADPCM_SOUND = &device_creator; -wiping_sound_device::wiping_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +wiping_sound_device::wiping_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WIPING, "Wiping Audio Custom", tag, owner, clock, "wiping_sound", __FILE__), device_sound_interface(mconfig, *this), m_last_channel(nullptr), diff --git a/src/mame/audio/wiping.h b/src/mame/audio/wiping.h index c61445ca2e1..f891ae8f5d8 100644 --- a/src/mame/audio/wiping.h +++ b/src/mame/audio/wiping.h @@ -18,7 +18,7 @@ class wiping_sound_device : public device_t, public device_sound_interface { public: - wiping_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wiping_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~wiping_sound_device() {} DECLARE_WRITE8_MEMBER( sound_w ); diff --git a/src/mame/audio/wpcsnd.cpp b/src/mame/audio/wpcsnd.cpp index 38b0131dde2..134456fe19b 100644 --- a/src/mame/audio/wpcsnd.cpp +++ b/src/mame/audio/wpcsnd.cpp @@ -13,7 +13,7 @@ const device_type WPCSND = &device_creator; -wpcsnd_device::wpcsnd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +wpcsnd_device::wpcsnd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig,WPCSND,"Williams WPC Sound",tag,owner,clock, "wpcsnd", __FILE__), m_cpu(*this,"bgcpu"), m_ym2151(*this,"ym2151"), @@ -107,7 +107,7 @@ void wpcsnd_device::device_reset() m_reply_available = false; } -void wpcsnd_device::static_set_gfxregion(device_t &device, std::string tag) +void wpcsnd_device::static_set_gfxregion(device_t &device, const char *tag) { wpcsnd_device &cpuboard = downcast(device); cpuboard.m_regiontag = tag; diff --git a/src/mame/audio/wpcsnd.h b/src/mame/audio/wpcsnd.h index 556a888202f..36c418bd9bf 100644 --- a/src/mame/audio/wpcsnd.h +++ b/src/mame/audio/wpcsnd.h @@ -26,7 +26,7 @@ class wpcsnd_device : public device_t { public: // construction/destruction - wpcsnd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wpcsnd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_cpu; required_device m_ym2151; @@ -49,7 +49,7 @@ public: UINT8 ctrl_r(); UINT8 data_r(); - static void static_set_gfxregion(device_t &device, std::string tag); + static void static_set_gfxregion(device_t &device, const char *tag); // callbacks template void set_reply_callback(_reply reply) { m_reply_cb.set_callback(reply); } @@ -61,7 +61,7 @@ protected: virtual machine_config_constructor device_mconfig_additions() const override; private: - std::string m_regiontag; + const char* m_regiontag; UINT8 m_latch; UINT8 m_reply; bool m_reply_available; diff --git a/src/mame/audio/wswan_snd.cpp b/src/mame/audio/wswan_snd.cpp index f679c36149d..42918fb191b 100644 --- a/src/mame/audio/wswan_snd.cpp +++ b/src/mame/audio/wswan_snd.cpp @@ -28,7 +28,7 @@ const device_type WSWAN_SND = &device_creator; // wswan_sound_device - constructor //------------------------------------------------- -wswan_sound_device::wswan_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +wswan_sound_device::wswan_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WSWAN_SND, "WonderSwan Audio Custom", tag, owner, clock, "wswan_sound", __FILE__), device_sound_interface(mconfig, *this), m_channel(nullptr), diff --git a/src/mame/audio/wswan_snd.h b/src/mame/audio/wswan_snd.h index 4c353268fac..227922e3cf9 100644 --- a/src/mame/audio/wswan_snd.h +++ b/src/mame/audio/wswan_snd.h @@ -44,7 +44,7 @@ class wswan_sound_device : public device_t, public device_sound_interface { public: - wswan_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wswan_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~wswan_sound_device() { } protected: diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp index 12f7e77e69e..55b4b8c6ee3 100644 --- a/src/mame/drivers/1945kiii.cpp +++ b/src/mame/drivers/1945kiii.cpp @@ -52,7 +52,7 @@ Notes: class k3_state : public driver_device { public: - k3_state(const machine_config &mconfig, device_type type, std::string tag) + k3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_oki1(*this, "oki1"), m_oki2(*this, "oki2") , diff --git a/src/mame/drivers/24cdjuke.cpp b/src/mame/drivers/24cdjuke.cpp index b56775a48b7..7a9e17d325e 100644 --- a/src/mame/drivers/24cdjuke.cpp +++ b/src/mame/drivers/24cdjuke.cpp @@ -60,7 +60,7 @@ http://www.tilt.it/deb/i-midcoin.html class midcoin24cdjuke_state : public driver_device { public: - midcoin24cdjuke_state(const machine_config &mconfig, device_type type, std::string tag) + midcoin24cdjuke_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_io_row0(*this, "ROW0"), diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp index d02679367e2..d1f27dd46ab 100644 --- a/src/mame/drivers/2mindril.cpp +++ b/src/mame/drivers/2mindril.cpp @@ -43,7 +43,7 @@ DAC -26.6860Mhz class _2mindril_state : public taito_f3_state { public: - _2mindril_state(const machine_config &mconfig, device_type type, std::string tag) + _2mindril_state(const machine_config &mconfig, device_type type, const char *tag) : taito_f3_state(mconfig, type, tag), m_iodata(*this, "iodata") { } diff --git a/src/mame/drivers/30test.cpp b/src/mame/drivers/30test.cpp index 8042713b864..c41167a52de 100644 --- a/src/mame/drivers/30test.cpp +++ b/src/mame/drivers/30test.cpp @@ -53,7 +53,7 @@ http://blogs.yahoo.co.jp/nadegatayosoyuki/59285865.html class namco_30test_state : public driver_device { public: - namco_30test_state(const machine_config &mconfig, device_type type, std::string tag) + namco_30test_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki") { } diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp index 940fb3268a7..0c5bdcafc11 100644 --- a/src/mame/drivers/39in1.cpp +++ b/src/mame/drivers/39in1.cpp @@ -32,7 +32,7 @@ class _39in1_state : public driver_device { public: - _39in1_state(const machine_config &mconfig, device_type type, std::string tag) + _39in1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this, "ram"), m_eeprom(*this, "eeprom"), diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp index 30ab32776f7..38ccc0c15a6 100644 --- a/src/mame/drivers/3x3puzzl.cpp +++ b/src/mame/drivers/3x3puzzl.cpp @@ -49,7 +49,7 @@ Notes: class _3x3puzzle_state : public driver_device { public: - _3x3puzzle_state(const machine_config &mconfig, device_type type, std::string tag) + _3x3puzzle_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram1(*this, "videoram1"), m_videoram2(*this, "videoram2"), diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp index 97f202d826f..224102e80ef 100644 --- a/src/mame/drivers/4004clk.cpp +++ b/src/mame/drivers/4004clk.cpp @@ -16,7 +16,7 @@ class nixieclock_state : public driver_device { public: - nixieclock_state(const machine_config &mconfig, device_type type, std::string tag) + nixieclock_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp index 6a45f124855..7feead80bea 100644 --- a/src/mame/drivers/4dpi.cpp +++ b/src/mame/drivers/4dpi.cpp @@ -29,7 +29,7 @@ struct ip6_regs_t class sgi_ip6_state : public driver_device { public: - sgi_ip6_state(const machine_config &mconfig, device_type type, std::string tag) + sgi_ip6_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp index 50c2470a174..86328de8c88 100644 --- a/src/mame/drivers/4enlinea.cpp +++ b/src/mame/drivers/4enlinea.cpp @@ -207,7 +207,7 @@ class _4enlinea_state : public driver_device { public: - _4enlinea_state(const machine_config &mconfig, device_type type, std::string tag) + _4enlinea_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ay(*this, "aysnd"), m_maincpu(*this, "maincpu") @@ -244,7 +244,7 @@ class isa8_cga_4enlinea_device : public isa8_cga_device { public: // construction/destruction - isa8_cga_4enlinea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_cga_4enlinea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER( _4enlinea_io_read ); DECLARE_WRITE8_MEMBER( _4enlinea_mode_control_w ); @@ -259,7 +259,7 @@ const rom_entry *isa8_cga_4enlinea_device::device_rom_region() const const device_type ISA8_CGA_4ENLINEA = &device_creator; -isa8_cga_4enlinea_device::isa8_cga_4enlinea_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_cga_4enlinea_device::isa8_cga_4enlinea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_CGA_4ENLINEA, "ISA8_CGA_4ENLINEA", tag, owner, clock, "4enlinea_cga", __FILE__) { } diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp index 38ed2e6ed29..acfa158233b 100644 --- a/src/mame/drivers/4roses.cpp +++ b/src/mame/drivers/4roses.cpp @@ -185,7 +185,7 @@ class _4roses_state : public funworld_state { public: - _4roses_state(const machine_config &mconfig, device_type type, std::string tag) + _4roses_state(const machine_config &mconfig, device_type type, const char *tag) : funworld_state(mconfig, type, tag) { } DECLARE_DRIVER_INIT(4roses); diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp index a333f813e3d..c0d07547e2d 100644 --- a/src/mame/drivers/5clown.cpp +++ b/src/mame/drivers/5clown.cpp @@ -456,7 +456,7 @@ class _5clown_state : public driver_device { public: - _5clown_state(const machine_config &mconfig, device_type type, std::string tag) + _5clown_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/68ksbc.cpp b/src/mame/drivers/68ksbc.cpp index 348d9611f9f..2ff1bc85cac 100644 --- a/src/mame/drivers/68ksbc.cpp +++ b/src/mame/drivers/68ksbc.cpp @@ -35,7 +35,7 @@ class c68ksbc_state : public driver_device { public: - c68ksbc_state(const machine_config &mconfig, device_type type, std::string tag) : + c68ksbc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_acia(*this, "acia") diff --git a/src/mame/drivers/a1supply.cpp b/src/mame/drivers/a1supply.cpp index 76fe19bd74d..12f9a7447d1 100644 --- a/src/mame/drivers/a1supply.cpp +++ b/src/mame/drivers/a1supply.cpp @@ -38,7 +38,7 @@ class a1supply_state : public driver_device { public: - a1supply_state(const machine_config &mconfig, device_type type, std::string tag) + a1supply_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp index 077f2b28404..fc0f9bc5cdf 100644 --- a/src/mame/drivers/a2600.cpp +++ b/src/mame/drivers/a2600.cpp @@ -45,7 +45,7 @@ TODO: class a2600_state : public driver_device { public: - a2600_state(const machine_config &mconfig, device_type type, std::string tag) + a2600_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_riot_ram(*this, "riot_ram"), m_joy1(*this, CONTROL1_TAG), diff --git a/src/mame/drivers/a310.cpp b/src/mame/drivers/a310.cpp index 01a6004f2a0..7acb2a355c9 100644 --- a/src/mame/drivers/a310.cpp +++ b/src/mame/drivers/a310.cpp @@ -73,7 +73,7 @@ class a310_state : public archimedes_state { public: - a310_state(const machine_config &mconfig, device_type type, std::string tag) + a310_state(const machine_config &mconfig, device_type type, const char *tag) : archimedes_state(mconfig, type, tag) , m_physram(*this, "physicalram") , m_ram(*this, RAM_TAG) diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp index f0463d08d11..44222bdb920 100644 --- a/src/mame/drivers/a5105.cpp +++ b/src/mame/drivers/a5105.cpp @@ -37,7 +37,7 @@ ToDo: class a5105_state : public driver_device { public: - a5105_state(const machine_config &mconfig, device_type type, std::string tag) + a5105_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_hgdc(*this, "upd7220"), diff --git a/src/mame/drivers/a51xx.cpp b/src/mame/drivers/a51xx.cpp index 9732b027e34..2284450bde4 100644 --- a/src/mame/drivers/a51xx.cpp +++ b/src/mame/drivers/a51xx.cpp @@ -18,7 +18,7 @@ class a51xx_state : public driver_device { public: - a51xx_state(const machine_config &mconfig, device_type type, std::string tag) + a51xx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp index 4016146f578..98b57f5af99 100644 --- a/src/mame/drivers/a6809.cpp +++ b/src/mame/drivers/a6809.cpp @@ -62,7 +62,7 @@ enter show next address class a6809_state : public driver_device { public: - a6809_state(const machine_config &mconfig, device_type type, std::string tag) + a6809_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_p_videoram(*this, "videoram") , m_via(*this, "via") diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp index 675411ffd51..3559e6548b2 100644 --- a/src/mame/drivers/a7150.cpp +++ b/src/mame/drivers/a7150.cpp @@ -17,7 +17,7 @@ class a7150_state : public driver_device { public: - a7150_state(const machine_config &mconfig, device_type type, std::string tag) + a7150_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp index 10d18b3b3a8..eda5f74ac07 100644 --- a/src/mame/drivers/a7800.cpp +++ b/src/mame/drivers/a7800.cpp @@ -112,7 +112,7 @@ class a7800_state : public driver_device { public: - a7800_state(const machine_config &mconfig, device_type type, std::string tag) + a7800_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tia(*this, "tia"), diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp index 32d96656abe..57d96585296 100644 --- a/src/mame/drivers/ace.cpp +++ b/src/mame/drivers/ace.cpp @@ -50,7 +50,7 @@ A1 2101 2101 class aceal_state : public driver_device { public: - aceal_state(const machine_config &mconfig, device_type type, std::string tag) + aceal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_scoreram(*this, "scoreram"), diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp index 9e4f3bcaa48..b869458ace4 100644 --- a/src/mame/drivers/acefruit.cpp +++ b/src/mame/drivers/acefruit.cpp @@ -20,7 +20,7 @@ Inputs and Dip Switches by Stephh class acefruit_state : public driver_device { public: - acefruit_state(const machine_config &mconfig, device_type type, std::string tag) + acefruit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_videoram(*this, "videoram"), diff --git a/src/mame/drivers/aces1.cpp b/src/mame/drivers/aces1.cpp index 13a55d69216..4bc18a85aa9 100644 --- a/src/mame/drivers/aces1.cpp +++ b/src/mame/drivers/aces1.cpp @@ -37,7 +37,7 @@ JPM style Reel MCU? Certainly reel data seems to be muxed together in aweird way class aces1_state : public driver_device { public: - aces1_state(const machine_config &mconfig, device_type type, std::string tag) + aces1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_reel0(*this, "reel0"), diff --git a/src/mame/drivers/acesp.cpp b/src/mame/drivers/acesp.cpp index e0011488774..1a83aa85aa4 100644 --- a/src/mame/drivers/acesp.cpp +++ b/src/mame/drivers/acesp.cpp @@ -23,7 +23,7 @@ class ace_sp_state : public driver_device { public: - ace_sp_state(const machine_config &mconfig, device_type type, std::string tag) + ace_sp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/acommand.cpp b/src/mame/drivers/acommand.cpp index 3765aa69713..5da92a119ce 100644 --- a/src/mame/drivers/acommand.cpp +++ b/src/mame/drivers/acommand.cpp @@ -65,7 +65,7 @@ JALCF1 BIN 1,048,576 02-07-99 1:11a JALCF1.BIN class acommand_state : public driver_device { public: - acommand_state(const machine_config &mconfig, device_type type, std::string tag) + acommand_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ac_bgvram(*this, "ac_bgvram"), m_ac_txvram(*this, "ac_txvram"), diff --git a/src/mame/drivers/acrnsys1.cpp b/src/mame/drivers/acrnsys1.cpp index 5622bf0865a..41efa342a61 100644 --- a/src/mame/drivers/acrnsys1.cpp +++ b/src/mame/drivers/acrnsys1.cpp @@ -58,7 +58,7 @@ Note that left-most digit is not wired up, and therefore will always be blank. class acrnsys1_state : public driver_device { public: - acrnsys1_state(const machine_config &mconfig, device_type type, std::string tag) + acrnsys1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ttl74145(*this, "ic8_7445"), diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp index 954030206a5..d8271bdba30 100644 --- a/src/mame/drivers/adp.cpp +++ b/src/mame/drivers/adp.cpp @@ -168,7 +168,7 @@ Quick Jack administration/service mode: class adp_state : public driver_device { public: - adp_state(const machine_config &mconfig, device_type type, std::string tag) + adp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_microtouch(*this, "microtouch"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/age_candy.cpp b/src/mame/drivers/age_candy.cpp index 8945e0be88a..986b9d3771c 100644 --- a/src/mame/drivers/age_candy.cpp +++ b/src/mame/drivers/age_candy.cpp @@ -18,7 +18,7 @@ Device is a 27c256 location U3 class age_candy_state : public driver_device { public: - age_candy_state(const machine_config &mconfig, device_type type, std::string tag) + age_candy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) // ,m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/aim65_40.cpp b/src/mame/drivers/aim65_40.cpp index e93f88b630c..df749db8493 100644 --- a/src/mame/drivers/aim65_40.cpp +++ b/src/mame/drivers/aim65_40.cpp @@ -71,7 +71,7 @@ The source code there implies that *maybe* ff7e and ff7f are also open bus. class aim65_40_state : public driver_device { public: - aim65_40_state(const machine_config &mconfig, device_type type, std::string tag) + aim65_40_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } // devices diff --git a/src/mame/drivers/albazc.cpp b/src/mame/drivers/albazc.cpp index 522d7fca889..febf07ebf82 100644 --- a/src/mame/drivers/albazc.cpp +++ b/src/mame/drivers/albazc.cpp @@ -19,7 +19,7 @@ TODO: class albazc_state : public driver_device { public: - albazc_state(const machine_config &mconfig, device_type type, std::string tag) + albazc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram1(*this, "spriteram1"), m_spriteram2(*this, "spriteram2"), diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp index 39f478e5d13..9666975f2f3 100644 --- a/src/mame/drivers/albazg.cpp +++ b/src/mame/drivers/albazg.cpp @@ -46,7 +46,7 @@ PCB: class albazg_state : public driver_device { public: - albazg_state(const machine_config &mconfig, device_type type, std::string tag) + albazg_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cus_ram(*this, "cus_ram"), m_videoram(*this, "videoram"), diff --git a/src/mame/drivers/aleck64.cpp b/src/mame/drivers/aleck64.cpp index b48ed8e0a35..26499c7b9b2 100644 --- a/src/mame/drivers/aleck64.cpp +++ b/src/mame/drivers/aleck64.cpp @@ -178,7 +178,7 @@ Notes: class aleck64_state : public n64_state { public: - aleck64_state(const machine_config &mconfig, device_type type, std::string tag) + aleck64_state(const machine_config &mconfig, device_type type, const char *tag) : n64_state(mconfig, type, tag), m_e90_vram(*this,"e90vram"), m_e90_pal(*this,"e90pal"), diff --git a/src/mame/drivers/aleisttl.cpp b/src/mame/drivers/aleisttl.cpp index 1b8504350a9..75021c37dda 100644 --- a/src/mame/drivers/aleisttl.cpp +++ b/src/mame/drivers/aleisttl.cpp @@ -49,7 +49,7 @@ class sburners_state : public driver_device { public: - sburners_state(const machine_config &mconfig, device_type type, std::string tag) + sburners_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index 3f0709eb6a4..6cc10cfd788 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -34,7 +34,7 @@ class alg_state : public amiga_state { public: - alg_state(const machine_config &mconfig, device_type type, std::string tag) + alg_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_laserdisc(*this, "laserdisc"), m_gun1x(*this, "GUN1X"), diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp index a401a333bfa..46daf7e6499 100644 --- a/src/mame/drivers/alien.cpp +++ b/src/mame/drivers/alien.cpp @@ -24,7 +24,7 @@ class alien_state : public driver_device { public: - alien_state(const machine_config &mconfig, device_type type, std::string tag) + alien_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/alinvade.cpp b/src/mame/drivers/alinvade.cpp index 1f4ea073ce7..25f378ed388 100644 --- a/src/mame/drivers/alinvade.cpp +++ b/src/mame/drivers/alinvade.cpp @@ -27,7 +27,7 @@ class alinvade_state : public driver_device { public: - alinvade_state(const machine_config &mconfig, device_type type, std::string tag) + alinvade_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_videoram(*this, "videoram") diff --git a/src/mame/drivers/allied.cpp b/src/mame/drivers/allied.cpp index 6e7631653b3..9b96c72ab22 100644 --- a/src/mame/drivers/allied.cpp +++ b/src/mame/drivers/allied.cpp @@ -51,7 +51,7 @@ ToDo: class allied_state : public genpin_class { public: - allied_state(const machine_config &mconfig, device_type type, std::string tag) + allied_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_ic1(*this, "ic1") diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp index 6a6a94feff7..f7f0d58d3a5 100644 --- a/src/mame/drivers/alphasma.cpp +++ b/src/mame/drivers/alphasma.cpp @@ -22,7 +22,7 @@ class alphasmart_state : public driver_device { public: - alphasmart_state(const machine_config &mconfig, device_type type, std::string tag) + alphasmart_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_lcdc0(*this, "ks0066_0"), @@ -68,7 +68,7 @@ protected: class asma2k_state : public alphasmart_state { public: - asma2k_state(const machine_config &mconfig, device_type type, std::string tag) + asma2k_state(const machine_config &mconfig, device_type type, const char *tag) : alphasmart_state(mconfig, type, tag), m_intram(*this, "internal_ram") { } diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp index 9a0aee95ed2..a5a3968d8aa 100644 --- a/src/mame/drivers/alphatro.cpp +++ b/src/mame/drivers/alphatro.cpp @@ -58,7 +58,7 @@ public: TIMER_SYSTEM }; - alphatro_state(const machine_config &mconfig, device_type type, std::string tag) + alphatro_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_p_videoram(*this, "videoram") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/altair.cpp b/src/mame/drivers/altair.cpp index e2b8d9edd97..18a9589cd03 100644 --- a/src/mame/drivers/altair.cpp +++ b/src/mame/drivers/altair.cpp @@ -28,7 +28,7 @@ class altair_state : public driver_device { public: - altair_state(const machine_config &mconfig, device_type type, std::string tag) : + altair_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mc6850(*this, "mc6850"), diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp index bcb61750b67..c2142b0c304 100644 --- a/src/mame/drivers/alto2.cpp +++ b/src/mame/drivers/alto2.cpp @@ -13,7 +13,7 @@ class alto2_state : public driver_device { public: - alto2_state(const machine_config &mconfig, device_type type, std::string tag) : + alto2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_io_row0(*this, "ROW0"), diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp index 6ea298ec2fb..96fd75ae2e4 100644 --- a/src/mame/drivers/altos5.cpp +++ b/src/mame/drivers/altos5.cpp @@ -27,7 +27,7 @@ class altos5_state : public driver_device { public: - altos5_state(const machine_config &mconfig, device_type type, std::string tag) + altos5_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pio0(*this, "z80pio_0"), diff --git a/src/mame/drivers/alvg.cpp b/src/mame/drivers/alvg.cpp index 9ed9bbc978e..700561e437c 100644 --- a/src/mame/drivers/alvg.cpp +++ b/src/mame/drivers/alvg.cpp @@ -7,7 +7,7 @@ class alvg_state : public driver_device { public: - alvg_state(const machine_config &mconfig, device_type type, std::string tag) + alvg_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp index c3c2cf78196..3640330b2f3 100644 --- a/src/mame/drivers/amaticmg.cpp +++ b/src/mame/drivers/amaticmg.cpp @@ -429,7 +429,7 @@ class amaticmg_state : public driver_device { public: - amaticmg_state(const machine_config &mconfig, device_type type, std::string tag) + amaticmg_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_attr(*this, "attr"), m_vram(*this, "vram"), diff --git a/src/mame/drivers/amerihok.cpp b/src/mame/drivers/amerihok.cpp index 94c97b27273..aa8a19ae9e2 100644 --- a/src/mame/drivers/amerihok.cpp +++ b/src/mame/drivers/amerihok.cpp @@ -22,7 +22,7 @@ Processor is unknown class amerihok_state : public driver_device { public: - amerihok_state(const machine_config &mconfig, device_type type, std::string tag) + amerihok_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) // ,m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/amico2k.cpp b/src/mame/drivers/amico2k.cpp index 9f2e88ed7bf..0bb1952d8a3 100644 --- a/src/mame/drivers/amico2k.cpp +++ b/src/mame/drivers/amico2k.cpp @@ -39,7 +39,7 @@ class amico2k_state : public driver_device { public: - amico2k_state(const machine_config &mconfig, device_type type, std::string tag) + amico2k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp index 5fcb4d3dbf8..47d42f93d0b 100644 --- a/src/mame/drivers/amiga.cpp +++ b/src/mame/drivers/amiga.cpp @@ -32,7 +32,7 @@ class a1000_state : public amiga_state { public: - a1000_state(const machine_config &mconfig, device_type type, std::string tag) : + a1000_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_bootrom(*this, "bootrom"), m_wom(*this, "wom") @@ -56,7 +56,7 @@ private: class a2000_state : public amiga_state { public: - a2000_state(const machine_config &mconfig, device_type type, std::string tag) : + a2000_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_rtc(*this, "u65"), m_zorro(*this, ZORROBUS_TAG), @@ -93,7 +93,7 @@ private: class a500_state : public amiga_state { public: - a500_state(const machine_config &mconfig, device_type type, std::string tag) : + a500_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_side(*this, EXP_SLOT_TAG), m_side_int2(0), @@ -122,7 +122,7 @@ private: class cdtv_state : public amiga_state { public: - cdtv_state(const machine_config &mconfig, device_type type, std::string tag) : + cdtv_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_rtc(*this, "u61"), m_dmac(*this, "u36"), @@ -170,7 +170,7 @@ private: class a3000_state : public amiga_state { public: - a3000_state(const machine_config &mconfig, device_type type, std::string tag) : + a3000_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag) { } @@ -190,7 +190,7 @@ private: class a500p_state : public amiga_state { public: - a500p_state(const machine_config &mconfig, device_type type, std::string tag) : + a500p_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_rtc(*this, "u9"), m_side(*this, EXP_SLOT_TAG), @@ -224,7 +224,7 @@ private: class a600_state : public amiga_state { public: - a600_state(const machine_config &mconfig, device_type type, std::string tag) : + a600_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_gayle_int2(0) { } @@ -246,7 +246,7 @@ private: class a1200_state : public amiga_state { public: - a1200_state(const machine_config &mconfig, device_type type, std::string tag) : + a1200_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_gayle_int2(0) { } @@ -268,7 +268,7 @@ private: class a4000_state : public amiga_state { public: - a4000_state(const machine_config &mconfig, device_type type, std::string tag) : + a4000_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_ata(*this, "ata"), m_ramsey_config(0), @@ -304,7 +304,7 @@ private: class cd32_state : public amiga_state { public: - cd32_state(const machine_config &mconfig, device_type type, std::string tag) : + cd32_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_p1_port(*this, "p1_cd32_buttons"), m_p2_port(*this, "p2_cd32_buttons"), diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp index 089a209a1ca..6aef2a6f984 100644 --- a/src/mame/drivers/ampro.cpp +++ b/src/mame/drivers/ampro.cpp @@ -32,7 +32,7 @@ ToDo: class ampro_state : public driver_device { public: - ampro_state(const machine_config &mconfig, device_type type, std::string tag) + ampro_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_dart(*this, "z80dart") diff --git a/src/mame/drivers/amstr_pc.cpp b/src/mame/drivers/amstr_pc.cpp index 803a8236b9e..d33fa47a6b3 100644 --- a/src/mame/drivers/amstr_pc.cpp +++ b/src/mame/drivers/amstr_pc.cpp @@ -41,7 +41,7 @@ More information can be found at http://www.seasip.info/AmstradXT/1640tech/index class amstrad_pc_state : public driver_device { public: - amstrad_pc_state(const machine_config &mconfig, device_type type, std::string tag) + amstrad_pc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mb(*this, "mb"), diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp index e1a19014d27..9ed26923a71 100644 --- a/src/mame/drivers/amusco.cpp +++ b/src/mame/drivers/amusco.cpp @@ -83,7 +83,7 @@ class amusco_state : public driver_device { public: - amusco_state(const machine_config &mconfig, device_type type, std::string tag) + amusco_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp index a2bcdaf9536..4c1848fc548 100644 --- a/src/mame/drivers/amust.cpp +++ b/src/mame/drivers/amust.cpp @@ -99,7 +99,7 @@ public: TIMER_BEEP_OFF }; - amust_state(const machine_config &mconfig, device_type type, std::string tag) + amust_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp index 876a2602fad..12f978f2584 100644 --- a/src/mame/drivers/apc.cpp +++ b/src/mame/drivers/apc.cpp @@ -70,7 +70,7 @@ class apc_state : public driver_device { public: - apc_state(const machine_config &mconfig, device_type type, std::string tag) + apc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_hgdc1(*this, "upd7220_chr"), diff --git a/src/mame/drivers/apexc.cpp b/src/mame/drivers/apexc.cpp index 1c804da871d..dd992f1a209 100644 --- a/src/mame/drivers/apexc.cpp +++ b/src/mame/drivers/apexc.cpp @@ -15,7 +15,7 @@ class apexc_state : public driver_device { public: - apexc_state(const machine_config &mconfig, device_type type, std::string tag) + apexc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), @@ -74,7 +74,7 @@ class apexc_cylinder_image_device : public device_t, public device_image_interfa { public: // construction/destruction - apexc_cylinder_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + apexc_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_CYLINDER; } @@ -100,7 +100,7 @@ private: const device_type APEXC_CYLINDER = &device_creator; -apexc_cylinder_image_device::apexc_cylinder_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +apexc_cylinder_image_device::apexc_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, APEXC_CYLINDER, "APEXC Cylinder", tag, owner, clock, "apexc_cylinder_image", __FILE__), device_image_interface(mconfig, *this) { @@ -203,7 +203,7 @@ class apexc_tape_puncher_image_device : public device_t, public device_image_int { public: // construction/destruction - apexc_tape_puncher_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + apexc_tape_puncher_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_PUNCHTAPE; } @@ -224,7 +224,7 @@ protected: const device_type APEXC_TAPE_PUNCHER = &device_creator; -apexc_tape_puncher_image_device::apexc_tape_puncher_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +apexc_tape_puncher_image_device::apexc_tape_puncher_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, APEXC_TAPE_PUNCHER, "APEXC Tape Puncher", tag, owner, clock, "apexc_tape_puncher_image", __FILE__), device_image_interface(mconfig, *this) { @@ -237,7 +237,7 @@ class apexc_tape_reader_image_device : public device_t, public device_image_int { public: // construction/destruction - apexc_tape_reader_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + apexc_tape_reader_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_PUNCHTAPE; } @@ -258,7 +258,7 @@ protected: const device_type APEXC_TAPE_READER = &device_creator; -apexc_tape_reader_image_device::apexc_tape_reader_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +apexc_tape_reader_image_device::apexc_tape_reader_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, APEXC_TAPE_READER, "APEXC Tape Reader", tag, owner, clock, "apexc_tape_reader_image", __FILE__), device_image_interface(mconfig, *this) { diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp index 3ecda64162e..d82f3107ace 100644 --- a/src/mame/drivers/apf.cpp +++ b/src/mame/drivers/apf.cpp @@ -87,7 +87,7 @@ ToDo: class apf_state : public driver_device { public: - apf_state(const machine_config &mconfig, device_type type, std::string tag) + apf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_has_cart_ram(false) , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/apogee.cpp b/src/mame/drivers/apogee.cpp index 7e73221b6df..fec2d5608fe 100644 --- a/src/mame/drivers/apogee.cpp +++ b/src/mame/drivers/apogee.cpp @@ -23,7 +23,7 @@ class apogee_state : public radio86_state { public: - apogee_state(const machine_config &mconfig, device_type type, std::string tag) + apogee_state(const machine_config &mconfig, device_type type, const char *tag) : radio86_state(mconfig, type, tag), m_speaker(*this, "speaker") { } diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp index 1bdc2ab10ea..ed229a55cc1 100644 --- a/src/mame/drivers/apollo.cpp +++ b/src/mame/drivers/apollo.cpp @@ -132,7 +132,7 @@ const char *apollo_cpu_context(device_t *cpu) { int s = t / osd_ticks_per_second(); int ms = (t % osd_ticks_per_second()) / 1000; - sprintf(statebuf, "%d.%03d %s pc=%08x", s, ms, cpu->tag().c_str(), cpu->safe_pcbase()); + sprintf(statebuf, "%d.%03d %s pc=%08x", s, ms, cpu->tag(), cpu->safe_pcbase()); } else { strcpy(statebuf, "(no context)"); } diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp index 4021d4e201e..efbd8b157ca 100644 --- a/src/mame/drivers/apple2.cpp +++ b/src/mame/drivers/apple2.cpp @@ -94,7 +94,7 @@ II Plus: RAM options reduced to 16/32/48 KB. class napple2_state : public driver_device { public: - napple2_state(const machine_config &mconfig, device_type type, std::string tag) + napple2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, A2_CPU_TAG), m_ram(*this, RAM_TAG), diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index 57bffb6b852..99bc10dc341 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -192,7 +192,7 @@ Address bus A0-A11 is Y0-Y11 class apple2e_state : public driver_device { public: - apple2e_state(const machine_config &mconfig, device_type type, std::string tag) + apple2e_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, A2_CPU_TAG), m_ram(*this, RAM_TAG), diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp index b28bdd15df9..f2cd3a9650a 100644 --- a/src/mame/drivers/applix.cpp +++ b/src/mame/drivers/applix.cpp @@ -52,7 +52,7 @@ class applix_state : public driver_device { public: - applix_state(const machine_config &mconfig, device_type type, std::string tag) + applix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_base(*this, "base"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp index edaf6719988..126cd1d6452 100644 --- a/src/mame/drivers/apricot.cpp +++ b/src/mame/drivers/apricot.cpp @@ -34,7 +34,7 @@ class apricot_state : public driver_device { public: - apricot_state(const machine_config &mconfig, device_type type, std::string tag) : + apricot_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cpu(*this, "ic91"), m_iop(*this, "ic71"), diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp index 2cca8965ff2..8c990e46c48 100644 --- a/src/mame/drivers/apricotf.cpp +++ b/src/mame/drivers/apricotf.cpp @@ -58,7 +58,7 @@ class f1_state : public driver_device { public: - f1_state(const machine_config &mconfig, device_type type, std::string tag) + f1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I8086_TAG), m_ctc(*this, Z80CTC_TAG), diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp index 9e25071da73..52107c217fb 100644 --- a/src/mame/drivers/apricotp.cpp +++ b/src/mame/drivers/apricotp.cpp @@ -83,7 +83,7 @@ enum class fp_state : public driver_device { public: - fp_state(const machine_config &mconfig, device_type type, std::string tag) + fp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I8086_TAG), m_soundcpu(*this, HD63B01V1_TAG), diff --git a/src/mame/drivers/arachnid.cpp b/src/mame/drivers/arachnid.cpp index 86fb9d7ef8b..302db21b4e4 100644 --- a/src/mame/drivers/arachnid.cpp +++ b/src/mame/drivers/arachnid.cpp @@ -77,7 +77,7 @@ class arachnid_state : public driver_device { public: - arachnid_state(const machine_config &mconfig, device_type type, std::string tag) + arachnid_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M6809_TAG), m_pia_u4(*this, PIA6821_U4_TAG), diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp index 5886e808188..a9925128402 100644 --- a/src/mame/drivers/argo.cpp +++ b/src/mame/drivers/argo.cpp @@ -35,7 +35,7 @@ public: TIMER_BOOT }; - argo_state(const machine_config &mconfig, device_type type, std::string tag) + argo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_p_videoram(*this, "p_videoram"){ } diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp index dbe04a1ec53..6d6a2b4b7e2 100644 --- a/src/mame/drivers/aristmk4.cpp +++ b/src/mame/drivers/aristmk4.cpp @@ -344,7 +344,7 @@ UINT8 crtc_reg = 0; class aristmk4_state : public driver_device { public: - aristmk4_state(const machine_config &mconfig, device_type type, std::string tag) + aristmk4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_rtc(*this, "rtc"), diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp index 217ccee0684..882fd175d2a 100644 --- a/src/mame/drivers/aristmk5.cpp +++ b/src/mame/drivers/aristmk5.cpp @@ -178,7 +178,7 @@ class aristmk5_state : public archimedes_state { public: - aristmk5_state(const machine_config &mconfig, device_type type, std::string tag) + aristmk5_state(const machine_config &mconfig, device_type type, const char *tag) : archimedes_state(mconfig, type, tag) { } emu_timer *m_mk5_2KHz_timer; diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp index 0669242caaf..89b03477cb7 100644 --- a/src/mame/drivers/aristmk6.cpp +++ b/src/mame/drivers/aristmk6.cpp @@ -31,7 +31,7 @@ notes: class aristmk6_state : public driver_device { public: - aristmk6_state(const machine_config &mconfig, device_type type, std::string tag) + aristmk6_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_uart0(*this, "uart0"), diff --git a/src/mame/drivers/arsystems.cpp b/src/mame/drivers/arsystems.cpp index baae3b413de..3f179e9af70 100644 --- a/src/mame/drivers/arsystems.cpp +++ b/src/mame/drivers/arsystems.cpp @@ -61,7 +61,7 @@ class arcadia_amiga_state : public amiga_state { public: - arcadia_amiga_state(const machine_config &mconfig, device_type type, std::string tag) + arcadia_amiga_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag) { } UINT8 m_coin_counter[2]; @@ -87,7 +87,7 @@ public: DECLARE_DRIVER_INIT(dlta); DECLARE_DRIVER_INIT(argh); - inline void generic_decode(std::string tag, int bit7, int bit6, int bit5, int bit4, int bit3, int bit2, int bit1, int bit0); + inline void generic_decode(const char *tag, int bit7, int bit6, int bit5, int bit4, int bit3, int bit2, int bit1, int bit0); protected: virtual void machine_reset() override; @@ -880,7 +880,7 @@ ROM_END * *************************************/ -void arcadia_amiga_state::generic_decode(std::string tag, int bit7, int bit6, int bit5, int bit4, int bit3, int bit2, int bit1, int bit0) +void arcadia_amiga_state::generic_decode(const char *tag, int bit7, int bit6, int bit5, int bit4, int bit3, int bit2, int bit1, int bit0) { UINT16 *rom = (UINT16 *)memregion(tag)->base(); int i; diff --git a/src/mame/drivers/asst128.cpp b/src/mame/drivers/asst128.cpp index 8c13ca858be..7ee9e464a66 100644 --- a/src/mame/drivers/asst128.cpp +++ b/src/mame/drivers/asst128.cpp @@ -13,7 +13,7 @@ class asst128_mb_device : public ibm5150_mb_device { public: // construction/destruction - asst128_mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) + asst128_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ibm5150_mb_device(mconfig, tag, owner, clock) { } protected: @@ -39,7 +39,7 @@ class asst128_state : public driver_device { public: // construction/destruction - asst128_state(const machine_config &mconfig, device_type type, std::string tag) + asst128_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_mb(*this, "mb") diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp index 9481fdbad76..f98cccb3500 100644 --- a/src/mame/drivers/astinvad.cpp +++ b/src/mame/drivers/astinvad.cpp @@ -52,7 +52,7 @@ public: TIMER_INT_GEN }; - astinvad_state(const machine_config &mconfig, device_type type, std::string tag) + astinvad_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppi8255_0(*this, "ppi8255_0"), diff --git a/src/mame/drivers/astrafr.cpp b/src/mame/drivers/astrafr.cpp index a8aba6faff4..578ac656b8a 100644 --- a/src/mame/drivers/astrafr.cpp +++ b/src/mame/drivers/astrafr.cpp @@ -20,7 +20,7 @@ Platform also used by Lowen? (at least some of their sets use the same address l class astrafr_state : public driver_device { public: - astrafr_state(const machine_config &mconfig, device_type type, std::string tag) + astrafr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_slavecpu(*this, "slavecpu") diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp index ed53b0ff400..a82199c5d06 100644 --- a/src/mame/drivers/astrcorp.cpp +++ b/src/mame/drivers/astrcorp.cpp @@ -46,7 +46,7 @@ To do: class astrocorp_state : public driver_device { public: - astrocorp_state(const machine_config &mconfig, device_type type, std::string tag) + astrocorp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), diff --git a/src/mame/drivers/astrohome.cpp b/src/mame/drivers/astrohome.cpp index 59f9c29d0c5..7b08a693956 100644 --- a/src/mame/drivers/astrohome.cpp +++ b/src/mame/drivers/astrohome.cpp @@ -20,7 +20,7 @@ class astrocde_mess_state : public astrocde_state { public: - astrocde_mess_state(const machine_config &mconfig, device_type type, std::string tag) + astrocde_mess_state(const machine_config &mconfig, device_type type, const char *tag) : astrocde_state(mconfig, type, tag), m_cart(*this, "cartslot"), m_exp(*this, "exp") diff --git a/src/mame/drivers/astropc.cpp b/src/mame/drivers/astropc.cpp index e598d3b8731..a58eb2335eb 100644 --- a/src/mame/drivers/astropc.cpp +++ b/src/mame/drivers/astropc.cpp @@ -18,7 +18,7 @@ We need to figure this out and convert them to CHDs (I think.. unless they're fl class astropc_state : public driver_device { public: - astropc_state(const machine_config &mconfig, device_type type, std::string tag) + astropc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp index 9af9098b76b..17573b3bac9 100644 --- a/src/mame/drivers/atari400.cpp +++ b/src/mame/drivers/atari400.cpp @@ -245,7 +245,7 @@ class a400_state : public atari_common_state { public: - a400_state(const machine_config &mconfig, device_type type, std::string tag) + a400_state(const machine_config &mconfig, device_type type, const char *tag) : atari_common_state(mconfig, type, tag), m_ram(*this, RAM_TAG), m_pia(*this, "pia"), diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp index a66ef0f7bc8..48bc91e6816 100644 --- a/src/mame/drivers/atari_s1.cpp +++ b/src/mame/drivers/atari_s1.cpp @@ -59,7 +59,7 @@ ToDo: class atari_s1_state : public genpin_class { public: - atari_s1_state(const machine_config &mconfig, device_type type, std::string tag) + atari_s1_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_p_ram(*this, "ram") diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp index fde76dbbfab..1399a296577 100644 --- a/src/mame/drivers/atari_s2.cpp +++ b/src/mame/drivers/atari_s2.cpp @@ -30,7 +30,7 @@ ToDo: class atari_s2_state : public genpin_class { public: - atari_s2_state(const machine_config &mconfig, device_type type, std::string tag) + atari_s2_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_dac(*this, "dac") diff --git a/src/mame/drivers/atarisy4.cpp b/src/mame/drivers/atarisy4.cpp index 075a08f267d..78af3c1417c 100644 --- a/src/mame/drivers/atarisy4.cpp +++ b/src/mame/drivers/atarisy4.cpp @@ -45,7 +45,7 @@ public: class atarisy4_state : public driver_device { public: - atarisy4_state(const machine_config &mconfig, device_type type, std::string tag) + atarisy4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dsp0(*this, "dsp0"), diff --git a/src/mame/drivers/atarittl.cpp b/src/mame/drivers/atarittl.cpp index 10cb2af51e6..39662b15b60 100644 --- a/src/mame/drivers/atarittl.cpp +++ b/src/mame/drivers/atarittl.cpp @@ -83,7 +83,7 @@ class atarikee_state : public driver_device { public: - atarikee_state(const machine_config &mconfig, device_type type, std::string tag) + atarikee_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index c17428e763f..253cb8300f6 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -45,7 +45,7 @@ class atlantis_state : public driver_device { public: - atlantis_state(const machine_config &mconfig, device_type type, std::string tag) + atlantis_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dcs(*this, "dcs") { } diff --git a/src/mame/drivers/atm.cpp b/src/mame/drivers/atm.cpp index 2f23a1274fa..300f503d90e 100644 --- a/src/mame/drivers/atm.cpp +++ b/src/mame/drivers/atm.cpp @@ -24,7 +24,7 @@ computer to boot up (with keyboard problems). class atm_state : public spectrum_state { public: - atm_state(const machine_config &mconfig, device_type type, std::string tag) + atm_state(const machine_config &mconfig, device_type type, const char *tag) : spectrum_state(mconfig, type, tag) , m_bank1(*this, "bank1") , m_bank2(*this, "bank2") diff --git a/src/mame/drivers/atronic.cpp b/src/mame/drivers/atronic.cpp index f55a5a6d50d..f366fab1187 100644 --- a/src/mame/drivers/atronic.cpp +++ b/src/mame/drivers/atronic.cpp @@ -21,7 +21,7 @@ class atronic_state : public driver_device { public: - atronic_state(const machine_config &mconfig, device_type type, std::string tag) + atronic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index e87b38eafdd..0c6a1c9d3b5 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -69,7 +69,7 @@ class attache_state : public driver_device { public: - attache_state(const machine_config &mconfig, device_type type, std::string tag) + attache_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_rom(*this,"boot"), diff --git a/src/mame/drivers/attckufo.cpp b/src/mame/drivers/attckufo.cpp index 27aa5698d91..3a099bf917f 100644 --- a/src/mame/drivers/attckufo.cpp +++ b/src/mame/drivers/attckufo.cpp @@ -51,7 +51,7 @@ LOIPOIO-B class attckufo_state : public driver_device { public: - attckufo_state(const machine_config &mconfig, device_type type, std::string tag) + attckufo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mos6560(*this, "mos6560") , diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp index 7b9d082e4c4..698afe889cb 100644 --- a/src/mame/drivers/atvtrack.cpp +++ b/src/mame/drivers/atvtrack.cpp @@ -98,7 +98,7 @@ but unlike to DC/AW/Naomi SH4 'peripheral clock' (at which works TMU timers and class atvtrack_state : public driver_device { public: - atvtrack_state(const machine_config &mconfig, device_type type, std::string tag) + atvtrack_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu") { } @@ -134,7 +134,7 @@ protected: class smashdrv_state : public atvtrack_state { public: - smashdrv_state(const machine_config &mconfig, device_type type, std::string tag) + smashdrv_state(const machine_config &mconfig, device_type type, const char *tag) : atvtrack_state(mconfig, type, tag) { } virtual void machine_start() override; @@ -327,7 +327,7 @@ READ64_MEMBER(atvtrack_state::ioport_r) { if (offset == SH4_IOPORT_16/8) { // much simplified way - if (space.device().tag() == ":maincpu") + if (strcmp(space.device().tag(), ":maincpu") == 0) #ifndef SPECIALMODE return -1; // normal #else diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp index 1818a6668c1..5a752526f81 100644 --- a/src/mame/drivers/avt.cpp +++ b/src/mame/drivers/avt.cpp @@ -421,7 +421,7 @@ class avt_state : public driver_device { public: - avt_state(const machine_config &mconfig, device_type type, std::string tag) + avt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_crtc(*this, "crtc"), diff --git a/src/mame/drivers/ax20.cpp b/src/mame/drivers/ax20.cpp index b1619ce25e4..f51f0dc925c 100644 --- a/src/mame/drivers/ax20.cpp +++ b/src/mame/drivers/ax20.cpp @@ -23,7 +23,7 @@ class ax20_state : public driver_device { public: - ax20_state(const machine_config &mconfig, device_type type, std::string tag) + ax20_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_p_vram(*this, "p_vram"), diff --git a/src/mame/drivers/b16.cpp b/src/mame/drivers/b16.cpp index e21e5db728f..289aea6f228 100644 --- a/src/mame/drivers/b16.cpp +++ b/src/mame/drivers/b16.cpp @@ -23,7 +23,7 @@ class b16_state : public driver_device { public: - b16_state(const machine_config &mconfig, device_type type, std::string tag) + b16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_dma8237(*this, "8237dma"), diff --git a/src/mame/drivers/babbage.cpp b/src/mame/drivers/babbage.cpp index ec72737593a..f3d9c187fc8 100644 --- a/src/mame/drivers/babbage.cpp +++ b/src/mame/drivers/babbage.cpp @@ -34,7 +34,7 @@ class babbage_state : public driver_device { public: - babbage_state(const machine_config &mconfig, device_type type, std::string tag) + babbage_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pio_1(*this, "z80pio_1"), diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp index 24b4de6db54..9ca90c212e8 100644 --- a/src/mame/drivers/backfire.cpp +++ b/src/mame/drivers/backfire.cpp @@ -27,7 +27,7 @@ class backfire_state : public driver_device { public: - backfire_state(const machine_config &mconfig, device_type type, std::string tag) + backfire_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mainram(*this, "mainram"), m_left_priority(*this, "left_priority"), diff --git a/src/mame/drivers/bailey.cpp b/src/mame/drivers/bailey.cpp index 680022fc6aa..15232f62605 100644 --- a/src/mame/drivers/bailey.cpp +++ b/src/mame/drivers/bailey.cpp @@ -36,7 +36,7 @@ class bailey_state : public driver_device { public: - bailey_state(const machine_config &mconfig, device_type type, std::string tag) + bailey_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp index f12d9664a57..071928676f0 100644 --- a/src/mame/drivers/barata.cpp +++ b/src/mame/drivers/barata.cpp @@ -45,7 +45,7 @@ class barata_state : public driver_device { public: - barata_state(const machine_config &mconfig, device_type type, std::string tag) + barata_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac") { } diff --git a/src/mame/drivers/bartop52.cpp b/src/mame/drivers/bartop52.cpp index 5d485c9eb98..af9142250a5 100644 --- a/src/mame/drivers/bartop52.cpp +++ b/src/mame/drivers/bartop52.cpp @@ -28,7 +28,7 @@ class bartop52_state : public atari_common_state { public: - bartop52_state(const machine_config &mconfig, device_type type, std::string tag) + bartop52_state(const machine_config &mconfig, device_type type, const char *tag) : atari_common_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/basic52.cpp b/src/mame/drivers/basic52.cpp index 57776c6585d..f641beaef04 100644 --- a/src/mame/drivers/basic52.cpp +++ b/src/mame/drivers/basic52.cpp @@ -42,7 +42,7 @@ to discover the special features of this Basic. class basic52_state : public driver_device { public: - basic52_state(const machine_config &mconfig, device_type type, std::string tag) + basic52_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/bbcbc.cpp b/src/mame/drivers/bbcbc.cpp index 338f53f3571..3c50df82697 100644 --- a/src/mame/drivers/bbcbc.cpp +++ b/src/mame/drivers/bbcbc.cpp @@ -23,7 +23,7 @@ class bbcbc_state : public driver_device { public: - bbcbc_state(const machine_config &mconfig, device_type type, std::string tag) + bbcbc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cart(*this, "cartslot") diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp index 753c31b95b0..cd885352dba 100644 --- a/src/mame/drivers/bcs3.cpp +++ b/src/mame/drivers/bcs3.cpp @@ -58,7 +58,7 @@ class bcs3_state : public driver_device { public: - bcs3_state(const machine_config &mconfig, device_type type, std::string tag) + bcs3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_ctc(*this, "ctc") diff --git a/src/mame/drivers/beaminv.cpp b/src/mame/drivers/beaminv.cpp index 5402dd1659d..4c78e8da6da 100644 --- a/src/mame/drivers/beaminv.cpp +++ b/src/mame/drivers/beaminv.cpp @@ -61,7 +61,7 @@ Stephh's notes (based on the games Z80 code and some tests) : class beaminv_state : public driver_device { public: - beaminv_state(const machine_config &mconfig, device_type type, std::string tag) + beaminv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp index 3a56b10b132..e152a41cc54 100644 --- a/src/mame/drivers/beehive.cpp +++ b/src/mame/drivers/beehive.cpp @@ -27,7 +27,7 @@ class beehive_state : public driver_device { public: - beehive_state(const machine_config &mconfig, device_type type, std::string tag) + beehive_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_p_videoram(*this, "videoram"){ } diff --git a/src/mame/drivers/belatra.cpp b/src/mame/drivers/belatra.cpp index cfa9c2b00b5..cb996f09781 100644 --- a/src/mame/drivers/belatra.cpp +++ b/src/mame/drivers/belatra.cpp @@ -48,7 +48,7 @@ Viking?s Fun Mill class belatra_state : public driver_device { public: - belatra_state(const machine_config &mconfig, device_type type, std::string tag) + belatra_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp index 1467d38d108..5b0ce31c816 100644 --- a/src/mame/drivers/berzerk.cpp +++ b/src/mame/drivers/berzerk.cpp @@ -22,7 +22,7 @@ class berzerk_state : public driver_device { public: - berzerk_state(const machine_config &mconfig, device_type type, std::string tag) + berzerk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_s14001a(*this, "speech"), diff --git a/src/mame/drivers/besta.cpp b/src/mame/drivers/besta.cpp index 12ed33d39dc..86f81074a68 100644 --- a/src/mame/drivers/besta.cpp +++ b/src/mame/drivers/besta.cpp @@ -30,7 +30,7 @@ class besta_state : public driver_device { public: - besta_state(const machine_config &mconfig, device_type type, std::string tag) + besta_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pit1 (*this, "pit1"), diff --git a/src/mame/drivers/bestleag.cpp b/src/mame/drivers/bestleag.cpp index 1aea9436c1e..24310dbc504 100644 --- a/src/mame/drivers/bestleag.cpp +++ b/src/mame/drivers/bestleag.cpp @@ -28,7 +28,7 @@ Dip Locations added according to Service Mode class bestleag_state : public driver_device { public: - bestleag_state(const machine_config &mconfig, device_type type, std::string tag) + bestleag_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp index f414d788c6b..024a42d5c69 100644 --- a/src/mame/drivers/beta.cpp +++ b/src/mame/drivers/beta.cpp @@ -50,7 +50,7 @@ class beta_state : public driver_device { public: - beta_state(const machine_config &mconfig, device_type type, std::string tag) + beta_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M6502_TAG), m_speaker(*this, "speaker"), diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp index 68cabc04a2e..d26eff4d673 100644 --- a/src/mame/drivers/bfcobra.cpp +++ b/src/mame/drivers/bfcobra.cpp @@ -237,7 +237,7 @@ struct fdc_t class bfcobra_state : public driver_device { public: - bfcobra_state(const machine_config &mconfig, device_type type, std::string tag) : + bfcobra_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp index 4a2d709566f..ec06c83bc6c 100644 --- a/src/mame/drivers/bfm_sc1.cpp +++ b/src/mame/drivers/bfm_sc1.cpp @@ -106,7 +106,7 @@ Optional (on expansion card) (Viper) class bfm_sc1_state : public driver_device { public: - bfm_sc1_state(const machine_config &mconfig, device_type type, std::string tag) + bfm_sc1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_reel0(*this, "reel0"), diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp index 2c5f1de1595..eb423c68e54 100644 --- a/src/mame/drivers/bfm_sc2.cpp +++ b/src/mame/drivers/bfm_sc2.cpp @@ -179,7 +179,7 @@ Adder hardware: class bfm_sc2_state : public driver_device { public: - bfm_sc2_state(const machine_config &mconfig, device_type type, std::string tag) + bfm_sc2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_reel0(*this, "reel0"), diff --git a/src/mame/drivers/bfm_swp.cpp b/src/mame/drivers/bfm_swp.cpp index 9254a7b5878..5198984a975 100644 --- a/src/mame/drivers/bfm_swp.cpp +++ b/src/mame/drivers/bfm_swp.cpp @@ -108,7 +108,7 @@ TEST.TXT - suggests the content of a prototype version, which was expanded to ma class bfm_swp_state : public driver_device { public: - bfm_swp_state(const machine_config &mconfig, device_type type, std::string tag) + bfm_swp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/bfmsys83.cpp b/src/mame/drivers/bfmsys83.cpp index 46e39d24b49..1fbed4b72c5 100644 --- a/src/mame/drivers/bfmsys83.cpp +++ b/src/mame/drivers/bfmsys83.cpp @@ -11,7 +11,7 @@ class bfmsys83_state : public driver_device { public: - bfmsys83_state(const machine_config &mconfig, device_type type, std::string tag) + bfmsys83_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp index 4d4e8952876..c41647ab58a 100644 --- a/src/mame/drivers/bfmsys85.cpp +++ b/src/mame/drivers/bfmsys85.cpp @@ -73,7 +73,7 @@ ___________________________________________________________________________ class bfmsys85_state : public driver_device { public: - bfmsys85_state(const machine_config &mconfig, device_type type, std::string tag) : driver_device(mconfig, type, tag), + bfmsys85_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vfd(*this, "vfd"), m_maincpu(*this, "maincpu"), m_reel0(*this, "reel0"), diff --git a/src/mame/drivers/bgt.cpp b/src/mame/drivers/bgt.cpp index 2d7291e3fbb..740c4a48621 100644 --- a/src/mame/drivers/bgt.cpp +++ b/src/mame/drivers/bgt.cpp @@ -16,7 +16,7 @@ class bgt_state : public driver_device { public: - bgt_state(const machine_config &mconfig, device_type type, std::string tag) + bgt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/big10.cpp b/src/mame/drivers/big10.cpp index a838199fd0c..26b7c4c05e7 100644 --- a/src/mame/drivers/big10.cpp +++ b/src/mame/drivers/big10.cpp @@ -68,7 +68,7 @@ class big10_state : public driver_device { public: - big10_state(const machine_config &mconfig, device_type type, std::string tag) + big10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_v9938(*this, "v9938") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp index 622c3136b7d..8bc7191eb28 100644 --- a/src/mame/drivers/bigbord2.cpp +++ b/src/mame/drivers/bigbord2.cpp @@ -102,7 +102,7 @@ X - change banks class bigbord2_state : public driver_device { public: - bigbord2_state(const machine_config &mconfig, device_type type, std::string tag) + bigbord2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_6845(*this, "crtc"), diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index 374036bb02a..ba135c2b0ed 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -61,7 +61,7 @@ class binbug_state : public driver_device { public: - binbug_state(const machine_config &mconfig, device_type type, std::string tag) + binbug_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_rs232(*this, KEYBOARD_TAG), m_cass(*this, "cassette"), @@ -408,7 +408,7 @@ ToDo: class dg680_state : public binbug_state { public: - dg680_state(const machine_config &mconfig, device_type type, std::string tag) + dg680_state(const machine_config &mconfig, device_type type, const char *tag) : binbug_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ctc(*this, "z80ctc"), diff --git a/src/mame/drivers/bingo.cpp b/src/mame/drivers/bingo.cpp index 9f7f4929bdc..a07858a1045 100644 --- a/src/mame/drivers/bingo.cpp +++ b/src/mame/drivers/bingo.cpp @@ -9,7 +9,7 @@ class bingo_state : public driver_device { public: - bingo_state(const machine_config &mconfig, device_type type, std::string tag) + bingo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } @@ -52,7 +52,7 @@ MACHINE_CONFIG_END class seeben_state : public driver_device { public: - seeben_state(const machine_config &mconfig, device_type type, std::string tag) + seeben_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } @@ -92,7 +92,7 @@ MACHINE_CONFIG_END class splin_state : public driver_device { public: - splin_state(const machine_config &mconfig, device_type type, std::string tag) + splin_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/bingoc.cpp b/src/mame/drivers/bingoc.cpp index fbe6950f2df..868fd3c3563 100644 --- a/src/mame/drivers/bingoc.cpp +++ b/src/mame/drivers/bingoc.cpp @@ -39,7 +39,7 @@ SOUND : YM2151 uPD7759C class bingoc_state : public driver_device { public: - bingoc_state(const machine_config &mconfig, device_type type, std::string tag) + bingoc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/drivers/bingoman.cpp b/src/mame/drivers/bingoman.cpp index acc22932547..f9551bcfd67 100644 --- a/src/mame/drivers/bingoman.cpp +++ b/src/mame/drivers/bingoman.cpp @@ -246,7 +246,7 @@ class bingoman_state : public driver_device { public: - bingoman_state(const machine_config &mconfig, device_type type, std::string tag) + bingoman_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp index 16fd508d8c2..a02e65854cb 100644 --- a/src/mame/drivers/bingor.cpp +++ b/src/mame/drivers/bingor.cpp @@ -448,7 +448,7 @@ class bingor_state : public driver_device { public: - bingor_state(const machine_config &mconfig, device_type type, std::string tag) + bingor_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_blit_ram(*this, "blit_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp index 7b7b24f0281..511f4fb2a1b 100644 --- a/src/mame/drivers/bitgraph.cpp +++ b/src/mame/drivers/bitgraph.cpp @@ -91,7 +91,7 @@ class bitgraph_state : public driver_device { public: - bitgraph_state(const machine_config &mconfig, device_type type, std::string tag) + bitgraph_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, M68K_TAG) , m_ram(*this, RAM_TAG) diff --git a/src/mame/drivers/blackt96.cpp b/src/mame/drivers/blackt96.cpp index bd9002d508c..ac63060d5aa 100644 --- a/src/mame/drivers/blackt96.cpp +++ b/src/mame/drivers/blackt96.cpp @@ -93,7 +93,7 @@ There are some unmapped writes past the end of text ram too class blackt96_state : public driver_device { public: - blackt96_state(const machine_config &mconfig, device_type type, std::string tag) + blackt96_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tilemapram(*this, "tilemapram"), m_spriteram0(*this, "spriteram0"), diff --git a/src/mame/drivers/blitz.cpp b/src/mame/drivers/blitz.cpp index 1e3f4eba593..b4a5eb325f0 100644 --- a/src/mame/drivers/blitz.cpp +++ b/src/mame/drivers/blitz.cpp @@ -268,7 +268,7 @@ class blitz_state : public driver_device { public: - blitz_state(const machine_config &mconfig, device_type type, std::string tag) + blitz_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp index 2b77e418c7d..ffa7d6215c8 100644 --- a/src/mame/drivers/blitz68k.cpp +++ b/src/mame/drivers/blitz68k.cpp @@ -55,7 +55,7 @@ To Do: class blitz68k_state : public driver_device { public: - blitz68k_state(const machine_config &mconfig, device_type type, std::string tag) + blitz68k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_nvram(*this, "nvram"), m_frame_buffer(*this, "frame_buffer"), diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp index ef8fecd3c5d..8cca358e26a 100644 --- a/src/mame/drivers/blockhl.cpp +++ b/src/mame/drivers/blockhl.cpp @@ -34,7 +34,7 @@ class blockhl_state : public driver_device { public: - blockhl_state(const machine_config &mconfig, device_type type, std::string tag) + blockhl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_bank5800(*this, "bank5800"), diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp index f41f470f429..13a12271374 100644 --- a/src/mame/drivers/bmcbowl.cpp +++ b/src/mame/drivers/bmcbowl.cpp @@ -116,7 +116,7 @@ Main board: class bmcbowl_state : public driver_device { public: - bmcbowl_state(const machine_config &mconfig, device_type type, std::string tag) + bmcbowl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_stats_ram(*this, "nvram", 16), diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp index 33625269585..6bd9d2c6ce8 100644 --- a/src/mame/drivers/bmcpokr.cpp +++ b/src/mame/drivers/bmcpokr.cpp @@ -26,7 +26,7 @@ Other: BMC B816140 (CPLD) class bmcpokr_state : public driver_device { public: - bmcpokr_state(const machine_config &mconfig, device_type type, std::string tag) + bmcpokr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_hopper(*this,"hopper"), diff --git a/src/mame/drivers/bmjr.cpp b/src/mame/drivers/bmjr.cpp index b45699cb8b7..9778a751434 100644 --- a/src/mame/drivers/bmjr.cpp +++ b/src/mame/drivers/bmjr.cpp @@ -24,7 +24,7 @@ class bmjr_state : public driver_device { public: - bmjr_state(const machine_config &mconfig, device_type type, std::string tag) + bmjr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cass(*this, "cassette"), diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp index c76f24a05e2..a2e405950c6 100644 --- a/src/mame/drivers/bml3.cpp +++ b/src/mame/drivers/bml3.cpp @@ -66,7 +66,7 @@ class bml3_state : public driver_device { public: - bml3_state(const machine_config &mconfig, device_type type, std::string tag) : + bml3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_bml3bus(*this, "bml3bus"), diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp index eb0e9ce824a..7172817b195 100644 --- a/src/mame/drivers/bnstars.cpp +++ b/src/mame/drivers/bnstars.cpp @@ -100,7 +100,7 @@ ROMs : MR96004-10.1 [125661cd] (IC5 - Samples) class bnstars_state : public ms32_state { public: - bnstars_state(const machine_config &mconfig, device_type type, std::string tag) + bnstars_state(const machine_config &mconfig, device_type type, const char *tag) : ms32_state(mconfig, type, tag), m_ms32_tx0_ram(*this, "tx0_ram"), m_ms32_tx1_ram(*this, "tx1_ram"), diff --git a/src/mame/drivers/bntyhunt.cpp b/src/mame/drivers/bntyhunt.cpp index 6a573f1f066..3d66dcb77c5 100644 --- a/src/mame/drivers/bntyhunt.cpp +++ b/src/mame/drivers/bntyhunt.cpp @@ -14,7 +14,7 @@ class bntyhunt_state : public driver_device { public: - bntyhunt_state(const machine_config &mconfig, device_type type, std::string tag) + bntyhunt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/bob85.cpp b/src/mame/drivers/bob85.cpp index 8ab90ec2210..d0c1eb88965 100644 --- a/src/mame/drivers/bob85.cpp +++ b/src/mame/drivers/bob85.cpp @@ -30,7 +30,7 @@ Test Paste: class bob85_state : public driver_device { public: - bob85_state(const machine_config &mconfig, device_type type, std::string tag) + bob85_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cass(*this, "cassette"), diff --git a/src/mame/drivers/bowltry.cpp b/src/mame/drivers/bowltry.cpp index 6e0f090e6ae..73e4b83a055 100644 --- a/src/mame/drivers/bowltry.cpp +++ b/src/mame/drivers/bowltry.cpp @@ -36,7 +36,7 @@ class bowltry_state : public driver_device { public: - bowltry_state(const machine_config &mconfig, device_type type, std::string tag) + bowltry_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp index 0874a013ab2..eb31c5dc174 100644 --- a/src/mame/drivers/boxer.cpp +++ b/src/mame/drivers/boxer.cpp @@ -31,7 +31,7 @@ public: TIMER_PERIODIC }; - boxer_state(const machine_config &mconfig, device_type type, std::string tag) + boxer_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tile_ram(*this, "tile_ram"), m_sprite_ram(*this, "sprite_ram"), diff --git a/src/mame/drivers/br8641.cpp b/src/mame/drivers/br8641.cpp index 018e02cae06..df76c9ee91b 100644 --- a/src/mame/drivers/br8641.cpp +++ b/src/mame/drivers/br8641.cpp @@ -32,7 +32,7 @@ ToDo: class brandt8641_state : public driver_device { public: - brandt8641_state(const machine_config &mconfig, device_type type, std::string tag) + brandt8641_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_pio1(*this, "pio1") diff --git a/src/mame/drivers/buster.cpp b/src/mame/drivers/buster.cpp index b1a6eec73f9..f08a32eeb0a 100644 --- a/src/mame/drivers/buster.cpp +++ b/src/mame/drivers/buster.cpp @@ -17,7 +17,7 @@ Video Fruit Machine class buster_state : public driver_device { public: - buster_state(const machine_config &mconfig, device_type type, std::string tag) + buster_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/by17.cpp b/src/mame/drivers/by17.cpp index 45d1a6b3e98..690409b5c13 100644 --- a/src/mame/drivers/by17.cpp +++ b/src/mame/drivers/by17.cpp @@ -29,7 +29,7 @@ ToDo: class by17_state : public genpin_class { public: - by17_state(const machine_config &mconfig, device_type type, std::string tag) + by17_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_nvram(*this, "nvram") diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp index f89e94f64de..476804d398b 100644 --- a/src/mame/drivers/by35.cpp +++ b/src/mame/drivers/by35.cpp @@ -77,7 +77,7 @@ ToDo: class by35_state : public genpin_class { public: - by35_state(const machine_config &mconfig, device_type type, std::string tag) + by35_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_nvram(*this, "nvram") diff --git a/src/mame/drivers/by6803.cpp b/src/mame/drivers/by6803.cpp index 08681622411..bc7ce7e9f14 100644 --- a/src/mame/drivers/by6803.cpp +++ b/src/mame/drivers/by6803.cpp @@ -31,7 +31,7 @@ ToDo: class by6803_state : public genpin_class { public: - by6803_state(const machine_config &mconfig, device_type type, std::string tag) + by6803_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_pia0(*this, "pia0") diff --git a/src/mame/drivers/by68701.cpp b/src/mame/drivers/by68701.cpp index d17e26ed2fd..4dbcec6d9b6 100644 --- a/src/mame/drivers/by68701.cpp +++ b/src/mame/drivers/by68701.cpp @@ -7,7 +7,7 @@ class by68701_state : public driver_device { public: - by68701_state(const machine_config &mconfig, device_type type, std::string tag) + by68701_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/byvid.cpp b/src/mame/drivers/byvid.cpp index 9a59640547a..bd1b267a62d 100644 --- a/src/mame/drivers/byvid.cpp +++ b/src/mame/drivers/byvid.cpp @@ -49,7 +49,7 @@ ToDo (granny): class by133_state : public driver_device { public: - by133_state(const machine_config &mconfig, device_type type, std::string tag) + by133_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_videocpu(*this, "videocpu") diff --git a/src/mame/drivers/c10.cpp b/src/mame/drivers/c10.cpp index 097e94fd4fd..a2333d810b7 100644 --- a/src/mame/drivers/c10.cpp +++ b/src/mame/drivers/c10.cpp @@ -24,7 +24,7 @@ public: TIMER_RESET }; - c10_state(const machine_config &mconfig, device_type type, std::string tag) + c10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_p_videoram(*this, "p_videoram"){ } diff --git a/src/mame/drivers/c64dtv.cpp b/src/mame/drivers/c64dtv.cpp index f36cefb100f..4b707dfa585 100644 --- a/src/mame/drivers/c64dtv.cpp +++ b/src/mame/drivers/c64dtv.cpp @@ -11,7 +11,7 @@ class c64dtv_state : public driver_device { public: // constructor - c64dtv_state(const machine_config &mconfig, device_type type, std::string tag) + c64dtv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/c65.cpp b/src/mame/drivers/c65.cpp index 5a6e9a37714..fb9f882ead7 100644 --- a/src/mame/drivers/c65.cpp +++ b/src/mame/drivers/c65.cpp @@ -28,7 +28,7 @@ Note: class c65_state : public driver_device { public: - c65_state(const machine_config &mconfig, device_type type, std::string tag) + c65_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cia0(*this, "cia_0"), diff --git a/src/mame/drivers/c900.cpp b/src/mame/drivers/c900.cpp index e3a7defd0df..18e5238c3eb 100644 --- a/src/mame/drivers/c900.cpp +++ b/src/mame/drivers/c900.cpp @@ -29,7 +29,7 @@ class c900_state : public driver_device { public: - c900_state(const machine_config &mconfig, device_type type, std::string tag) + c900_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp index 82be78a6dc0..bdaf1aef465 100644 --- a/src/mame/drivers/cabaret.cpp +++ b/src/mame/drivers/cabaret.cpp @@ -31,7 +31,7 @@ are the same of IGS. AMT may be previous IGS name. class cabaret_state : public driver_device { public: - cabaret_state(const machine_config &mconfig, device_type type, std::string tag) + cabaret_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_tile_ram(*this, "fg_tile_ram"), m_fg_color_ram(*this, "fg_color_ram"), diff --git a/src/mame/drivers/calchase.cpp b/src/mame/drivers/calchase.cpp index ed89e2a015a..18354d8e5dc 100644 --- a/src/mame/drivers/calchase.cpp +++ b/src/mame/drivers/calchase.cpp @@ -142,7 +142,7 @@ something wrong in the disk geometry reported by calchase.chd (20,255,63) since class calchase_state : public pcat_base_state { public: - calchase_state(const machine_config &mconfig, device_type type, std::string tag) + calchase_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag), m_dac_l(*this, "dac_l"), m_dac_r(*this, "dac_r") diff --git a/src/mame/drivers/calorie.cpp b/src/mame/drivers/calorie.cpp index 87da9cd5fa8..a4602d37189 100644 --- a/src/mame/drivers/calorie.cpp +++ b/src/mame/drivers/calorie.cpp @@ -88,7 +88,7 @@ Notes: class calorie_state : public driver_device { public: - calorie_state(const machine_config &mconfig, device_type type, std::string tag) + calorie_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_ram(*this, "fg_ram"), m_sprites(*this, "sprites"), diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp index 884bc419f0a..96cc919dfb9 100644 --- a/src/mame/drivers/camplynx.cpp +++ b/src/mame/drivers/camplynx.cpp @@ -129,7 +129,7 @@ class camplynx_state : public driver_device { public: - camplynx_state(const machine_config &mconfig, device_type type, std::string tag) + camplynx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/canon_s80.cpp b/src/mame/drivers/canon_s80.cpp index c545f87dbf5..2ee2325ce0e 100644 --- a/src/mame/drivers/canon_s80.cpp +++ b/src/mame/drivers/canon_s80.cpp @@ -23,7 +23,7 @@ class canons80_state : public driver_device { public: - canons80_state(const machine_config &mconfig, device_type type, std::string tag) + canons80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } diff --git a/src/mame/drivers/capcom.cpp b/src/mame/drivers/capcom.cpp index 54f07bd6d37..04c06f3f3f1 100644 --- a/src/mame/drivers/capcom.cpp +++ b/src/mame/drivers/capcom.cpp @@ -11,7 +11,7 @@ class capcom_state : public driver_device { public: - capcom_state(const machine_config &mconfig, device_type type, std::string tag) + capcom_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/capr1.cpp b/src/mame/drivers/capr1.cpp index 962f3e4ce3f..4203174914c 100644 --- a/src/mame/drivers/capr1.cpp +++ b/src/mame/drivers/capr1.cpp @@ -36,7 +36,7 @@ TODO: class capr1_state : public driver_device { public: - capr1_state(const machine_config &mconfig, device_type type, std::string tag) + capr1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/caprcyc.cpp b/src/mame/drivers/caprcyc.cpp index 252f67a88ec..9ac04280b94 100644 --- a/src/mame/drivers/caprcyc.cpp +++ b/src/mame/drivers/caprcyc.cpp @@ -22,7 +22,7 @@ TODO: class caprcyc_state : public driver_device { public: - caprcyc_state(const machine_config &mconfig, device_type type, std::string tag) + caprcyc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/cardline.cpp b/src/mame/drivers/cardline.cpp index da62e39556e..740fb7e28f4 100644 --- a/src/mame/drivers/cardline.cpp +++ b/src/mame/drivers/cardline.cpp @@ -33,7 +33,7 @@ class cardline_state : public driver_device { public: - cardline_state(const machine_config &mconfig, device_type type, std::string tag) + cardline_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/carrera.cpp b/src/mame/drivers/carrera.cpp index d2b073ea1d8..d567ecc67da 100644 --- a/src/mame/drivers/carrera.cpp +++ b/src/mame/drivers/carrera.cpp @@ -57,7 +57,7 @@ TODO: class carrera_state : public driver_device { public: - carrera_state(const machine_config &mconfig, device_type type, std::string tag) + carrera_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tileram(*this, "tileram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp index 69c0934bb9e..c3639d185d5 100644 --- a/src/mame/drivers/casloopy.cpp +++ b/src/mame/drivers/casloopy.cpp @@ -159,7 +159,7 @@ PCB 'Z545-1 A240570-1' class casloopy_state : public driver_device { public: - casloopy_state(const machine_config &mconfig, device_type type, std::string tag) + casloopy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bios_rom(*this, "bios_rom"), m_vregs(*this, "vregs"), diff --git a/src/mame/drivers/castle.cpp b/src/mame/drivers/castle.cpp index 39a1862379d..056273db2b1 100644 --- a/src/mame/drivers/castle.cpp +++ b/src/mame/drivers/castle.cpp @@ -50,7 +50,7 @@ class castle_state : public driver_device { public: - castle_state(const machine_config &mconfig, device_type type, std::string tag) + castle_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp index 6c61a82e882..f774057fd73 100644 --- a/src/mame/drivers/caswin.cpp +++ b/src/mame/drivers/caswin.cpp @@ -76,7 +76,7 @@ TODO: class caswin_state : public driver_device { public: - caswin_state(const machine_config &mconfig, device_type type, std::string tag) + caswin_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sc0_vram(*this, "sc0_vram"), m_sc0_attr(*this, "sc0_attr"), diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp index e60e7fab12a..fd892b3b877 100644 --- a/src/mame/drivers/cat.cpp +++ b/src/mame/drivers/cat.cpp @@ -239,7 +239,7 @@ public: TIMER_COUNTER_6MS }; - cat_state(const machine_config &mconfig, device_type type, std::string tag) + cat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), //m_nvram(*this, "nvram"), // merge with svram? diff --git a/src/mame/drivers/cavepc.cpp b/src/mame/drivers/cavepc.cpp index 29b0a7f2673..7bd1c83b794 100644 --- a/src/mame/drivers/cavepc.cpp +++ b/src/mame/drivers/cavepc.cpp @@ -58,7 +58,7 @@ class cavepc_state : public driver_device { public: - cavepc_state(const machine_config &mconfig, device_type type, std::string tag) + cavepc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/cb2001.cpp b/src/mame/drivers/cb2001.cpp index 57b1793b269..10fc8bb527a 100644 --- a/src/mame/drivers/cb2001.cpp +++ b/src/mame/drivers/cb2001.cpp @@ -51,7 +51,7 @@ this seems more like 8-bit hardware, maybe it should be v25, not v35... class cb2001_state : public driver_device { public: - cb2001_state(const machine_config &mconfig, device_type type, std::string tag) + cb2001_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram_fg(*this, "vrafg"), m_vram_bg(*this, "vrabg"), diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp index 7f39ca6ac60..ecb12c186d3 100644 --- a/src/mame/drivers/cball.cpp +++ b/src/mame/drivers/cball.cpp @@ -18,7 +18,7 @@ public: TIMER_INTERRUPT }; - cball_state(const machine_config &mconfig, device_type type, std::string tag) + cball_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp index 6cbca332b59..bd65fc2fc78 100644 --- a/src/mame/drivers/cc40.cpp +++ b/src/mame/drivers/cc40.cpp @@ -87,7 +87,7 @@ class cc40_state : public driver_device { public: - cc40_state(const machine_config &mconfig, device_type type, std::string tag) + cc40_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), diff --git a/src/mame/drivers/cchance.cpp b/src/mame/drivers/cchance.cpp index 0e21b411823..0283cf99df9 100644 --- a/src/mame/drivers/cchance.cpp +++ b/src/mame/drivers/cchance.cpp @@ -42,7 +42,7 @@ cha3 $10d8 class cchance_state : public tnzs_state { public: - cchance_state(const machine_config &mconfig, device_type type, std::string tag) + cchance_state(const machine_config &mconfig, device_type type, const char *tag) : tnzs_state(mconfig, type, tag) { } UINT8 m_hop_io; diff --git a/src/mame/drivers/ccs2810.cpp b/src/mame/drivers/ccs2810.cpp index f6a02d05b87..ab38592295a 100644 --- a/src/mame/drivers/ccs2810.cpp +++ b/src/mame/drivers/ccs2810.cpp @@ -71,7 +71,7 @@ ToDo: class ccs_state : public driver_device { public: - ccs_state(const machine_config &mconfig, device_type type, std::string tag) + ccs_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/ccs300.cpp b/src/mame/drivers/ccs300.cpp index c3daaaf5aed..a0842350bd2 100644 --- a/src/mame/drivers/ccs300.cpp +++ b/src/mame/drivers/ccs300.cpp @@ -28,7 +28,7 @@ There's unknown usage of ports 11 thru 1B, 34, and F0 thru F2. class ccs300_state : public driver_device { public: - ccs300_state(const machine_config &mconfig, device_type type, std::string tag) + ccs300_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp index 35da04fe9e8..ae40d4deaa3 100644 --- a/src/mame/drivers/cd2650.cpp +++ b/src/mame/drivers/cd2650.cpp @@ -41,7 +41,7 @@ TODO class cd2650_state : public driver_device { public: - cd2650_state(const machine_config &mconfig, device_type type, std::string tag) + cd2650_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/cdc721.cpp b/src/mame/drivers/cdc721.cpp index 1e33d15d78c..497ba6d5a68 100644 --- a/src/mame/drivers/cdc721.cpp +++ b/src/mame/drivers/cdc721.cpp @@ -16,7 +16,7 @@ Control Data Corporation CDC 721 Terminal (Viking) class cdc721_state : public driver_device { public: - cdc721_state(const machine_config &mconfig, device_type type, std::string tag) + cdc721_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_p_videoram(*this, "videoram") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/cesclass.cpp b/src/mame/drivers/cesclass.cpp index 320ffefb2b9..28f85f089e3 100644 --- a/src/mame/drivers/cesclass.cpp +++ b/src/mame/drivers/cesclass.cpp @@ -31,7 +31,7 @@ class cesclassic_state : public driver_device { public: - cesclassic_state(const machine_config &mconfig, device_type type, std::string tag) + cesclassic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), diff --git a/src/mame/drivers/cfx9850.cpp b/src/mame/drivers/cfx9850.cpp index 1782a100e40..30ec1e78b4b 100644 --- a/src/mame/drivers/cfx9850.cpp +++ b/src/mame/drivers/cfx9850.cpp @@ -26,7 +26,7 @@ Debugging information: class cfx9850_state : public driver_device { public: - cfx9850_state(const machine_config &mconfig, device_type type, std::string tag) + cfx9850_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_display_ram(*this, "display_ram"), diff --git a/src/mame/drivers/cgenie.cpp b/src/mame/drivers/cgenie.cpp index 5afce95112a..a306f55c440 100644 --- a/src/mame/drivers/cgenie.cpp +++ b/src/mame/drivers/cgenie.cpp @@ -31,7 +31,7 @@ class cgenie_state : public driver_device { public: - cgenie_state(const machine_config &mconfig, device_type type, std::string tag) + cgenie_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cassette(*this, "cassette"), diff --git a/src/mame/drivers/cham24.cpp b/src/mame/drivers/cham24.cpp index f2d9001e04b..0fc42e73776 100644 --- a/src/mame/drivers/cham24.cpp +++ b/src/mame/drivers/cham24.cpp @@ -64,7 +64,7 @@ Notes: class cham24_state : public driver_device { public: - cham24_state(const machine_config &mconfig, device_type type, std::string tag) + cham24_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppu(*this, "ppu") { } diff --git a/src/mame/drivers/champbwl.cpp b/src/mame/drivers/champbwl.cpp index 1ee6c9585d3..745870f02bc 100644 --- a/src/mame/drivers/champbwl.cpp +++ b/src/mame/drivers/champbwl.cpp @@ -162,7 +162,7 @@ Notes: class champbwl_state : public driver_device { public: - champbwl_state(const machine_config &mconfig, device_type type, std::string tag) + champbwl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_seta001(*this, "spritegen"), diff --git a/src/mame/drivers/chanbara.cpp b/src/mame/drivers/chanbara.cpp index 73464cc79b5..379730cdf1a 100644 --- a/src/mame/drivers/chanbara.cpp +++ b/src/mame/drivers/chanbara.cpp @@ -58,7 +58,7 @@ ToDo: class chanbara_state : public driver_device { public: - chanbara_state(const machine_config &mconfig, device_type type, std::string tag) + chanbara_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp index 84bab3bf84a..b7831f8f159 100644 --- a/src/mame/drivers/chance32.cpp +++ b/src/mame/drivers/chance32.cpp @@ -29,7 +29,7 @@ class chance32_state : public driver_device { public: - chance32_state(const machine_config &mconfig, device_type type, std::string tag) + chance32_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fgram(*this, "fgram"), m_bgram(*this, "bgram"), diff --git a/src/mame/drivers/chaos.cpp b/src/mame/drivers/chaos.cpp index 26f696b2890..b03531bc362 100644 --- a/src/mame/drivers/chaos.cpp +++ b/src/mame/drivers/chaos.cpp @@ -38,7 +38,7 @@ class chaos_state : public driver_device { public: - chaos_state(const machine_config &mconfig, device_type type, std::string tag) + chaos_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_terminal(*this, TERMINAL_TAG), m_p_ram(*this, "p_ram") , diff --git a/src/mame/drivers/chessmst.cpp b/src/mame/drivers/chessmst.cpp index fc0b057b28f..e92d94056dc 100644 --- a/src/mame/drivers/chessmst.cpp +++ b/src/mame/drivers/chessmst.cpp @@ -21,7 +21,7 @@ class chessmst_state : public driver_device { public: - chessmst_state(const machine_config &mconfig, device_type type, std::string tag) + chessmst_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker") diff --git a/src/mame/drivers/chesstrv.cpp b/src/mame/drivers/chesstrv.cpp index 616feb724f3..e34954a6af0 100644 --- a/src/mame/drivers/chesstrv.cpp +++ b/src/mame/drivers/chesstrv.cpp @@ -18,7 +18,7 @@ class chesstrv_state : public driver_device { public: - chesstrv_state(const machine_config &mconfig, device_type type, std::string tag) + chesstrv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp index 393e79f12d1..f32da626237 100644 --- a/src/mame/drivers/chexx.cpp +++ b/src/mame/drivers/chexx.cpp @@ -27,7 +27,7 @@ Electro-mechanical bubble hockey games: class chexx_state : public driver_device { public: - chexx_state(const machine_config &mconfig, device_type type, std::string tag) + chexx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_via(*this, "via6522"), diff --git a/src/mame/drivers/chicago.cpp b/src/mame/drivers/chicago.cpp index b0c3b8a95e7..d426f8ab8f7 100644 --- a/src/mame/drivers/chicago.cpp +++ b/src/mame/drivers/chicago.cpp @@ -42,7 +42,7 @@ class chicago_state : public driver_device { public: - chicago_state(const machine_config &mconfig, device_type type, std::string tag) + chicago_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp index 91b8095298b..366ef73c704 100644 --- a/src/mame/drivers/chihiro.cpp +++ b/src/mame/drivers/chihiro.cpp @@ -382,7 +382,7 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info. class chihiro_state : public xbox_base_state { public: - chihiro_state(const machine_config &mconfig, device_type type, std::string tag) : + chihiro_state(const machine_config &mconfig, device_type type, const char *tag) : xbox_base_state(mconfig, type, tag), usbhack_index(-1), usbhack_counter(0), @@ -598,7 +598,7 @@ class ide_baseboard_device : public ata_mass_storage_device { public: // construction/destruction - ide_baseboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ide_baseboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual int read_sector(UINT32 lba, void *buffer) override; virtual int write_sector(UINT32 lba, const void *buffer) override; @@ -622,7 +622,7 @@ const device_type IDE_BASEBOARD = &device_creator; // ide_baseboard_device - constructor //------------------------------------------------- -ide_baseboard_device::ide_baseboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ide_baseboard_device::ide_baseboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ata_mass_storage_device(mconfig, IDE_BASEBOARD, "IDE Baseboard", tag, owner, clock, "ide_baseboard", __FILE__) { } diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp index d8fa10c368d..946d5020f38 100644 --- a/src/mame/drivers/chinagat.cpp +++ b/src/mame/drivers/chinagat.cpp @@ -88,7 +88,7 @@ Dip locations and factory settings verified with China Gate US manual. class chinagat_state : public ddragon_state { public: - chinagat_state(const machine_config &mconfig, device_type type, std::string tag) + chinagat_state(const machine_config &mconfig, device_type type, const char *tag) : ddragon_state(mconfig, type, tag), m_adpcm(*this, "adpcm") { }; diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp index 7b24b1c0651..49d8e3e4adf 100644 --- a/src/mame/drivers/chinsan.cpp +++ b/src/mame/drivers/chinsan.cpp @@ -52,7 +52,7 @@ MM63.10N class chinsan_state : public driver_device { public: - chinsan_state(const machine_config &mconfig, device_type type, std::string tag) + chinsan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video(*this, "video"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp index 9939e4fc6bc..226cf66514d 100644 --- a/src/mame/drivers/chsuper.cpp +++ b/src/mame/drivers/chsuper.cpp @@ -29,7 +29,7 @@ class chsuper_state : public driver_device { public: - chsuper_state(const machine_config &mconfig, device_type type, std::string tag) + chsuper_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/clayshoo.cpp b/src/mame/drivers/clayshoo.cpp index 862f79e636e..1db6d72efe3 100644 --- a/src/mame/drivers/clayshoo.cpp +++ b/src/mame/drivers/clayshoo.cpp @@ -24,7 +24,7 @@ class clayshoo_state : public driver_device { public: - clayshoo_state(const machine_config &mconfig, device_type type, std::string tag) + clayshoo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp index 11b67f29cbe..52ac6a7534a 100644 --- a/src/mame/drivers/clcd.cpp +++ b/src/mame/drivers/clcd.cpp @@ -27,7 +27,7 @@ class clcd_state : public driver_device { public: - clcd_state(const machine_config &mconfig, device_type type, std::string tag) + clcd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_acia(*this, "acia"), diff --git a/src/mame/drivers/cliffhgr.cpp b/src/mame/drivers/cliffhgr.cpp index 17ca329861d..c9cfe5f40b1 100644 --- a/src/mame/drivers/cliffhgr.cpp +++ b/src/mame/drivers/cliffhgr.cpp @@ -89,7 +89,7 @@ Side 2 = 0x8F7DDD (or 0x880000 | ( 0x77 << 12 ) | 0x0DDD) class cliffhgr_state : public driver_device { public: - cliffhgr_state(const machine_config &mconfig, device_type type, std::string tag) + cliffhgr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc"), m_port_bank(0), diff --git a/src/mame/drivers/clowndwn.cpp b/src/mame/drivers/clowndwn.cpp index 5f9cbd0a282..2eacdadfc44 100644 --- a/src/mame/drivers/clowndwn.cpp +++ b/src/mame/drivers/clowndwn.cpp @@ -15,7 +15,7 @@ can't find any info on this? class clowndwn_state : public driver_device { public: - clowndwn_state(const machine_config &mconfig, device_type type, std::string tag) + clowndwn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) // ,m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/cm1800.cpp b/src/mame/drivers/cm1800.cpp index 7ae7547b722..7659e8ec41d 100644 --- a/src/mame/drivers/cm1800.cpp +++ b/src/mame/drivers/cm1800.cpp @@ -42,7 +42,7 @@ to be a save command. class cm1800_state : public driver_device { public: - cm1800_state(const machine_config &mconfig, device_type type, std::string tag) + cm1800_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_terminal(*this, TERMINAL_TAG) , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/cmmb.cpp b/src/mame/drivers/cmmb.cpp index 1d27efee601..5e5da1d762a 100644 --- a/src/mame/drivers/cmmb.cpp +++ b/src/mame/drivers/cmmb.cpp @@ -53,7 +53,7 @@ OSC @ 72.576MHz class cmmb_state : public driver_device { public: - cmmb_state(const machine_config &mconfig, device_type type, std::string tag) + cmmb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_videoram(*this, "videoram"), diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp index ca90eb20489..99f7dd9a200 100644 --- a/src/mame/drivers/cntsteer.cpp +++ b/src/mame/drivers/cntsteer.cpp @@ -39,7 +39,7 @@ class cntsteer_state : public driver_device { public: - cntsteer_state(const machine_config &mconfig, device_type type, std::string tag) + cntsteer_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp index fe19d74afa3..840feea61df 100644 --- a/src/mame/drivers/cobra.cpp +++ b/src/mame/drivers/cobra.cpp @@ -491,7 +491,7 @@ private: class cobra_jvs : public jvs_device { public: - cobra_jvs(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cobra_jvs(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual bool switches(UINT8 *&buf, UINT8 count_players, UINT8 bytes_per_switch) override; @@ -500,7 +500,7 @@ protected: const device_type COBRA_JVS = &device_creator; -cobra_jvs::cobra_jvs(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cobra_jvs::cobra_jvs(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : jvs_device(mconfig, COBRA_JVS, "JVS (COBRA)", tag, owner, clock, "cobra_jvs", __FILE__) { } @@ -548,7 +548,7 @@ bool cobra_jvs::coin_counters(UINT8 *&buf, UINT8 count) class cobra_jvs_host : public jvs_host { public: - cobra_jvs_host(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cobra_jvs_host(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void write(UINT8, const UINT8 *&rec_data, UINT32 &rec_size); private: @@ -558,7 +558,7 @@ private: const device_type COBRA_JVS_HOST = &device_creator; -cobra_jvs_host::cobra_jvs_host(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cobra_jvs_host::cobra_jvs_host(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : jvs_host(mconfig, COBRA_JVS_HOST, "JVS-HOST (COBRA)", tag, owner, clock, "cobra_jvs_host", __FILE__) { m_send_ptr = 0; @@ -605,7 +605,7 @@ void cobra_jvs_host::write(UINT8 data, const UINT8 *&rec_data, UINT32 &rec_size) class cobra_state : public driver_device { public: - cobra_state(const machine_config &mconfig, device_type type, std::string tag) + cobra_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), @@ -1072,7 +1072,7 @@ void cobra_fifo::push(const device_t *cpu, UINT64 data) if (cpu != nullptr) { // cpu has a name and a PC - sprintf(accessor_location, "(%s) %08X", cpu->tag().c_str(), const_cast(cpu)->safe_pc()); + sprintf(accessor_location, "(%s) %08X", cpu->tag(), const_cast(cpu)->safe_pc()); } else { @@ -1092,7 +1092,7 @@ void cobra_fifo::push(const device_t *cpu, UINT64 data) if (cpu != nullptr) { // cpu has a name and a PC - sprintf(accessor_location, "(%s) %08X", cpu->tag().c_str(), const_cast(cpu)->safe_pc()); + sprintf(accessor_location, "(%s) %08X", cpu->tag(), const_cast(cpu)->safe_pc()); } else { @@ -1149,7 +1149,7 @@ bool cobra_fifo::pop(const device_t *cpu, UINT64 *result) if (cpu != nullptr) { // cpu has a name and a PC - sprintf(accessor_location, "(%s) %08X", cpu->tag().c_str(), const_cast(cpu)->safe_pc()); + sprintf(accessor_location, "(%s) %08X", cpu->tag(), const_cast(cpu)->safe_pc()); } else { @@ -1170,7 +1170,7 @@ bool cobra_fifo::pop(const device_t *cpu, UINT64 *result) if (cpu != nullptr) { // cpu has a name and a PC - sprintf(accessor_location, "(%s) %08X", cpu->tag().c_str(), const_cast(cpu)->safe_pc()); + sprintf(accessor_location, "(%s) %08X", cpu->tag(), const_cast(cpu)->safe_pc()); } else { diff --git a/src/mame/drivers/cocoloco.cpp b/src/mame/drivers/cocoloco.cpp index fba66c57ebe..3111a461866 100644 --- a/src/mame/drivers/cocoloco.cpp +++ b/src/mame/drivers/cocoloco.cpp @@ -187,7 +187,7 @@ class cocoloco_state : public driver_device { public: - cocoloco_state(const machine_config &mconfig, device_type type, std::string tag) + cocoloco_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette") { } diff --git a/src/mame/drivers/codata.cpp b/src/mame/drivers/codata.cpp index ae49ae39d1b..9499ab38560 100644 --- a/src/mame/drivers/codata.cpp +++ b/src/mame/drivers/codata.cpp @@ -20,7 +20,7 @@ class codata_state : public driver_device { public: - codata_state(const machine_config &mconfig, device_type type, std::string tag) + codata_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_base(*this, "rambase"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp index 2ebcc4b1944..ea5b3edf2aa 100644 --- a/src/mame/drivers/coinmstr.cpp +++ b/src/mame/drivers/coinmstr.cpp @@ -142,7 +142,7 @@ class coinmstr_state : public driver_device { public: - coinmstr_state(const machine_config &mconfig, device_type type, std::string tag) + coinmstr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_attr_ram1(*this, "attr_ram1"), diff --git a/src/mame/drivers/coinmvga.cpp b/src/mame/drivers/coinmvga.cpp index 6b66da5f6ca..9b0993bca4b 100644 --- a/src/mame/drivers/coinmvga.cpp +++ b/src/mame/drivers/coinmvga.cpp @@ -232,7 +232,7 @@ class coinmvga_state : public driver_device { public: - coinmvga_state(const machine_config &mconfig, device_type type, std::string tag) + coinmvga_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/comebaby.cpp b/src/mame/drivers/comebaby.cpp index f3504116061..77d1beb119e 100644 --- a/src/mame/drivers/comebaby.cpp +++ b/src/mame/drivers/comebaby.cpp @@ -187,7 +187,7 @@ Nearly everything. class comebaby_state : public driver_device { public: - comebaby_state(const machine_config &mconfig, device_type type, std::string tag) + comebaby_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/compucolor.cpp b/src/mame/drivers/compucolor.cpp index d77f6bc9d33..30f4b594ef3 100644 --- a/src/mame/drivers/compucolor.cpp +++ b/src/mame/drivers/compucolor.cpp @@ -36,7 +36,7 @@ class compucolor2_state : public driver_device { public: - compucolor2_state(const machine_config &mconfig, device_type type, std::string tag) + compucolor2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I8080_TAG), m_mioc(*this, TMS5501_TAG), diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp index 294fd5384d8..b6d0b5a83fd 100644 --- a/src/mame/drivers/coolridr.cpp +++ b/src/mame/drivers/coolridr.cpp @@ -298,7 +298,7 @@ to the same bank as defined through A20. class coolridr_state : public driver_device { public: - coolridr_state(const machine_config &mconfig, device_type type, std::string tag) + coolridr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_textBytesToWrite(0x00), m_blitterSerialCount(0x00), diff --git a/src/mame/drivers/cops.cpp b/src/mame/drivers/cops.cpp index bd5d904f40e..44529d40ae3 100644 --- a/src/mame/drivers/cops.cpp +++ b/src/mame/drivers/cops.cpp @@ -42,7 +42,7 @@ class cops_state : public driver_device { public: - cops_state(const machine_config &mconfig, device_type type, std::string tag) + cops_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_sn(*this, "snsnd"), diff --git a/src/mame/drivers/corona.cpp b/src/mame/drivers/corona.cpp index 0a08468a3ec..b4037863bf3 100644 --- a/src/mame/drivers/corona.cpp +++ b/src/mame/drivers/corona.cpp @@ -320,7 +320,7 @@ class corona_state : public driver_device { public: - corona_state(const machine_config &mconfig, device_type type, std::string tag) + corona_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/drivers/cortex.cpp b/src/mame/drivers/cortex.cpp index fbbab872536..7e9d3c9a351 100644 --- a/src/mame/drivers/cortex.cpp +++ b/src/mame/drivers/cortex.cpp @@ -30,7 +30,7 @@ class cortex_state : public driver_device { public: - cortex_state(const machine_config &mconfig, device_type type, std::string tag) + cortex_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_p_ram(*this, "ram") diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp index 8aceeca2a8e..bf7e382819e 100644 --- a/src/mame/drivers/cp1.cpp +++ b/src/mame/drivers/cp1.cpp @@ -22,7 +22,7 @@ class cp1_state : public driver_device { public: - cp1_state(const machine_config &mconfig, device_type type, std::string tag) + cp1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_i8155(*this, "i8155"), diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index 43c7bd7a0f6..af0104474a6 100644 --- a/src/mame/drivers/cps3.cpp +++ b/src/mame/drivers/cps3.cpp @@ -1404,22 +1404,22 @@ READ32_MEMBER(cps3_state::cps3_gfxflash_r) if (ACCESSING_BITS_24_31) // GFX Flash 1 { - logerror("read GFX flash chip %s addr %02x\n", chip0->tag().c_str(), (offset<<1)); + logerror("read GFX flash chip %s addr %02x\n", chip0->tag(), (offset<<1)); result |= chip0->read( (offset<<1) ) << 24; } if (ACCESSING_BITS_16_23) // GFX Flash 2 { - logerror("read GFX flash chip %s addr %02x\n", chip1->tag().c_str(), (offset<<1)); + logerror("read GFX flash chip %s addr %02x\n", chip1->tag(), (offset<<1)); result |= chip1->read( (offset<<1) ) << 16; } if (ACCESSING_BITS_8_15) // GFX Flash 1 { - logerror("read GFX flash chip %s addr %02x\n", chip0->tag().c_str(), (offset<<1)+1); + logerror("read GFX flash chip %s addr %02x\n", chip0->tag(), (offset<<1)+1); result |= chip0->read( (offset<<1)+0x1 ) << 8; } if (ACCESSING_BITS_0_7) // GFX Flash 2 { - logerror("read GFX flash chip %s addr %02x\n", chip1->tag().c_str(), (offset<<1)+1); + logerror("read GFX flash chip %s addr %02x\n", chip1->tag(), (offset<<1)+1); result |= chip1->read( (offset<<1)+0x1 ) << 0; } @@ -1444,19 +1444,19 @@ WRITE32_MEMBER(cps3_state::cps3_gfxflash_w) if (ACCESSING_BITS_24_31) // GFX Flash 1 { command = (data >> 24) & 0xff; - logerror("write to GFX flash chip %s addr %02x cmd %02x\n", chip0->tag().c_str(), (offset<<1), command); + logerror("write to GFX flash chip %s addr %02x cmd %02x\n", chip0->tag(), (offset<<1), command); chip0->write( (offset<<1), command); } if (ACCESSING_BITS_16_23) // GFX Flash 2 { command = (data >> 16) & 0xff; - logerror("write to GFX flash chip %s addr %02x cmd %02x\n", chip1->tag().c_str(), (offset<<1), command); + logerror("write to GFX flash chip %s addr %02x cmd %02x\n", chip1->tag(), (offset<<1), command); chip1->write( (offset<<1), command); } if (ACCESSING_BITS_8_15) // GFX Flash 1 { command = (data >> 8) & 0xff; - logerror("write to GFX flash chip %s addr %02x cmd %02x\n", chip0->tag().c_str(), (offset<<1)+1, command); + logerror("write to GFX flash chip %s addr %02x cmd %02x\n", chip0->tag(), (offset<<1)+1, command); chip0->write( (offset<<1)+0x1, command); } if (ACCESSING_BITS_0_7) // GFX Flash 2 @@ -1551,25 +1551,25 @@ void cps3_state::cps3_flashmain_w(int which, UINT32 offset, UINT32 data, UINT32 if (ACCESSING_BITS_24_31) // Flash 1 { command = (data >> 24) & 0xff; - logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][0]->tag().c_str(), offset, command); + logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][0]->tag(), offset, command); m_simm[which][0]->write(offset, command); } if (ACCESSING_BITS_16_23) // Flash 2 { command = (data >> 16) & 0xff; - logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][1]->tag().c_str(), offset, command); + logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][1]->tag(), offset, command); m_simm[which][1]->write(offset, command); } if (ACCESSING_BITS_8_15) // Flash 2 { command = (data >> 8) & 0xff; - logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][2]->tag().c_str(), offset, command); + logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][2]->tag(), offset, command); m_simm[which][2]->write(offset, command); } if (ACCESSING_BITS_0_7) // Flash 2 { command = (data >> 0) & 0xff; - logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][3]->tag().c_str(), offset, command); + logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][3]->tag(), offset, command); m_simm[which][3]->write(offset, command); } diff --git a/src/mame/drivers/craft.cpp b/src/mame/drivers/craft.cpp index e245a34365b..0601bf3659c 100644 --- a/src/mame/drivers/craft.cpp +++ b/src/mame/drivers/craft.cpp @@ -34,7 +34,7 @@ class craft_state : public driver_device { public: - craft_state(const machine_config &mconfig, device_type type, std::string tag) + craft_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac") diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp index 911462452fe..ebe604fbe48 100644 --- a/src/mame/drivers/crystal.cpp +++ b/src/mame/drivers/crystal.cpp @@ -195,7 +195,7 @@ GUN_xP are 6 pin gun connectors (pins 1-4 match the UNICO sytle guns): class crystal_state : public driver_device { public: - crystal_state(const machine_config &mconfig, device_type type, std::string tag) + crystal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sysregs(*this, "sysregs"), m_workram(*this, "workram"), diff --git a/src/mame/drivers/csc.cpp b/src/mame/drivers/csc.cpp new file mode 100644 index 00000000000..11dcf7763b6 --- /dev/null +++ b/src/mame/drivers/csc.cpp @@ -0,0 +1,349 @@ +// license:BSD-3-Clause +// copyright-holders:Kevin Horton,Jonathan Gevaryahu,Sandro Ronco +/****************************************************************************** + +WIP: plan to move to main fidelity chess driver + + + + + Fidelity Champion Chess Challenger (model CSC) + + See drivers/fidelz80.cpp for hardware description + + TODO: + - speech doesn't work + - make a better artwork + +******************************************************************************/ + +#include "emu.h" +#include "cpu/m6502/m6502.h" +#include "machine/6821pia.h" +#include "sound/s14001a.h" + +// same layout of Sensory Chess Challenger +//extern const char layout_vsc[]; + +class csc_state : public driver_device +{ +public: + csc_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu"), + m_speech(*this, "speech") + { } + + required_device m_maincpu; + required_device m_speech; + + virtual void machine_start() override; + + UINT16 input_read(int index); + DECLARE_WRITE8_MEMBER( pia0_pa_w ); + DECLARE_WRITE8_MEMBER( pia0_pb_w ); + DECLARE_READ8_MEMBER( pia0_pb_r ); + DECLARE_WRITE_LINE_MEMBER( pia0_ca2_w ); + DECLARE_WRITE8_MEMBER( pia1_pa_w ); + DECLARE_WRITE8_MEMBER( pia1_pb_w ); + DECLARE_READ8_MEMBER( pia1_pa_r ); + DECLARE_WRITE_LINE_MEMBER( pia1_ca2_w ); + DECLARE_WRITE_LINE_MEMBER( pia1_cb2_w ); + DECLARE_READ_LINE_MEMBER( pia1_ca1_r ); + DECLARE_READ_LINE_MEMBER( pia1_cb1_r ); + + UINT8 m_selector; + TIMER_DEVICE_CALLBACK_MEMBER(irq_timer); +}; + + +UINT16 csc_state::input_read(int index) +{ + static const char *const col_tag[] = + { + "IN.0", "IN.1", "IN.2", "IN.3", "IN.4", + "IN.5", "IN.6", "IN.7", "IN.8" + }; + + return ioport(col_tag[index])->read(); +} + + +WRITE8_MEMBER( csc_state::pia0_pa_w ) +{ + UINT8 out_digit = BITSWAP8(data,0,1,5,6,7,2,3,4 ); + + switch (m_selector) + { + case 0: + output().set_digit_value(0, out_digit & 0x7f); + output().set_value("pm_led", BIT(out_digit, 7)); + break; + case 1: + output().set_digit_value(1, out_digit & 0x7f); + break; + case 2: + output().set_digit_value(2, out_digit & 0x7f); + output().set_value("up_dot", BIT(out_digit, 7)); + break; + case 3: + output().set_digit_value(3, out_digit & 0x7f); + output().set_value("low_dot", BIT(out_digit, 7)); + break; + } + +// m_speech->reg_w(data & 0x3f); + + // for avoid the digit flashing + m_selector |= 0x80; +} + +WRITE8_MEMBER( csc_state::pia0_pb_w ) +{ +// m_speech->set_volume(15); // hack, s14001a core should assume a volume of 15 unless otherwise stated... +// m_speech->rst_w(BIT(data, 1)); +} + +READ8_MEMBER( csc_state::pia0_pb_r ) +{ + UINT8 data = 0x04; + + if(m_speech->bsy_r()) + data |= 0x08; + + if (m_selector<9) + if (input_read(m_selector) & 0x100) + data |= 0x20; + + return data; +} + +WRITE_LINE_MEMBER( csc_state::pia0_ca2_w ) +{ +} + +WRITE8_MEMBER( csc_state::pia1_pa_w ) +{ + m_selector = (m_selector & 0x0c) | ((data>>6) & 0x03); +} + +WRITE8_MEMBER( csc_state::pia1_pb_w ) +{ + static const char *const row_tag[] = + { + "led_a", "led_b", "led_c", "led_d", + "led_e", "led_f", "led_g", "led_h" + }; + + if (m_selector < 8) + for (int i=0; i<8; i++) + output().set_indexed_value(row_tag[m_selector], i+1, BIT(data, 7-i)); +} + +READ8_MEMBER( csc_state::pia1_pa_r ) +{ + UINT8 data = 0xff; + + if (m_selector<9) + data = input_read(m_selector); + + return data & 0x3f; +} + +WRITE_LINE_MEMBER( csc_state::pia1_ca2_w ) +{ + m_selector = (m_selector & 0x07) | (state ? 8 : 0); +} + +WRITE_LINE_MEMBER( csc_state::pia1_cb2_w ) +{ + m_selector = (m_selector & 0x0b) | (state ? 4 : 0); +} + +READ_LINE_MEMBER( csc_state::pia1_ca1_r ) +{ + int data = 0x01; + + if (m_selector<9) + data = BIT(input_read(m_selector), 6); + + return data; +} + +READ_LINE_MEMBER( csc_state::pia1_cb1_r ) +{ + int data = 0x01; + + if (m_selector<9) + data = BIT(input_read(m_selector),7); + + return data; +} + + +TIMER_DEVICE_CALLBACK_MEMBER(csc_state::irq_timer) +{ + m_maincpu->set_input_line(M6502_IRQ_LINE, HOLD_LINE); +} + +/* Address maps */ +static ADDRESS_MAP_START(csc_mem, AS_PROGRAM, 8, csc_state) + ADDRESS_MAP_UNMAP_HIGH + AM_RANGE( 0x0000, 0x07ff) AM_RAM AM_MIRROR(0x4000) //2K RAM + AM_RANGE( 0x0800, 0x0bff) AM_RAM AM_MIRROR(0x4400) //1K RAM + AM_RANGE( 0x1000, 0x1003) AM_DEVREADWRITE("pia0", pia6821_device, read, write) AM_MIRROR(0x47fc) + AM_RANGE( 0x1800, 0x1803) AM_DEVREADWRITE("pia1", pia6821_device, read, write) AM_MIRROR(0x47fc) + AM_RANGE( 0x2000, 0x3fff) AM_ROM AM_MIRROR(0x4000) + AM_RANGE( 0x8000, 0x9fff) AM_NOP + AM_RANGE( 0xa000, 0xffff) AM_ROM +ADDRESS_MAP_END + +/* Input ports */ +static INPUT_PORTS_START( csc ) + PORT_START("IN.0") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x100,IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Speak") PORT_CODE(KEYCODE_SPACE) + PORT_START("IN.1") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x100,IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("RV") PORT_CODE(KEYCODE_V) + PORT_START("IN.2") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x100,IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("TM") PORT_CODE(KEYCODE_T) + PORT_START("IN.3") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x100,IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("LV") PORT_CODE(KEYCODE_L) + PORT_START("IN.4") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x100,IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("DM") PORT_CODE(KEYCODE_M) + PORT_START("IN.5") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x100,IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("ST") PORT_CODE(KEYCODE_S) + PORT_START("IN.6") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x100,IP_ACTIVE_LOW, IPT_UNUSED) PORT_UNUSED + PORT_START("IN.7") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) + PORT_BIT(0x100,IP_ACTIVE_LOW, IPT_UNUSED) PORT_UNUSED + PORT_START("IN.8") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Pawn") PORT_CODE(KEYCODE_1) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Rook") PORT_CODE(KEYCODE_2) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Knight") PORT_CODE(KEYCODE_3) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Bishop") PORT_CODE(KEYCODE_4) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Queen") PORT_CODE(KEYCODE_5) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("King") PORT_CODE(KEYCODE_6) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("CL") PORT_CODE(KEYCODE_DEL) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("RE") PORT_CODE(KEYCODE_R) + PORT_BIT(0x100,IP_ACTIVE_LOW, IPT_UNUSED) PORT_UNUSED +INPUT_PORTS_END + + +void csc_state::machine_start() +{ + save_item(NAME(m_selector)); +} + +/* Machine driver */ +static MACHINE_CONFIG_START( csc, csc_state ) + /* basic machine hardware */ + MCFG_CPU_ADD("maincpu", M6502, 3900000/2) + MCFG_CPU_PROGRAM_MAP(csc_mem) + + //MCFG_DEFAULT_LAYOUT(layout_vsc) + + MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer", csc_state, irq_timer, attotime::from_hz(38400/64)) + + MCFG_DEVICE_ADD("pia0", PIA6821, 0) + MCFG_PIA_READPB_HANDLER(READ8(csc_state, pia0_pb_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(csc_state, pia0_pa_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(csc_state, pia0_pb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(csc_state, pia0_ca2_w)) + + MCFG_DEVICE_ADD("pia1", PIA6821, 0) + MCFG_PIA_READPA_HANDLER(READ8(csc_state, pia1_pa_r)) + MCFG_PIA_READCA1_HANDLER(READLINE(csc_state, pia1_ca1_r)) + MCFG_PIA_READCB1_HANDLER(READLINE(csc_state, pia1_cb1_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(csc_state, pia1_pa_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(csc_state, pia1_pb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(csc_state, pia1_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(csc_state, pia1_cb2_w)) + + /* sound hardware */ + MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_SOUND_ADD("speech", S14001A, 25000) // around 25khz + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) +MACHINE_CONFIG_END + +/* ROM definition */ +ROM_START(csc) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD("101-64109.bin", 0x2000, 0x2000, CRC(08a3577c) SHA1(69fe379d21a9d4b57c84c3832d7b3e7431eec341)) + ROM_LOAD("1025a03.bin", 0xa000, 0x2000, CRC(63982c07) SHA1(5ed4356323d5c80df216da55994abe94ba4aa94c)) + ROM_LOAD("1025a02.bin", 0xc000, 0x2000, CRC(9e6e7c69) SHA1(4f1ed9141b6596f4d2b1217d7a4ba48229f3f1b0)) + ROM_LOAD("1025a01.bin", 0xe000, 0x2000, CRC(57f068c3) SHA1(7d2ac4b9a2fba19556782863bdd89e2d2d94e97b)) + + ROM_LOAD("74s474.bin", 0xfe00, 0x0200, CRC(4511ba31) SHA1(e275b1739f8c3aa445cccb6a2b597475f507e456)) + + ROM_REGION(0x2000, "speech", 0) + ROM_LOAD("101-32107.bin", 0x0000, 0x1000, CRC(f35784f9) SHA1(348e54a7fa1e8091f89ac656b4da22f28ca2e44d)) +ROM_END + +/* Driver */ + +/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */ +COMP( 1981, csc, 0, 0, csc, csc, driver_device, 0, "Fidelity Electronics", "Champion Chess Challenger (model CSC)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK) diff --git a/src/mame/drivers/cshooter.cpp b/src/mame/drivers/cshooter.cpp index 60716859bd2..d667d57e710 100644 --- a/src/mame/drivers/cshooter.cpp +++ b/src/mame/drivers/cshooter.cpp @@ -93,7 +93,7 @@ Stephh's notes (based on the game Z80 code and some tests) : class cshooter_state : public driver_device { public: - cshooter_state(const machine_config &mconfig, device_type type, std::string tag) + cshooter_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_seibu_sound(*this, "seibu_sound"), diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp index 0f9c3bd9fab..fa87c2f7a02 100644 --- a/src/mame/drivers/csplayh5.cpp +++ b/src/mame/drivers/csplayh5.cpp @@ -37,7 +37,7 @@ class csplayh5_state : public driver_device { public: - csplayh5_state(const machine_config &mconfig, device_type type, std::string tag) + csplayh5_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tmp68301(*this, "tmp68301"), diff --git a/src/mame/drivers/cswat.cpp b/src/mame/drivers/cswat.cpp index f5bbd38bd23..3db9a40c5b9 100644 --- a/src/mame/drivers/cswat.cpp +++ b/src/mame/drivers/cswat.cpp @@ -30,7 +30,7 @@ TODO: class cswat_state : public driver_device { public: - cswat_state(const machine_config &mconfig, device_type type, std::string tag) + cswat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/ct486.cpp b/src/mame/drivers/ct486.cpp index 9119ec50e54..1af48cb802d 100644 --- a/src/mame/drivers/ct486.cpp +++ b/src/mame/drivers/ct486.cpp @@ -25,7 +25,7 @@ class ct486_state : public driver_device { public: - ct486_state(const machine_config &mconfig, device_type type, std::string tag) : + ct486_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cs4031(*this, "cs4031"), diff --git a/src/mame/drivers/cubeqst.cpp b/src/mame/drivers/cubeqst.cpp index 9e94330156f..6c084f3b897 100644 --- a/src/mame/drivers/cubeqst.cpp +++ b/src/mame/drivers/cubeqst.cpp @@ -30,7 +30,7 @@ class cubeqst_state : public driver_device { public: - cubeqst_state(const machine_config &mconfig, device_type type, std::string tag) + cubeqst_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc"), m_rotatecpu(*this, "rotate_cpu"), diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp index 1139f7d2913..2255cc6a1d4 100644 --- a/src/mame/drivers/cubo.cpp +++ b/src/mame/drivers/cubo.cpp @@ -324,7 +324,7 @@ routines : class cubo_state : public amiga_state { public: - cubo_state(const machine_config &mconfig, device_type type, std::string tag) : + cubo_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_p1_port(*this, "P1"), m_p2_port(*this, "P2"), diff --git a/src/mame/drivers/cultures.cpp b/src/mame/drivers/cultures.cpp index 2e4adfaef02..f9d58e31d57 100644 --- a/src/mame/drivers/cultures.cpp +++ b/src/mame/drivers/cultures.cpp @@ -20,7 +20,7 @@ class cultures_state : public driver_device { public: - cultures_state(const machine_config &mconfig, device_type type, std::string tag) + cultures_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/cupidon.cpp b/src/mame/drivers/cupidon.cpp index 8b31e9f2c4e..cf85470c75c 100644 --- a/src/mame/drivers/cupidon.cpp +++ b/src/mame/drivers/cupidon.cpp @@ -21,7 +21,7 @@ class cupidon_state : public driver_device { public: - cupidon_state(const machine_config &mconfig, device_type type, std::string tag) + cupidon_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxram(*this, "gfxram") diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index 20bb43d0bc5..02f4cfae416 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -185,7 +185,7 @@ Blitter Timing class cv1k_state : public driver_device { public: - cv1k_state(const machine_config &mconfig, device_type type, std::string tag) + cv1k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_blitter(*this, "blitter"), diff --git a/src/mame/drivers/cvicny.cpp b/src/mame/drivers/cvicny.cpp index 7d143e78bd7..8939702099d 100644 --- a/src/mame/drivers/cvicny.cpp +++ b/src/mame/drivers/cvicny.cpp @@ -39,7 +39,7 @@ class cvicny_state : public driver_device { public: - cvicny_state(const machine_config &mconfig, device_type type, std::string tag) + cvicny_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_digit_last(0) diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp index cba2127c11d..f38b11a5096 100644 --- a/src/mame/drivers/cybertnk.cpp +++ b/src/mame/drivers/cybertnk.cpp @@ -179,7 +179,7 @@ lev 7 : 0x7c : 0000 07e0 - input device clear? class cybertnk_state : public driver_device { public: - cybertnk_state(const machine_config &mconfig, device_type type, std::string tag) + cybertnk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/cyclemb.cpp b/src/mame/drivers/cyclemb.cpp index 14724984a03..0de60e76cac 100644 --- a/src/mame/drivers/cyclemb.cpp +++ b/src/mame/drivers/cyclemb.cpp @@ -80,7 +80,7 @@ Dumped by Chack'n class cyclemb_state : public driver_device { public: - cyclemb_state(const machine_config &mconfig, device_type type, std::string tag) + cyclemb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp index d00d166636d..1b0415d9b4f 100644 --- a/src/mame/drivers/czk80.cpp +++ b/src/mame/drivers/czk80.cpp @@ -54,7 +54,7 @@ I/O ports: These ranges are what is guessed class czk80_state : public driver_device { public: - czk80_state(const machine_config &mconfig, device_type type, std::string tag) + czk80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp index 770f01efd14..79c9ecab945 100644 --- a/src/mame/drivers/d6800.cpp +++ b/src/mame/drivers/d6800.cpp @@ -50,7 +50,7 @@ class d6800_state : public driver_device { public: - d6800_state(const machine_config &mconfig, device_type type, std::string tag) + d6800_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cass(*this, "cassette"), diff --git a/src/mame/drivers/d6809.cpp b/src/mame/drivers/d6809.cpp index cd8b45caeb6..1d6a17aecbe 100644 --- a/src/mame/drivers/d6809.cpp +++ b/src/mame/drivers/d6809.cpp @@ -91,7 +91,7 @@ devices. class d6809_state : public driver_device { public: - d6809_state(const machine_config &mconfig, device_type type, std::string tag) + d6809_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp index 3a95df85a80..571b365e972 100644 --- a/src/mame/drivers/d9final.cpp +++ b/src/mame/drivers/d9final.cpp @@ -29,7 +29,7 @@ class d9final_state : public driver_device { public: - d9final_state(const machine_config &mconfig, device_type type, std::string tag) + d9final_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp index b8663a93a9a..9179640f006 100644 --- a/src/mame/drivers/dacholer.cpp +++ b/src/mame/drivers/dacholer.cpp @@ -42,7 +42,7 @@ class dacholer_state : public driver_device { public: - dacholer_state(const machine_config &mconfig, device_type type, std::string tag) + dacholer_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_audiocpu(*this,"audiocpu"), diff --git a/src/mame/drivers/dai3wksi.cpp b/src/mame/drivers/dai3wksi.cpp index f822bbbf15c..c14016c1e49 100644 --- a/src/mame/drivers/dai3wksi.cpp +++ b/src/mame/drivers/dai3wksi.cpp @@ -49,7 +49,7 @@ Driver Notes: class dai3wksi_state : public driver_device { public: - dai3wksi_state(const machine_config &mconfig, device_type type, std::string tag) + dai3wksi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), diff --git a/src/mame/drivers/dambustr.cpp b/src/mame/drivers/dambustr.cpp index cdfb13279e6..13626af687b 100644 --- a/src/mame/drivers/dambustr.cpp +++ b/src/mame/drivers/dambustr.cpp @@ -60,7 +60,7 @@ Stephh's notes (based on the games Z80 code and some tests) : class dambustr_state : public galaxold_state { public: - dambustr_state(const machine_config &mconfig, device_type type, std::string tag) + dambustr_state(const machine_config &mconfig, device_type type, const char *tag) : galaxold_state(mconfig, type, tag), m_custom(*this, "cust") { } diff --git a/src/mame/drivers/daruma.cpp b/src/mame/drivers/daruma.cpp index d19c7d302bb..33f3226230c 100644 --- a/src/mame/drivers/daruma.cpp +++ b/src/mame/drivers/daruma.cpp @@ -23,7 +23,7 @@ class daruma_state : public driver_device { public: - daruma_state(const machine_config &mconfig, device_type type, std::string tag) + daruma_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker") { } diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp index ba1f07daecb..ed23cd2b96b 100644 --- a/src/mame/drivers/dblcrown.cpp +++ b/src/mame/drivers/dblcrown.cpp @@ -55,7 +55,7 @@ class dblcrown_state : public driver_device { public: - dblcrown_state(const machine_config &mconfig, device_type type, std::string tag) + dblcrown_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp index 1472e7ded5e..9076254e457 100644 --- a/src/mame/drivers/dblewing.cpp +++ b/src/mame/drivers/dblewing.cpp @@ -80,7 +80,7 @@ Notes: class dblewing_state : public driver_device { public: - dblewing_state(const machine_config &mconfig, device_type type, std::string tag) + dblewing_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_deco104(*this, "ioprot104"), m_pf1_rowscroll(*this, "pf1_rowscroll"), diff --git a/src/mame/drivers/dct11em.cpp b/src/mame/drivers/dct11em.cpp index 92e9ed71317..6140955e06a 100644 --- a/src/mame/drivers/dct11em.cpp +++ b/src/mame/drivers/dct11em.cpp @@ -14,7 +14,7 @@ class dct11em_state : public driver_device { public: - dct11em_state(const machine_config &mconfig, device_type type, std::string tag) + dct11em_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } virtual void machine_reset() override; diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp index a9af7ae1da4..39a0ad6718b 100644 --- a/src/mame/drivers/ddayjlc.cpp +++ b/src/mame/drivers/ddayjlc.cpp @@ -61,7 +61,7 @@ $842f = lives class ddayjlc_state : public driver_device { public: - ddayjlc_state(const machine_config &mconfig, device_type type, std::string tag) + ddayjlc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mainram(*this, "mainram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp index 4d6a848c66d..3d475618c26 100644 --- a/src/mame/drivers/ddealer.cpp +++ b/src/mame/drivers/ddealer.cpp @@ -120,7 +120,7 @@ class ddealer_state : public driver_device { public: - ddealer_state(const machine_config &mconfig, device_type type, std::string tag) + ddealer_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vregs(*this, "vregs"), m_left_fg_vram_top(*this, "left_fg_vratop"), diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp index 27670651372..af2113dc8a4 100644 --- a/src/mame/drivers/ddenlovr.cpp +++ b/src/mame/drivers/ddenlovr.cpp @@ -156,7 +156,7 @@ static const int mjflove_commands[8] = { BLIT_STOP, BLIT_CHANGE_PEN, BLIT_CHA class ddenlovr_state : public dynax_state { public: - ddenlovr_state(const machine_config &mconfig, device_type type, std::string tag) + ddenlovr_state(const machine_config &mconfig, device_type type, const char *tag) : dynax_state(mconfig, type, tag), m_dsw_sel16(*this, "dsw_sel16"), m_protection1(*this, "protection1"), diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp index 423fbc6f924..6a29b3b9e62 100644 --- a/src/mame/drivers/ddragon3.cpp +++ b/src/mame/drivers/ddragon3.cpp @@ -290,13 +290,13 @@ WRITE8_MEMBER(wwfwfest_state::wwfwfest_priority_w) /* DIPs are spread across the other input ports */ CUSTOM_INPUT_MEMBER(wwfwfest_state::dsw_3f_r) { - std::string tag = (const char *)param; + const char *tag = (const char *)param; return ioport(tag)->read() & 0x3f; } CUSTOM_INPUT_MEMBER(wwfwfest_state::dsw_c0_r) { - std::string tag = (const char *)param; + const char *tag = (const char *)param; return (ioport(tag)->read() & 0xc0) >> 6; } diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp index fd86c59950a..d51d3d5f4a3 100644 --- a/src/mame/drivers/de_2.cpp +++ b/src/mame/drivers/de_2.cpp @@ -41,7 +41,7 @@ class de_2_state : public genpin_class { public: - de_2_state(const machine_config &mconfig, device_type type, std::string tag) + de_2_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag), m_ym2151(*this, "ym2151"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/de_3.cpp b/src/mame/drivers/de_3.cpp index 6058077618c..24793a2058b 100644 --- a/src/mame/drivers/de_3.cpp +++ b/src/mame/drivers/de_3.cpp @@ -33,7 +33,7 @@ extern const char layout_pinball[]; class de_3_state : public genpin_class { public: - de_3_state(const machine_config &mconfig, device_type type, std::string tag) + de_3_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag), m_dmdtype1(*this, "decodmd1"), m_dmdtype2(*this, "decodmd2"), diff --git a/src/mame/drivers/de_3b.cpp b/src/mame/drivers/de_3b.cpp index 764d23f2b0f..f914a4ad3a4 100644 --- a/src/mame/drivers/de_3b.cpp +++ b/src/mame/drivers/de_3b.cpp @@ -16,7 +16,7 @@ extern const char layout_pinball[]; class de_3b_state : public driver_device { public: - de_3b_state(const machine_config &mconfig, device_type type, std::string tag) + de_3b_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_decobsmt(*this, "decobsmt"), m_dmdtype3(*this, "decodmd") diff --git a/src/mame/drivers/deco156.cpp b/src/mame/drivers/deco156.cpp index 03b2b627176..faa0f3bb6a5 100644 --- a/src/mame/drivers/deco156.cpp +++ b/src/mame/drivers/deco156.cpp @@ -28,7 +28,7 @@ class deco156_state : public driver_device { public: - deco156_state(const machine_config &mconfig, device_type type, std::string tag) + deco156_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_deco_tilegen1(*this, "tilegen1"), @@ -67,7 +67,7 @@ public: virtual void video_start() override; UINT32 screen_update_wcvol95(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(deco32_vbl_interrupt); - void descramble_sound( std::string tag ); + void descramble_sound( const char *tag ); DECO16IC_BANK_CB_MEMBER(bank_callback); DECOSPR_PRIORITY_CB_MEMBER(pri_callback); }; @@ -632,7 +632,7 @@ ROM_END /**********************************************************************************/ -void deco156_state::descramble_sound( std::string tag ) +void deco156_state::descramble_sound( const char *tag ) { UINT8 *rom = memregion(tag)->base(); int length = memregion(tag)->bytes(); diff --git a/src/mame/drivers/deco_ld.cpp b/src/mame/drivers/deco_ld.cpp index a64b7213068..13beeaf905c 100644 --- a/src/mame/drivers/deco_ld.cpp +++ b/src/mame/drivers/deco_ld.cpp @@ -117,7 +117,7 @@ Sound processor - 6502 class deco_ld_state : public driver_device { public: - deco_ld_state(const machine_config &mconfig, device_type type, std::string tag) + deco_ld_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp index 3dd454f80fe..5f6a9b8cba2 100644 --- a/src/mame/drivers/dectalk.cpp +++ b/src/mame/drivers/dectalk.cpp @@ -275,7 +275,7 @@ public: TIMER_OUTFIFO_READ }; - dectalk_state(const machine_config &mconfig, device_type type, std::string tag) + dectalk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dsp(*this, "dsp"), diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp index c839117bae8..105a113d703 100644 --- a/src/mame/drivers/decwritr.cpp +++ b/src/mame/drivers/decwritr.cpp @@ -25,7 +25,7 @@ class decwriter_state : public driver_device { public: // constructor - decwriter_state(const machine_config &mconfig, device_type type, std::string tag) + decwriter_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "beeper"), diff --git a/src/mame/drivers/deshoros.cpp b/src/mame/drivers/deshoros.cpp index 4ce6f3c389b..c7fa5025d59 100644 --- a/src/mame/drivers/deshoros.cpp +++ b/src/mame/drivers/deshoros.cpp @@ -36,7 +36,7 @@ TODO: class destiny_state : public driver_device { public: - destiny_state(const machine_config &mconfig, device_type type, std::string tag) + destiny_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_beeper(*this, "beeper") diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp index d149d6f725f..026e057f14b 100644 --- a/src/mame/drivers/destroyr.cpp +++ b/src/mame/drivers/destroyr.cpp @@ -27,7 +27,7 @@ public: TIMER_DESTROYR_FRAME }; - destroyr_state(const machine_config &mconfig, device_type type, std::string tag) + destroyr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/dfruit.cpp b/src/mame/drivers/dfruit.cpp index 95cf86ec28a..20e459a2b3d 100644 --- a/src/mame/drivers/dfruit.cpp +++ b/src/mame/drivers/dfruit.cpp @@ -26,7 +26,7 @@ class dfruit_state : public driver_device { public: - dfruit_state(const machine_config &mconfig, device_type type, std::string tag) + dfruit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_vdp(*this, "tc0091lvc") diff --git a/src/mame/drivers/dgpix.cpp b/src/mame/drivers/dgpix.cpp index 891e5434368..d3a3f8d270e 100644 --- a/src/mame/drivers/dgpix.cpp +++ b/src/mame/drivers/dgpix.cpp @@ -159,7 +159,7 @@ Notes: class dgpix_state : public driver_device { public: - dgpix_state(const machine_config &mconfig, device_type type, std::string tag) + dgpix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_vblank(*this, "VBLANK") { } diff --git a/src/mame/drivers/didact.cpp b/src/mame/drivers/didact.cpp index 7a7a1b13e16..615b3c199c1 100644 --- a/src/mame/drivers/didact.cpp +++ b/src/mame/drivers/didact.cpp @@ -140,7 +140,7 @@ class e100_state : public driver_device { public: - e100_state(const machine_config &mconfig, device_type type, std::string tag) + e100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pia1(*this, "pia1"), @@ -157,7 +157,7 @@ protected: class md6802_state : public driver_device { public: - md6802_state(const machine_config &mconfig, device_type type, std::string tag) + md6802_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pia1(*this, "pia1"), @@ -179,7 +179,7 @@ protected: class mp68a_state : public driver_device { public: - mp68a_state(const machine_config &mconfig, device_type type, std::string tag) + mp68a_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) ,m_maincpu(*this, "maincpu") ,m_io_line0(*this, "LINE0") diff --git a/src/mame/drivers/digel804.cpp b/src/mame/drivers/digel804.cpp index 1ed5a866db2..8e56c443a0f 100644 --- a/src/mame/drivers/digel804.cpp +++ b/src/mame/drivers/digel804.cpp @@ -68,7 +68,7 @@ class digel804_state : public driver_device { public: - digel804_state(const machine_config &mconfig, device_type type, std::string tag) + digel804_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp index 797b4ec67d7..ccbfe695144 100644 --- a/src/mame/drivers/dim68k.cpp +++ b/src/mame/drivers/dim68k.cpp @@ -44,7 +44,7 @@ class dim68k_state : public driver_device { public: - dim68k_state(const machine_config &mconfig, device_type type, std::string tag) + dim68k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_crtc(*this, "crtc"), diff --git a/src/mame/drivers/discoboy.cpp b/src/mame/drivers/discoboy.cpp index c2968e9bdc1..f127c4554e2 100644 --- a/src/mame/drivers/discoboy.cpp +++ b/src/mame/drivers/discoboy.cpp @@ -51,7 +51,7 @@ Notes: class discoboy_state : public driver_device { public: - discoboy_state(const machine_config &mconfig, device_type type, std::string tag) + discoboy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu") , m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/diverboy.cpp b/src/mame/drivers/diverboy.cpp index c83c94dd26b..b4146901107 100644 --- a/src/mame/drivers/diverboy.cpp +++ b/src/mame/drivers/diverboy.cpp @@ -58,7 +58,7 @@ class diverboy_state : public driver_device { public: - diverboy_state(const machine_config &mconfig, device_type type, std::string tag) + diverboy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp index 54bea119a1b..016e71a5358 100644 --- a/src/mame/drivers/dlair.cpp +++ b/src/mame/drivers/dlair.cpp @@ -50,7 +50,7 @@ class dlair_state : public driver_device { public: - dlair_state(const machine_config &mconfig, device_type type, std::string tag) : + dlair_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/drivers/dlair2.cpp b/src/mame/drivers/dlair2.cpp index 3446c8b6d13..0b246616fe0 100644 --- a/src/mame/drivers/dlair2.cpp +++ b/src/mame/drivers/dlair2.cpp @@ -38,7 +38,7 @@ http://www.dragons-lair-project.com/tech/pages/dl2.asp class dlair2_state : public driver_device { public: - dlair2_state(const machine_config &mconfig, device_type type, std::string tag) + dlair2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"){ } diff --git a/src/mame/drivers/dmndrby.cpp b/src/mame/drivers/dmndrby.cpp index 7aecf6fd278..209ac140802 100644 --- a/src/mame/drivers/dmndrby.cpp +++ b/src/mame/drivers/dmndrby.cpp @@ -61,7 +61,7 @@ DD10 DD14 DD18 H5 DD21 class dmndrby_state : public driver_device { public: - dmndrby_state(const machine_config &mconfig, device_type type, std::string tag) + dmndrby_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_scroll_ram(*this, "scroll_ram"), m_sprite_ram(*this, "sprite_ram"), diff --git a/src/mame/drivers/dms5000.cpp b/src/mame/drivers/dms5000.cpp index d5ed20a25a9..953f9aebe74 100644 --- a/src/mame/drivers/dms5000.cpp +++ b/src/mame/drivers/dms5000.cpp @@ -15,7 +15,7 @@ class dms5000_state : public driver_device { public: - dms5000_state(const machine_config &mconfig, device_type type, std::string tag) + dms5000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/dms86.cpp b/src/mame/drivers/dms86.cpp index 288b13c74cb..5ce16471276 100644 --- a/src/mame/drivers/dms86.cpp +++ b/src/mame/drivers/dms86.cpp @@ -33,7 +33,7 @@ the monitor and goes straight to "Joining HiNet". class dms86_state : public driver_device { public: - dms86_state(const machine_config &mconfig, device_type type, std::string tag) + dms86_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp index ed014a8b17c..8940c1263fa 100644 --- a/src/mame/drivers/dmv.cpp +++ b/src/mame/drivers/dmv.cpp @@ -38,7 +38,7 @@ class dmv_state : public driver_device { public: - dmv_state(const machine_config &mconfig, device_type type, std::string tag) + dmv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_hgdc(*this, "upd7220"), diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp index a66f67645de..329c14b446f 100644 --- a/src/mame/drivers/dolphunk.cpp +++ b/src/mame/drivers/dolphunk.cpp @@ -91,7 +91,7 @@ class dauphin_state : public driver_device { public: - dauphin_state(const machine_config &mconfig, device_type type, std::string tag) + dauphin_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_speaker(*this, "speaker") diff --git a/src/mame/drivers/dominob.cpp b/src/mame/drivers/dominob.cpp index c1d6fa52b96..1e64e010e4e 100644 --- a/src/mame/drivers/dominob.cpp +++ b/src/mame/drivers/dominob.cpp @@ -69,7 +69,7 @@ Notes: class dominob_state : public driver_device { public: - dominob_state(const machine_config &mconfig, device_type type, std::string tag) + dominob_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/drivers/dorachan.cpp b/src/mame/drivers/dorachan.cpp index 39209358672..daf69583d1a 100644 --- a/src/mame/drivers/dorachan.cpp +++ b/src/mame/drivers/dorachan.cpp @@ -17,7 +17,7 @@ Todo: class dorachan_state : public driver_device { public: - dorachan_state(const machine_config &mconfig, device_type type, std::string tag) + dorachan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_screen(*this, "screen"), diff --git a/src/mame/drivers/dotrikun.cpp b/src/mame/drivers/dotrikun.cpp index b90ae380823..4d4424fd4a8 100644 --- a/src/mame/drivers/dotrikun.cpp +++ b/src/mame/drivers/dotrikun.cpp @@ -29,7 +29,7 @@ SOUND : (none) class dotrikun_state : public driver_device { public: - dotrikun_state(const machine_config &mconfig, device_type type, std::string tag) + dotrikun_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_dotrikun_bitmap(*this, "dotrikun_bitmap"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/dps1.cpp b/src/mame/drivers/dps1.cpp index b2b9e8ea468..1250d4881c5 100644 --- a/src/mame/drivers/dps1.cpp +++ b/src/mame/drivers/dps1.cpp @@ -8,7 +8,7 @@ class dps1_state : public driver_device { public: - dps1_state(const machine_config &mconfig, device_type type, std::string tag) + dps1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } }; diff --git a/src/mame/drivers/dreambal.cpp b/src/mame/drivers/dreambal.cpp index 707fc78c869..19516ea4123 100644 --- a/src/mame/drivers/dreambal.cpp +++ b/src/mame/drivers/dreambal.cpp @@ -33,7 +33,7 @@ lamps? class dreambal_state : public driver_device { public: - dreambal_state(const machine_config &mconfig, device_type type, std::string tag) + dreambal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_deco104(*this, "ioprot104"), diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp index 403bc881d64..85725dd36ab 100644 --- a/src/mame/drivers/dreamwld.cpp +++ b/src/mame/drivers/dreamwld.cpp @@ -104,7 +104,7 @@ Stephh's notes (based on the game M68EC020 code and some tests) : class dreamwld_state : public driver_device { public: - dreamwld_state(const machine_config &mconfig, device_type type, std::string tag) + dreamwld_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_bg_videoram(*this, "bg_videoram"), diff --git a/src/mame/drivers/drtomy.cpp b/src/mame/drivers/drtomy.cpp index 1536bd9ecee..bfa7a311597 100644 --- a/src/mame/drivers/drtomy.cpp +++ b/src/mame/drivers/drtomy.cpp @@ -16,7 +16,7 @@ similar hardware. class drtomy_state : public driver_device { public: - drtomy_state(const machine_config &mconfig, device_type type, std::string tag) + drtomy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram_fg(*this, "videorafg"), m_videoram_bg(*this, "videorabg"), diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp index 5a4a054d3c7..c006afbb449 100644 --- a/src/mame/drivers/drw80pkr.cpp +++ b/src/mame/drivers/drw80pkr.cpp @@ -36,7 +36,7 @@ class drw80pkr_state : public driver_device { public: - drw80pkr_state(const machine_config &mconfig, device_type type, std::string tag) + drw80pkr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode") { } diff --git a/src/mame/drivers/dsb46.cpp b/src/mame/drivers/dsb46.cpp index 2897d13b8ce..a0066e94d80 100644 --- a/src/mame/drivers/dsb46.cpp +++ b/src/mame/drivers/dsb46.cpp @@ -27,7 +27,7 @@ Both roms contain Z80 code. class dsb46_state : public driver_device { public: - dsb46_state(const machine_config &mconfig, device_type type, std::string tag) + dsb46_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/dual68.cpp b/src/mame/drivers/dual68.cpp index 438a58e41d7..122f00090bf 100644 --- a/src/mame/drivers/dual68.cpp +++ b/src/mame/drivers/dual68.cpp @@ -18,7 +18,7 @@ class dual68_state : public driver_device { public: - dual68_state(const machine_config &mconfig, device_type type, std::string tag) + dual68_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp index a04485f33e0..44c44c38510 100644 --- a/src/mame/drivers/dunhuang.cpp +++ b/src/mame/drivers/dunhuang.cpp @@ -63,7 +63,7 @@ Notes: class dunhuang_state : public driver_device { public: - dunhuang_state(const machine_config &mconfig, device_type type, std::string tag) + dunhuang_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp index 4234b1b68b0..eb2236cee5d 100644 --- a/src/mame/drivers/dvk_kcgd.cpp +++ b/src/mame/drivers/dvk_kcgd.cpp @@ -54,7 +54,7 @@ class kcgd_state : public driver_device { public: - kcgd_state(const machine_config &mconfig, device_type type, std::string tag) : + kcgd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), // m_ms7004(*this, "ms7004"), diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp index e05af2c96a4..a136035ca0f 100644 --- a/src/mame/drivers/dvk_ksm.cpp +++ b/src/mame/drivers/dvk_ksm.cpp @@ -92,7 +92,7 @@ ksm|DVK KSM, class ksm_state : public driver_device { public: - ksm_state(const machine_config &mconfig, device_type type, std::string tag) : + ksm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/dwarfd.cpp b/src/mame/drivers/dwarfd.cpp index 05b49a77fee..bea0ff9d342 100644 --- a/src/mame/drivers/dwarfd.cpp +++ b/src/mame/drivers/dwarfd.cpp @@ -306,7 +306,7 @@ uPC1352C @ N3 class dwarfd_state : public driver_device { public: - dwarfd_state(const machine_config &mconfig, device_type type, std::string tag) + dwarfd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_palette(*this, "palette"), diff --git a/src/mame/drivers/dynadice.cpp b/src/mame/drivers/dynadice.cpp index b867ec9cc88..c2604827b94 100644 --- a/src/mame/drivers/dynadice.cpp +++ b/src/mame/drivers/dynadice.cpp @@ -43,7 +43,7 @@ dy_6.bin (near Z80) class dynadice_state : public driver_device { public: - dynadice_state(const machine_config &mconfig, device_type type, std::string tag) + dynadice_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/eacc.cpp b/src/mame/drivers/eacc.cpp index 36c5449f56e..38e7d29c3f3 100644 --- a/src/mame/drivers/eacc.cpp +++ b/src/mame/drivers/eacc.cpp @@ -57,7 +57,7 @@ class eacc_state : public driver_device { public: - eacc_state(const machine_config &mconfig, device_type type, std::string tag) + eacc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pia(*this, "pia"), diff --git a/src/mame/drivers/ec184x.cpp b/src/mame/drivers/ec184x.cpp index 163822be1b3..e0a1ed23348 100644 --- a/src/mame/drivers/ec184x.cpp +++ b/src/mame/drivers/ec184x.cpp @@ -38,7 +38,7 @@ class ec184x_state : public driver_device { public: - ec184x_state(const machine_config &mconfig, device_type type, std::string tag) + ec184x_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/ec65.cpp b/src/mame/drivers/ec65.cpp index da546879db1..8d458b174b7 100644 --- a/src/mame/drivers/ec65.cpp +++ b/src/mame/drivers/ec65.cpp @@ -29,7 +29,7 @@ class ec65_state : public driver_device { public: - ec65_state(const machine_config &mconfig, device_type type, std::string tag) + ec65_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_via_0(*this, VIA6522_0_TAG), m_via_1(*this, VIA6522_1_TAG), @@ -54,7 +54,7 @@ public: class ec65k_state : public driver_device { public: - ec65k_state(const machine_config &mconfig, device_type type, std::string tag) + ec65k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } diff --git a/src/mame/drivers/ecoinf1.cpp b/src/mame/drivers/ecoinf1.cpp index b7457795589..a4ba2c64e56 100644 --- a/src/mame/drivers/ecoinf1.cpp +++ b/src/mame/drivers/ecoinf1.cpp @@ -18,7 +18,7 @@ class ecoinf1_state : public driver_device { public: - ecoinf1_state(const machine_config &mconfig, device_type type, std::string tag) + ecoinf1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } DECLARE_DRIVER_INIT(ecoinf1); diff --git a/src/mame/drivers/ecoinf2.cpp b/src/mame/drivers/ecoinf2.cpp index b6f00522678..88509f164dc 100644 --- a/src/mame/drivers/ecoinf2.cpp +++ b/src/mame/drivers/ecoinf2.cpp @@ -21,7 +21,7 @@ class ecoinf2_state : public driver_device { public: - ecoinf2_state(const machine_config &mconfig, device_type type, std::string tag) + ecoinf2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_reel0(*this, "reel0"), diff --git a/src/mame/drivers/ecoinf3.cpp b/src/mame/drivers/ecoinf3.cpp index 2f25850c88b..a9d72e6fbc8 100644 --- a/src/mame/drivers/ecoinf3.cpp +++ b/src/mame/drivers/ecoinf3.cpp @@ -23,7 +23,7 @@ class ecoinf3_state : public driver_device { public: - ecoinf3_state(const machine_config &mconfig, device_type type, std::string tag) + ecoinf3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_reel0(*this, "reel0"), diff --git a/src/mame/drivers/ecoinfr.cpp b/src/mame/drivers/ecoinfr.cpp index 9085f6d7814..030c23c0cde 100644 --- a/src/mame/drivers/ecoinfr.cpp +++ b/src/mame/drivers/ecoinfr.cpp @@ -53,7 +53,7 @@ class ecoinfr_state : public driver_device { public: - ecoinfr_state(const machine_config &mconfig, device_type type, std::string tag) + ecoinfr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_reel0(*this, "reel0"), diff --git a/src/mame/drivers/egghunt.cpp b/src/mame/drivers/egghunt.cpp index 4b924a5eb7d..863d39e1a01 100644 --- a/src/mame/drivers/egghunt.cpp +++ b/src/mame/drivers/egghunt.cpp @@ -50,7 +50,7 @@ I dumped it with this configuration. In case I'll redump it desoldering pin 16 f class egghunt_state : public driver_device { public: - egghunt_state(const machine_config &mconfig, device_type type, std::string tag) + egghunt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu"), m_atram(*this, "atram"), diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp index 354e365305d..c2fd45e06b8 100644 --- a/src/mame/drivers/einstein.cpp +++ b/src/mame/drivers/einstein.cpp @@ -459,7 +459,7 @@ UINT32 einstein_state::screen_update_einstein2(screen_device &screen, bitmap_rgb else if (&screen == m_crtc_screen) m_mc6845->screen_update( screen, bitmap, cliprect); else - fatalerror("Unknown screen '%s'\n", screen.tag().c_str()); + fatalerror("Unknown screen '%s'\n", screen.tag()); return 0; } diff --git a/src/mame/drivers/elecbowl.cpp b/src/mame/drivers/elecbowl.cpp index 5110ced34b9..65a2070bc5c 100644 --- a/src/mame/drivers/elecbowl.cpp +++ b/src/mame/drivers/elecbowl.cpp @@ -36,7 +36,7 @@ class elecbowl_state : public hh_tms1k_state { public: - elecbowl_state(const machine_config &mconfig, device_type type, std::string tag) + elecbowl_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/electra.cpp b/src/mame/drivers/electra.cpp index eeeb9f79318..7ef23853bec 100644 --- a/src/mame/drivers/electra.cpp +++ b/src/mame/drivers/electra.cpp @@ -43,7 +43,7 @@ class electra_state : public driver_device { public: - electra_state(const machine_config &mconfig, device_type type, std::string tag) + electra_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/elekscmp.cpp b/src/mame/drivers/elekscmp.cpp index 15adab5932c..0eecbf9df4e 100644 --- a/src/mame/drivers/elekscmp.cpp +++ b/src/mame/drivers/elekscmp.cpp @@ -32,7 +32,7 @@ ToDo: class elekscmp_state : public driver_device { public: - elekscmp_state(const machine_config &mconfig, device_type type, std::string tag) + elekscmp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_x0(*this, "X0"), diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp index 89efec42d52..fa377badef9 100644 --- a/src/mame/drivers/elwro800.cpp +++ b/src/mame/drivers/elwro800.cpp @@ -35,7 +35,7 @@ class elwro800_state : public spectrum_state { public: - elwro800_state(const machine_config &mconfig, device_type type, std::string tag) + elwro800_state(const machine_config &mconfig, device_type type, const char *tag) : spectrum_state(mconfig, type, tag), m_i8251(*this, "i8251"), m_i8255(*this, "ppi8255"), diff --git a/src/mame/drivers/embargo.cpp b/src/mame/drivers/embargo.cpp index f7471a23501..586b96e16af 100644 --- a/src/mame/drivers/embargo.cpp +++ b/src/mame/drivers/embargo.cpp @@ -13,7 +13,7 @@ class embargo_state : public driver_device { public: - embargo_state(const machine_config &mconfig, device_type type, std::string tag) + embargo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/enigma2.cpp b/src/mame/drivers/enigma2.cpp index e88402b8a00..081b3f8ce96 100644 --- a/src/mame/drivers/enigma2.cpp +++ b/src/mame/drivers/enigma2.cpp @@ -58,7 +58,7 @@ TODO: class enigma2_state : public driver_device { public: - enigma2_state(const machine_config &mconfig, device_type type, std::string tag) + enigma2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp index 2de4a9e40aa..cdea1be9d8a 100644 --- a/src/mame/drivers/enmirage.cpp +++ b/src/mame/drivers/enmirage.cpp @@ -56,7 +56,7 @@ class mirage_state : public driver_device { public: - mirage_state(const machine_config &mconfig, device_type type, std::string tag) + mirage_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_fdc(*this, "wd1772"), diff --git a/src/mame/drivers/eolith16.cpp b/src/mame/drivers/eolith16.cpp index df2b161a0aa..6fe073c131c 100644 --- a/src/mame/drivers/eolith16.cpp +++ b/src/mame/drivers/eolith16.cpp @@ -22,7 +22,7 @@ class eolith16_state : public eolith_state { public: - eolith16_state(const machine_config &mconfig, device_type type, std::string tag) + eolith16_state(const machine_config &mconfig, device_type type, const char *tag) : eolith_state(mconfig, type, tag) { } std::unique_ptr m_vram; diff --git a/src/mame/drivers/ertictac.cpp b/src/mame/drivers/ertictac.cpp index 55bf32e6b20..e3723ee91cd 100644 --- a/src/mame/drivers/ertictac.cpp +++ b/src/mame/drivers/ertictac.cpp @@ -34,7 +34,7 @@ PCB has a single OSC at 24MHz class ertictac_state : public archimedes_state { public: - ertictac_state(const machine_config &mconfig, device_type type, std::string tag) + ertictac_state(const machine_config &mconfig, device_type type, const char *tag) : archimedes_state(mconfig, type, tag) { } DECLARE_READ32_MEMBER(ertictac_podule_r); diff --git a/src/mame/drivers/esh.cpp b/src/mame/drivers/esh.cpp index 597eeed6cad..72dcb78dfcb 100644 --- a/src/mame/drivers/esh.cpp +++ b/src/mame/drivers/esh.cpp @@ -38,7 +38,7 @@ public: TIMER_IRQ_STOP }; - esh_state(const machine_config &mconfig, device_type type, std::string tag) + esh_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc") , m_tile_ram(*this, "tile_ram"), diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp index a30a463116c..daa63b3904d 100644 --- a/src/mame/drivers/esq1.cpp +++ b/src/mame/drivers/esq1.cpp @@ -194,7 +194,7 @@ class esq1_filters : public device_t, { public: // construction/destruction - esq1_filters(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + esq1_filters(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void set_vca(int channel, UINT8 value); void set_vpan(int channel, UINT8 value); @@ -225,7 +225,7 @@ private: static const device_type ESQ1_FILTERS = &device_creator; -esq1_filters::esq1_filters(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +esq1_filters::esq1_filters(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ESQ1_FILTERS, "ESQ1 Filters stage", tag, owner, clock, "esq1-filters", __FILE__), device_sound_interface(mconfig, *this) { @@ -382,7 +382,7 @@ void esq1_filters::sound_stream_update(sound_stream &stream, stream_sample_t **i class esq1_state : public driver_device { public: - esq1_state(const machine_config &mconfig, device_type type, std::string tag) + esq1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_duart(*this, "duart"), diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp index 14229a2a11a..9b3e2493894 100644 --- a/src/mame/drivers/esq5505.cpp +++ b/src/mame/drivers/esq5505.cpp @@ -163,7 +163,7 @@ static void ATTR_PRINTF(1,2) print_to_stderr(const char *format, ...) class esq5505_state : public driver_device { public: - esq5505_state(const machine_config &mconfig, device_type type, std::string tag) + esq5505_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_duart(*this, "duart"), diff --git a/src/mame/drivers/esqasr.cpp b/src/mame/drivers/esqasr.cpp index 7ab4f543409..7bdcc11d521 100644 --- a/src/mame/drivers/esqasr.cpp +++ b/src/mame/drivers/esqasr.cpp @@ -48,7 +48,7 @@ class esqasr_state : public driver_device { public: - esqasr_state(const machine_config &mconfig, device_type type, std::string tag) + esqasr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_esp(*this, "esp"), diff --git a/src/mame/drivers/esqkt.cpp b/src/mame/drivers/esqkt.cpp index 1936171d8cd..b1a40fbb732 100644 --- a/src/mame/drivers/esqkt.cpp +++ b/src/mame/drivers/esqkt.cpp @@ -98,7 +98,7 @@ class esqkt_state : public driver_device { public: - esqkt_state(const machine_config &mconfig, device_type type, std::string tag) + esqkt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_esp(*this, "esp"), diff --git a/src/mame/drivers/esqmr.cpp b/src/mame/drivers/esqmr.cpp index 2467863c702..1de6b16b3a4 100644 --- a/src/mame/drivers/esqmr.cpp +++ b/src/mame/drivers/esqmr.cpp @@ -208,7 +208,7 @@ class esqmr_state : public driver_device { public: - esqmr_state(const machine_config &mconfig, device_type type, std::string tag) + esqmr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_sq1vfd(*this, "sq1vfd") diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp index 316a1d83890..aa02cf5e016 100644 --- a/src/mame/drivers/et3400.cpp +++ b/src/mame/drivers/et3400.cpp @@ -20,7 +20,7 @@ class et3400_state : public driver_device { public: - et3400_state(const machine_config &mconfig, device_type type, std::string tag) + et3400_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp index 0c911750685..76b8c8b4d12 100644 --- a/src/mame/drivers/ettrivia.cpp +++ b/src/mame/drivers/ettrivia.cpp @@ -36,7 +36,7 @@ Notes: class ettrivia_state : public driver_device { public: - ettrivia_state(const machine_config &mconfig, device_type type, std::string tag) + ettrivia_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_videoram(*this, "fg_videoram"), m_bg_videoram(*this, "bg_videoram"), diff --git a/src/mame/drivers/europc.cpp b/src/mame/drivers/europc.cpp index e053665368b..8a1f92ecfb0 100644 --- a/src/mame/drivers/europc.cpp +++ b/src/mame/drivers/europc.cpp @@ -11,7 +11,7 @@ class europc_pc_state : public driver_device { public: - europc_pc_state(const machine_config &mconfig, device_type type, std::string tag) : + europc_pc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mb(*this, "mb"), diff --git a/src/mame/drivers/evmbug.cpp b/src/mame/drivers/evmbug.cpp index 40669218ced..584544ed43d 100644 --- a/src/mame/drivers/evmbug.cpp +++ b/src/mame/drivers/evmbug.cpp @@ -20,7 +20,7 @@ class evmbug_state : public driver_device { public: - evmbug_state(const machine_config &mconfig, device_type type, std::string tag) + evmbug_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp index c519983c67d..8565eb550ba 100644 --- a/src/mame/drivers/excali64.cpp +++ b/src/mame/drivers/excali64.cpp @@ -50,7 +50,7 @@ ToDo: class excali64_state : public driver_device { public: - excali64_state(const machine_config &mconfig, device_type type, std::string tag) + excali64_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/exelv.cpp b/src/mame/drivers/exelv.cpp index eb982cc56bb..b32bad27f73 100644 --- a/src/mame/drivers/exelv.cpp +++ b/src/mame/drivers/exelv.cpp @@ -65,7 +65,7 @@ TODO: class exelv_state : public driver_device { public: - exelv_state(const machine_config &mconfig, device_type type, std::string tag) + exelv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tms3556(*this, "tms3556"), diff --git a/src/mame/drivers/exidyttl.cpp b/src/mame/drivers/exidyttl.cpp index b5cc32385b4..cbaef90b02a 100644 --- a/src/mame/drivers/exidyttl.cpp +++ b/src/mame/drivers/exidyttl.cpp @@ -44,7 +44,7 @@ Exidy discrete hardware games class exidyttl_state : public driver_device { public: - exidyttl_state(const machine_config &mconfig, device_type type, std::string tag) + exidyttl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp index f747e9314d5..79549bfa123 100644 --- a/src/mame/drivers/expro02.cpp +++ b/src/mame/drivers/expro02.cpp @@ -215,7 +215,7 @@ TODO: class expro02_state : public driver_device { public: - expro02_state(const machine_config &mconfig, device_type type, std::string tag) + expro02_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_expro02_fg_ind8_pixram(*this, "fg_ind8ram"), m_expro02_bg_rgb555_pixram(*this, "bg_rgb555ram"), diff --git a/src/mame/drivers/extrema.cpp b/src/mame/drivers/extrema.cpp index 69ff1f4dd68..4412839f895 100644 --- a/src/mame/drivers/extrema.cpp +++ b/src/mame/drivers/extrema.cpp @@ -19,7 +19,7 @@ class extrema_state : public driver_device { public: - extrema_state(const machine_config &mconfig, device_type type, std::string tag) + extrema_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/f-32.cpp b/src/mame/drivers/f-32.cpp index 40b69d31222..a3fa89710d5 100644 --- a/src/mame/drivers/f-32.cpp +++ b/src/mame/drivers/f-32.cpp @@ -36,7 +36,7 @@ f5 class mosaicf2_state : public driver_device { public: - mosaicf2_state(const machine_config &mconfig, device_type type, std::string tag) + mosaicf2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") , m_videoram(*this, "videoram"){ } diff --git a/src/mame/drivers/famibox.cpp b/src/mame/drivers/famibox.cpp index 6032785d78c..ee39a617359 100644 --- a/src/mame/drivers/famibox.cpp +++ b/src/mame/drivers/famibox.cpp @@ -69,7 +69,7 @@ Notes/ToDo: class famibox_state : public driver_device { public: - famibox_state(const machine_config &mconfig, device_type type, std::string tag) + famibox_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppu(*this, "ppu") { } diff --git a/src/mame/drivers/fanucs15.cpp b/src/mame/drivers/fanucs15.cpp index b192756c80c..c9cb662a2f4 100644 --- a/src/mame/drivers/fanucs15.cpp +++ b/src/mame/drivers/fanucs15.cpp @@ -311,7 +311,7 @@ class fanucs15_state : public driver_device { public: - fanucs15_state(const machine_config &mconfig, device_type type, std::string tag) + fanucs15_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") // main 68020 , m_pmccpu(*this, "pmccpu") // sub 68000-12 diff --git a/src/mame/drivers/fanucspmg.cpp b/src/mame/drivers/fanucspmg.cpp index d5dfb3a8d2d..88eb5836d87 100644 --- a/src/mame/drivers/fanucspmg.cpp +++ b/src/mame/drivers/fanucspmg.cpp @@ -560,7 +560,7 @@ the keypad symbols seem to use a different matrix pattern from the rest? class fanucspmg_state : public driver_device { public: - fanucspmg_state(const machine_config &mconfig, device_type type, std::string tag) + fanucspmg_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, MAINCPU_TAG) , m_subcpu(*this, SUBCPU_TAG) diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp index c77d4f43c17..875736b1aee 100644 --- a/src/mame/drivers/fastinvaders.cpp +++ b/src/mame/drivers/fastinvaders.cpp @@ -22,7 +22,7 @@ http://www.citylan.it/wiki/index.php/Fast_Invaders_%288275_version%29 class fastinvaders_state : public driver_device { public: - fastinvaders_state(const machine_config &mconfig, device_type type, std::string tag) + fastinvaders_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), @@ -248,7 +248,7 @@ WRITE8_MEMBER(fastinvaders_state::io_40_w) WRITE8_MEMBER(fastinvaders_state::io_90_w) { - logerror("Audio write %02X\n",data); +logerror("Audio write &02X\n",data); } diff --git a/src/mame/drivers/fb01.cpp b/src/mame/drivers/fb01.cpp index 8feb3510e71..b45fbe6f036 100644 --- a/src/mame/drivers/fb01.cpp +++ b/src/mame/drivers/fb01.cpp @@ -21,7 +21,7 @@ class fb01_state : public driver_device { public: - fb01_state(const machine_config &mconfig, device_type type, std::string tag) + fb01_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_upd71051(*this, "upd71051") diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp index 79e62a1308b..7b32ffc4a18 100644 --- a/src/mame/drivers/fc100.cpp +++ b/src/mame/drivers/fc100.cpp @@ -49,7 +49,7 @@ TODO: class fc100_state : public driver_device { public: - fc100_state(const machine_config &mconfig, device_type type, std::string tag) + fc100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_vdg(*this, "vdg") diff --git a/src/mame/drivers/feversoc.cpp b/src/mame/drivers/feversoc.cpp index cfa668a377d..eb810a83fc4 100644 --- a/src/mame/drivers/feversoc.cpp +++ b/src/mame/drivers/feversoc.cpp @@ -69,7 +69,7 @@ U0564 LH28F800SU OBJ4-1 class feversoc_state : public driver_device { public: - feversoc_state(const machine_config &mconfig, device_type type, std::string tag) + feversoc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mainram(*this, "workram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/drivers/fireball.cpp b/src/mame/drivers/fireball.cpp index c0dfc8ef058..eb73ab3ad37 100644 --- a/src/mame/drivers/fireball.cpp +++ b/src/mame/drivers/fireball.cpp @@ -43,7 +43,7 @@ class fireball_state : public driver_device { public: - fireball_state(const machine_config &mconfig, device_type type, std::string tag) + fireball_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ay(*this, "aysnd"), diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp index 39bdf5ab101..bdfaac9e1a6 100644 --- a/src/mame/drivers/firebeat.cpp +++ b/src/mame/drivers/firebeat.cpp @@ -169,7 +169,7 @@ struct IBUTTON class firebeat_state : public driver_device { public: - firebeat_state(const machine_config &mconfig, device_type type, std::string tag) + firebeat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp index ad6caeb26ec..6d52a64e925 100644 --- a/src/mame/drivers/firefox.cpp +++ b/src/mame/drivers/firefox.cpp @@ -41,7 +41,7 @@ but requires a special level III player for proper control. Video: CAV. Audio: A class firefox_state : public driver_device { public: - firefox_state(const machine_config &mconfig, device_type type, std::string tag) + firefox_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc") , m_tileram(*this, "tileram"), diff --git a/src/mame/drivers/fk1.cpp b/src/mame/drivers/fk1.cpp index a05814054c4..e250aada256 100644 --- a/src/mame/drivers/fk1.cpp +++ b/src/mame/drivers/fk1.cpp @@ -19,7 +19,7 @@ class fk1_state : public driver_device { public: - fk1_state(const machine_config &mconfig, device_type type, std::string tag) + fk1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG) diff --git a/src/mame/drivers/flicker.cpp b/src/mame/drivers/flicker.cpp index 8e8878ea969..09947a0f2e6 100644 --- a/src/mame/drivers/flicker.cpp +++ b/src/mame/drivers/flicker.cpp @@ -26,7 +26,7 @@ class flicker_state : public genpin_class { public: - flicker_state(const machine_config &mconfig, device_type type, std::string tag) + flicker_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_testport(*this, "TEST") diff --git a/src/mame/drivers/flipjack.cpp b/src/mame/drivers/flipjack.cpp index 60ead4b5feb..777686e7b7b 100644 --- a/src/mame/drivers/flipjack.cpp +++ b/src/mame/drivers/flipjack.cpp @@ -89,7 +89,7 @@ ________________________|___________________________ class flipjack_state : public driver_device { public: - flipjack_state(const machine_config &mconfig, device_type type, std::string tag) + flipjack_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp index 3f26f6ab147..f2772125a32 100644 --- a/src/mame/drivers/flyball.cpp +++ b/src/mame/drivers/flyball.cpp @@ -35,7 +35,7 @@ public: TIMER_QUARTER }; - flyball_state(const machine_config &mconfig, device_type type, std::string tag) + flyball_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp index b27e05d75ed..a4ba796836e 100644 --- a/src/mame/drivers/force68k.cpp +++ b/src/mame/drivers/force68k.cpp @@ -125,7 +125,7 @@ class force68k_state : public driver_device { public: -force68k_state(const machine_config &mconfig, device_type type, std::string tag) : +force68k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device (mconfig, type, tag), m_maincpu (*this, "maincpu"), m_rtc (*this, "rtc"), diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp index a877dd42689..6f0334ef9d0 100644 --- a/src/mame/drivers/forte2.cpp +++ b/src/mame/drivers/forte2.cpp @@ -31,7 +31,7 @@ found/dumped yet. */ class forte2_state : public driver_device { public: - forte2_state(const machine_config &mconfig, device_type type, std::string tag) + forte2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp index 229f9a5ae4e..59043194bfe 100644 --- a/src/mame/drivers/fortecar.cpp +++ b/src/mame/drivers/fortecar.cpp @@ -330,7 +330,7 @@ class fortecar_state : public driver_device { public: - fortecar_state(const machine_config &mconfig, device_type type, std::string tag) + fortecar_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_vram(*this, "vram"), diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp index dcc64db9ab5..6352049278c 100644 --- a/src/mame/drivers/fp1100.cpp +++ b/src/mame/drivers/fp1100.cpp @@ -66,7 +66,7 @@ class fp1100_state : public driver_device { public: - fp1100_state(const machine_config &mconfig, device_type type, std::string tag) + fp1100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/fp200.cpp b/src/mame/drivers/fp200.cpp index 2fd185bc7c5..0bf5c3a0239 100644 --- a/src/mame/drivers/fp200.cpp +++ b/src/mame/drivers/fp200.cpp @@ -28,7 +28,7 @@ class fp200_state : public driver_device { public: - fp200_state(const machine_config &mconfig, device_type type, std::string tag) + fp200_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/fp6000.cpp b/src/mame/drivers/fp6000.cpp index 82700e9337a..fba366c95d9 100644 --- a/src/mame/drivers/fp6000.cpp +++ b/src/mame/drivers/fp6000.cpp @@ -26,7 +26,7 @@ class fp6000_state : public driver_device { public: - fp6000_state(const machine_config &mconfig, device_type type, std::string tag) + fp6000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_gvram(*this, "gvram"), m_vram(*this, "vram"), diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp index 176c77adf75..b6bb3cc636f 100644 --- a/src/mame/drivers/fresh.cpp +++ b/src/mame/drivers/fresh.cpp @@ -31,7 +31,7 @@ rom 5 and 6 are prg roms class fresh_state : public driver_device { public: - fresh_state(const machine_config &mconfig, device_type type, std::string tag) + fresh_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_videoram(*this, "bg_videoram"), m_bg_2_videoram(*this, "bg_videoram_2"), diff --git a/src/mame/drivers/fruitpc.cpp b/src/mame/drivers/fruitpc.cpp index 79ff60ba47a..ce459586a45 100644 --- a/src/mame/drivers/fruitpc.cpp +++ b/src/mame/drivers/fruitpc.cpp @@ -25,7 +25,7 @@ class fruitpc_state : public pcat_base_state { public: - fruitpc_state(const machine_config &mconfig, device_type type, std::string tag) + fruitpc_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag), m_inp1(*this, "INP1"), m_inp2(*this, "INP2"), diff --git a/src/mame/drivers/ft68m.cpp b/src/mame/drivers/ft68m.cpp index 9079be64afb..e8077b58b89 100644 --- a/src/mame/drivers/ft68m.cpp +++ b/src/mame/drivers/ft68m.cpp @@ -22,7 +22,7 @@ Interrupts: INT6 is output of Timer 2, INT7 is output of Timer 3 (refresh), class ft68m_state : public driver_device { public: - ft68m_state(const machine_config &mconfig, device_type type, std::string tag) + ft68m_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_base(*this, "rambase"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/fungames.cpp b/src/mame/drivers/fungames.cpp index 1e4a7e21ea3..ac526d7153c 100644 --- a/src/mame/drivers/fungames.cpp +++ b/src/mame/drivers/fungames.cpp @@ -39,7 +39,7 @@ class fungames_state : public driver_device { public: - fungames_state(const machine_config &mconfig, device_type type, std::string tag) + fungames_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/funkball.cpp b/src/mame/drivers/funkball.cpp index 4f1e54c94db..caa650705fe 100644 --- a/src/mame/drivers/funkball.cpp +++ b/src/mame/drivers/funkball.cpp @@ -83,7 +83,7 @@ Notes: class funkball_state : public pcat_base_state { public: - funkball_state(const machine_config &mconfig, device_type type, std::string tag) + funkball_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag), m_voodoo(*this, "voodoo_0"), m_unk_ram(*this, "unk_ram"), diff --git a/src/mame/drivers/g627.cpp b/src/mame/drivers/g627.cpp index 45338341b24..e96509a1703 100644 --- a/src/mame/drivers/g627.cpp +++ b/src/mame/drivers/g627.cpp @@ -49,7 +49,7 @@ ToDo: class g627_state : public genpin_class { public: - g627_state(const machine_config &mconfig, device_type type, std::string tag) + g627_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_switch(*this, "SWITCH") diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp index 2a3d41b1539..4fcb523ade2 100644 --- a/src/mame/drivers/gal3.cpp +++ b/src/mame/drivers/gal3.cpp @@ -139,7 +139,7 @@ better notes (complete chip lists) for each board still needed class gal3_state : public namcos2_shared_state { public: - gal3_state(const machine_config &mconfig, device_type type, std::string tag) + gal3_state(const machine_config &mconfig, device_type type, const char *tag) : namcos2_shared_state(mconfig, type, tag) , m_rso_shared_ram(*this, "rso_shared_ram"), m_generic_paletteram_16(*this, "paletteram") { } diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp index 765f08f084e..617ce8a3956 100644 --- a/src/mame/drivers/galaxi.cpp +++ b/src/mame/drivers/galaxi.cpp @@ -50,7 +50,7 @@ Notes: class galaxi_state : public driver_device { public: - galaxi_state(const machine_config &mconfig, device_type type, std::string tag) + galaxi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg1_ram(*this, "bg1_ram"), m_bg2_ram(*this, "bg2_ram"), diff --git a/src/mame/drivers/galgame.cpp b/src/mame/drivers/galgame.cpp index 3867dbe9672..0855699da39 100644 --- a/src/mame/drivers/galgame.cpp +++ b/src/mame/drivers/galgame.cpp @@ -19,7 +19,7 @@ class galaxygame_state : public driver_device { public: - galaxygame_state(const machine_config &mconfig, device_type type, std::string tag) + galaxygame_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette") { } diff --git a/src/mame/drivers/galpani2.cpp b/src/mame/drivers/galpani2.cpp index 38c94e02085..a658e02409b 100644 --- a/src/mame/drivers/galpani2.cpp +++ b/src/mame/drivers/galpani2.cpp @@ -332,14 +332,14 @@ WRITE8_MEMBER(galpani2_state::galpani2_coin_lockout_w) WRITE8_MEMBER(galpani2_state::galpani2_oki1_bank_w) { UINT8 *ROM = memregion("oki1")->base(); - logerror("%s : %s bank %08X\n",machine().describe_context(),tag().c_str(),data); + logerror("%s : %s bank %08X\n",machine().describe_context(),tag(),data); memcpy(ROM + 0x30000, ROM + 0x40000 + 0x10000 * (~data & 0xf), 0x10000); } WRITE8_MEMBER(galpani2_state::galpani2_oki2_bank_w) { m_oki2->set_bank_base(0x40000 * (data & 0xf) ); - logerror("%s : %s bank %08X\n",machine().describe_context(),tag().c_str(),data); + logerror("%s : %s bank %08X\n",machine().describe_context(),tag(),data); } diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp index 00432bba273..c54af2de04d 100644 --- a/src/mame/drivers/galpani3.cpp +++ b/src/mame/drivers/galpani3.cpp @@ -74,7 +74,7 @@ Dumped by Uki class galpani3_state : public driver_device { public: - galpani3_state(const machine_config &mconfig, device_type type, std::string tag) + galpani3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_grap2_0(*this,"grap2_0"), diff --git a/src/mame/drivers/gamate.cpp b/src/mame/drivers/gamate.cpp index a4e05da6306..66959b13008 100644 --- a/src/mame/drivers/gamate.cpp +++ b/src/mame/drivers/gamate.cpp @@ -19,7 +19,7 @@ class gamate_state : public driver_device { public: - gamate_state(const machine_config &mconfig, device_type type, std::string tag) + gamate_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_sound(*this, "custom") diff --git a/src/mame/drivers/gambl186.cpp b/src/mame/drivers/gambl186.cpp index 7d2336472a3..89e009743c5 100644 --- a/src/mame/drivers/gambl186.cpp +++ b/src/mame/drivers/gambl186.cpp @@ -58,7 +58,7 @@ TODO: class gambl186_state : public driver_device { public: - gambl186_state(const machine_config &mconfig, device_type type, std::string tag) + gambl186_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_upd7759(*this, "7759") { } diff --git a/src/mame/drivers/gamecstl.cpp b/src/mame/drivers/gamecstl.cpp index 7c5ddda7a22..97e2e248323 100644 --- a/src/mame/drivers/gamecstl.cpp +++ b/src/mame/drivers/gamecstl.cpp @@ -75,7 +75,7 @@ class gamecstl_state : public pcat_base_state { public: - gamecstl_state(const machine_config &mconfig, device_type type, std::string tag) + gamecstl_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag), m_cga_ram(*this, "cga_ram"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/gameking.cpp b/src/mame/drivers/gameking.cpp index 596936984e9..66ce023b10b 100644 --- a/src/mame/drivers/gameking.cpp +++ b/src/mame/drivers/gameking.cpp @@ -35,7 +35,7 @@ class gameking_state : public driver_device { public: - gameking_state(const machine_config &mconfig, device_type type, std::string tag) + gameking_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cart(*this, "cartslot"), diff --git a/src/mame/drivers/gammagic.cpp b/src/mame/drivers/gammagic.cpp index 8b9714bc96e..6fb03850748 100644 --- a/src/mame/drivers/gammagic.cpp +++ b/src/mame/drivers/gammagic.cpp @@ -42,7 +42,7 @@ Additional CD-ROM games: "99 Bottles of Beer" class gammagic_state : public pcat_base_state { public: - gammagic_state(const machine_config &mconfig, device_type type, std::string tag) + gammagic_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag) { } virtual void machine_start() override; diff --git a/src/mame/drivers/gamtor.cpp b/src/mame/drivers/gamtor.cpp index d64b10af4e5..adb337a720a 100644 --- a/src/mame/drivers/gamtor.cpp +++ b/src/mame/drivers/gamtor.cpp @@ -34,7 +34,7 @@ class gaminator_state : public driver_device { public: - gaminator_state(const machine_config &mconfig, device_type type, std::string tag) + gaminator_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/gei.cpp b/src/mame/drivers/gei.cpp index db310d6ef83..351ff521f69 100644 --- a/src/mame/drivers/gei.cpp +++ b/src/mame/drivers/gei.cpp @@ -82,7 +82,7 @@ NOTE: Trivia Question rom names are the internal names used. IE: read from the f class gei_state : public driver_device { public: - gei_state(const machine_config &mconfig, device_type type, std::string tag) + gei_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), diff --git a/src/mame/drivers/geneve.cpp b/src/mame/drivers/geneve.cpp index 9538ea8a34f..59775a8f130 100644 --- a/src/mame/drivers/geneve.cpp +++ b/src/mame/drivers/geneve.cpp @@ -225,7 +225,7 @@ class geneve_state : public driver_device { public: - geneve_state(const machine_config &mconfig, device_type type, std::string tag) + geneve_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cpu(*this, "maincpu"), m_tms9901(*this, TMS9901_TAG), diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp index e9d964cd5a1..dbfd894b9e5 100644 --- a/src/mame/drivers/geniusiq.cpp +++ b/src/mame/drivers/geniusiq.cpp @@ -254,7 +254,7 @@ public: IQ128_NO_CART = 0x03 }; - geniusiq_state(const machine_config &mconfig, device_type type, std::string tag) + geniusiq_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cart(*this, "cartslot"), @@ -312,7 +312,7 @@ private: class gl8008cx_state : public driver_device { public: - gl8008cx_state(const machine_config &mconfig, device_type type, std::string tag) + gl8008cx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/genpc.cpp b/src/mame/drivers/genpc.cpp index 23584037770..72d267b69af 100644 --- a/src/mame/drivers/genpc.cpp +++ b/src/mame/drivers/genpc.cpp @@ -22,7 +22,7 @@ class genpc_state : public driver_device { public: - genpc_state(const machine_config &mconfig, device_type type, std::string tag) + genpc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/ggconnie.cpp b/src/mame/drivers/ggconnie.cpp index 12eed01a657..236a5c1c21d 100644 --- a/src/mame/drivers/ggconnie.cpp +++ b/src/mame/drivers/ggconnie.cpp @@ -32,7 +32,7 @@ class ggconnie_state : public pce_common_state { public: - ggconnie_state(const machine_config &mconfig, device_type type, std::string tag) + ggconnie_state(const machine_config &mconfig, device_type type, const char *tag) : pce_common_state(mconfig, type, tag), m_rtc(*this, "rtc"), m_oki(*this, "oki") diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp index d729fe2ecb8..6a57e0ccba5 100644 --- a/src/mame/drivers/ghosteo.cpp +++ b/src/mame/drivers/ghosteo.cpp @@ -84,7 +84,7 @@ struct nand_t class ghosteo_state : public driver_device { public: - ghosteo_state(const machine_config &mconfig, device_type type, std::string tag) + ghosteo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") , m_i2cmem(*this, "i2cmem"), diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp index b13af7ae728..c951b6309cb 100644 --- a/src/mame/drivers/gimix.cpp +++ b/src/mame/drivers/gimix.cpp @@ -63,7 +63,7 @@ class gimix_state : public driver_device { public: - gimix_state(const machine_config &mconfig, device_type type, std::string tag) + gimix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_fdc(*this, "fdc") diff --git a/src/mame/drivers/gizmondo.cpp b/src/mame/drivers/gizmondo.cpp index 0ac24396992..4f14b5ab349 100644 --- a/src/mame/drivers/gizmondo.cpp +++ b/src/mame/drivers/gizmondo.cpp @@ -45,7 +45,7 @@ SYSINTR_GPS = INT_EINT3, INT_EINT8_23 (EINT18) class gizmondo_state : public driver_device { public: - gizmondo_state(const machine_config &mconfig, device_type type, std::string tag) + gizmondo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_s3c2440(*this, "s3c2440"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp index eba151c6e1c..b751be8a2fb 100644 --- a/src/mame/drivers/gkigt.cpp +++ b/src/mame/drivers/gkigt.cpp @@ -89,7 +89,7 @@ PCB board that connects to 044 boards via J6 & J7 class igt_gameking_state : public driver_device { public: - igt_gameking_state(const machine_config &mconfig, device_type type, std::string tag) + igt_gameking_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } diff --git a/src/mame/drivers/glasgow.cpp b/src/mame/drivers/glasgow.cpp index a0ee00c428b..c46ef03ae1c 100644 --- a/src/mame/drivers/glasgow.cpp +++ b/src/mame/drivers/glasgow.cpp @@ -58,7 +58,7 @@ R.Schaefer Oct 2010 class glasgow_state : public mboard_state { public: - glasgow_state(const machine_config &mconfig, device_type type, std::string tag) + glasgow_state(const machine_config &mconfig, device_type type, const char *tag) : mboard_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_beep(*this, "beeper"), diff --git a/src/mame/drivers/globalfr.cpp b/src/mame/drivers/globalfr.cpp index 6347c4549d7..b64b666aba7 100644 --- a/src/mame/drivers/globalfr.cpp +++ b/src/mame/drivers/globalfr.cpp @@ -24,7 +24,7 @@ class globalfr_state : public driver_device { public: - globalfr_state(const machine_config &mconfig, device_type type, std::string tag) + globalfr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_vfd(*this, "vfd") diff --git a/src/mame/drivers/globalvr.cpp b/src/mame/drivers/globalvr.cpp index f5329a531e2..04b957b9c90 100644 --- a/src/mame/drivers/globalvr.cpp +++ b/src/mame/drivers/globalvr.cpp @@ -62,7 +62,7 @@ UltraPin 2006 class globalvr_state : public driver_device { public: - globalvr_state(const machine_config &mconfig, device_type type, std::string tag) + globalvr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp index fc63a987ac3..5802238eddc 100644 --- a/src/mame/drivers/gluck2.cpp +++ b/src/mame/drivers/gluck2.cpp @@ -204,7 +204,7 @@ class gluck2_state : public driver_device { public: - gluck2_state(const machine_config &mconfig, device_type type, std::string tag) + gluck2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp index 71d293c771a..dc586efab82 100644 --- a/src/mame/drivers/gmaster.cpp +++ b/src/mame/drivers/gmaster.cpp @@ -15,7 +15,7 @@ class gmaster_state : public driver_device { public: - gmaster_state(const machine_config &mconfig, device_type type, std::string tag) + gmaster_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_speaker(*this, "speaker") diff --git a/src/mame/drivers/go2000.cpp b/src/mame/drivers/go2000.cpp index 798044ccd99..5bb7a58f0a3 100644 --- a/src/mame/drivers/go2000.cpp +++ b/src/mame/drivers/go2000.cpp @@ -39,7 +39,7 @@ Notes: class go2000_state : public driver_device { public: - go2000_state(const machine_config &mconfig, device_type type, std::string tag) + go2000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_videoram2(*this, "videoram2"), diff --git a/src/mame/drivers/goldngam.cpp b/src/mame/drivers/goldngam.cpp index 37b0c8dea40..18ad31bd62d 100644 --- a/src/mame/drivers/goldngam.cpp +++ b/src/mame/drivers/goldngam.cpp @@ -242,7 +242,7 @@ class goldngam_state : public driver_device { public: - goldngam_state(const machine_config &mconfig, device_type type, std::string tag) + goldngam_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp index f8e973c0b5b..5c691c5922b 100644 --- a/src/mame/drivers/goldnpkr.cpp +++ b/src/mame/drivers/goldnpkr.cpp @@ -1090,7 +1090,7 @@ class goldnpkr_state : public driver_device { public: - goldnpkr_state(const machine_config &mconfig, device_type type, std::string tag) + goldnpkr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/good.cpp b/src/mame/drivers/good.cpp index bc64b5c52cc..17f9c13e191 100644 --- a/src/mame/drivers/good.cpp +++ b/src/mame/drivers/good.cpp @@ -40,7 +40,7 @@ voice.rom - VOICE ROM class good_state : public driver_device { public: - good_state(const machine_config &mconfig, device_type type, std::string tag) + good_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_tilemapram(*this, "fg_tilemapram"), m_bg_tilemapram(*this, "bg_tilemapram"), diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp index 7262009a93c..77a7aff5e94 100644 --- a/src/mame/drivers/goodejan.cpp +++ b/src/mame/drivers/goodejan.cpp @@ -78,7 +78,7 @@ Secret menu hack [totmejan only] (I couldn't find official way to enter, so it's class goodejan_state : public driver_device { public: - goodejan_state(const machine_config &mconfig, device_type type, std::string tag) + goodejan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/gp2x.cpp b/src/mame/drivers/gp2x.cpp index 340aead7a7a..0865638044e 100644 --- a/src/mame/drivers/gp2x.cpp +++ b/src/mame/drivers/gp2x.cpp @@ -26,7 +26,7 @@ class gp2x_state : public driver_device { public: - gp2x_state(const machine_config &mconfig, device_type type, std::string tag) + gp2x_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_maincpu_region(*this, "maincpu"), diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp index f3919fa5421..96d4e94cb78 100644 --- a/src/mame/drivers/gp_1.cpp +++ b/src/mame/drivers/gp_1.cpp @@ -30,7 +30,7 @@ ToDo: class gp_1_state : public genpin_class { public: - gp_1_state(const machine_config &mconfig, device_type type, std::string tag) + gp_1_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_ctc(*this, "ctc") diff --git a/src/mame/drivers/gp_2.cpp b/src/mame/drivers/gp_2.cpp index d9420122252..b829912b939 100644 --- a/src/mame/drivers/gp_2.cpp +++ b/src/mame/drivers/gp_2.cpp @@ -43,7 +43,7 @@ ToDo: class gp_2_state : public genpin_class { public: - gp_2_state(const machine_config &mconfig, device_type type, std::string tag) + gp_2_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_ctc(*this, "ctc") diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp index a2401258d0e..9140db8af75 100644 --- a/src/mame/drivers/gpworld.cpp +++ b/src/mame/drivers/gpworld.cpp @@ -54,7 +54,7 @@ public: TIMER_IRQ_STOP }; - gpworld_state(const machine_config &mconfig, device_type type, std::string tag) + gpworld_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc") , m_sprite_ram(*this, "sprite_ram"), diff --git a/src/mame/drivers/grfd2301.cpp b/src/mame/drivers/grfd2301.cpp index 0d18239188e..cc9c16a74b2 100644 --- a/src/mame/drivers/grfd2301.cpp +++ b/src/mame/drivers/grfd2301.cpp @@ -37,7 +37,7 @@ A sticker on the back panel says: GenRad, Culver City CA, Model 2301-9001 class grfd2301_state : public driver_device { public: - grfd2301_state(const machine_config &mconfig, device_type type, std::string tag) + grfd2301_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_p_videoram(*this, "videoram") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/gstream.cpp b/src/mame/drivers/gstream.cpp index b08e1363cc8..bef7f573d07 100644 --- a/src/mame/drivers/gstream.cpp +++ b/src/mame/drivers/gstream.cpp @@ -140,7 +140,7 @@ RAM4 is HMC HM6264LP-70 class gstream_state : public driver_device { public: - gstream_state(const machine_config &mconfig, device_type type, std::string tag) + gstream_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki_1(*this, "oki1"), diff --git a/src/mame/drivers/gticlub.cpp b/src/mame/drivers/gticlub.cpp index 89bc42be2b8..b751e7fc029 100644 --- a/src/mame/drivers/gticlub.cpp +++ b/src/mame/drivers/gticlub.cpp @@ -242,7 +242,7 @@ Hang Pilot (uses an unknown but similar video board) 12W class gticlub_state : public driver_device { public: - gticlub_state(const machine_config &mconfig, device_type type, std::string tag) + gticlub_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), @@ -908,7 +908,7 @@ UINT32 gticlub_state::screen_update_hangplt(screen_device &screen, bitmap_rgb32 { bitmap.fill(m_palette->pen(0), cliprect); - if (screen.tag()==":lscreen") + if (strcmp(screen.tag(), ":lscreen") == 0) { device_t *voodoo = machine().device("voodoo0"); @@ -918,7 +918,7 @@ UINT32 gticlub_state::screen_update_hangplt(screen_device &screen, bitmap_rgb32 m_k001604_1->draw_front_layer(screen, bitmap, cliprect); } - else if (screen.tag()==":rscreen") + else if (strcmp(screen.tag(), ":rscreen") == 0) { device_t *voodoo = machine().device("voodoo1"); diff --git a/src/mame/drivers/gts1.cpp b/src/mame/drivers/gts1.cpp index 17e5b781012..ffed197ba3c 100644 --- a/src/mame/drivers/gts1.cpp +++ b/src/mame/drivers/gts1.cpp @@ -84,7 +84,7 @@ ToDo: class gts1_state : public genpin_class { public: - gts1_state(const machine_config &mconfig, device_type type, std::string tag) + gts1_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_switches(*this, "X") diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp index ff618eee830..151a286c212 100644 --- a/src/mame/drivers/gts3.cpp +++ b/src/mame/drivers/gts3.cpp @@ -38,7 +38,7 @@ ToDo: class gts3_state : public driver_device { public: - gts3_state(const machine_config &mconfig, device_type type, std::string tag) + gts3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_u4(*this, "u4") diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp index 690ec7577fb..a437c38300e 100644 --- a/src/mame/drivers/gts3a.cpp +++ b/src/mame/drivers/gts3a.cpp @@ -26,7 +26,7 @@ ToDo: class gts3a_state : public driver_device { public: - gts3a_state(const machine_config &mconfig, device_type type, std::string tag) + gts3a_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/gts80.cpp b/src/mame/drivers/gts80.cpp index c9fa11f900b..f6ae1241425 100644 --- a/src/mame/drivers/gts80.cpp +++ b/src/mame/drivers/gts80.cpp @@ -31,7 +31,7 @@ ToDO: class gts80_state : public genpin_class { public: - gts80_state(const machine_config &mconfig, device_type type, std::string tag) + gts80_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_r0_sound(*this, "r0sound") diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp index ff0feee8879..4a399daf3e2 100644 --- a/src/mame/drivers/gts80a.cpp +++ b/src/mame/drivers/gts80a.cpp @@ -20,7 +20,7 @@ class gts80a_state : public genpin_class { public: - gts80a_state(const machine_config &mconfig, device_type type, std::string tag) + gts80a_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_r0_sound(*this, "r0sound") @@ -382,7 +382,7 @@ MACHINE_CONFIG_END class caveman_state : public gts80a_state { public: - caveman_state(const machine_config &mconfig, device_type type, std::string tag) + caveman_state(const machine_config &mconfig, device_type type, const char *tag) : gts80a_state(mconfig, type, tag) , m_videocpu(*this, "video_cpu") , m_vram(*this, "vram") diff --git a/src/mame/drivers/gts80b.cpp b/src/mame/drivers/gts80b.cpp index 422291339a9..28914a300c4 100644 --- a/src/mame/drivers/gts80b.cpp +++ b/src/mame/drivers/gts80b.cpp @@ -21,7 +21,7 @@ class gts80b_state : public genpin_class { public: - gts80b_state(const machine_config &mconfig, device_type type, std::string tag) + gts80b_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_r0_sound(*this, "r0sound") diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp index 0f6e9da82e1..e67cfdd7d02 100644 --- a/src/mame/drivers/guab.cpp +++ b/src/mame/drivers/guab.cpp @@ -64,7 +64,7 @@ struct ef9369 class guab_state : public driver_device { public: - guab_state(const machine_config &mconfig, device_type type, std::string tag) + guab_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tms34061(*this, "tms34061"), diff --git a/src/mame/drivers/gunpey.cpp b/src/mame/drivers/gunpey.cpp index f07b7aed43d..80285fe5c1f 100644 --- a/src/mame/drivers/gunpey.cpp +++ b/src/mame/drivers/gunpey.cpp @@ -197,7 +197,7 @@ Release: November 1999 class gunpey_state : public driver_device { public: - gunpey_state(const machine_config &mconfig, device_type type, std::string tag) + gunpey_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp index 10ee8978983..d9e7e4c3e8b 100644 --- a/src/mame/drivers/h19.cpp +++ b/src/mame/drivers/h19.cpp @@ -55,7 +55,7 @@ public: TIMER_BEEP_OFF }; - h19_state(const machine_config &mconfig, device_type type, std::string tag) + h19_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_crtc(*this, "crtc"), diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp index 5c05a385891..5c4eb0d305b 100644 --- a/src/mame/drivers/h8.cpp +++ b/src/mame/drivers/h8.cpp @@ -59,7 +59,7 @@ TODO: class h8_state : public driver_device { public: - h8_state(const machine_config &mconfig, device_type type, std::string tag) + h8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_uart(*this, "uart"), diff --git a/src/mame/drivers/h89.cpp b/src/mame/drivers/h89.cpp index decfe522856..4e50ebdae18 100644 --- a/src/mame/drivers/h89.cpp +++ b/src/mame/drivers/h89.cpp @@ -28,7 +28,7 @@ class h89_state : public driver_device { public: - h89_state(const machine_config &mconfig, device_type type, std::string tag) + h89_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { diff --git a/src/mame/drivers/halleys.cpp b/src/mame/drivers/halleys.cpp index a92d0bb569c..8a8737dc516 100644 --- a/src/mame/drivers/halleys.cpp +++ b/src/mame/drivers/halleys.cpp @@ -211,7 +211,7 @@ Video sync 6 F Video sync Post 6 F Post class halleys_state : public driver_device { public: - halleys_state(const machine_config &mconfig, device_type type, std::string tag) + halleys_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_blitter_ram(*this, "blitter_ram"), m_io_ram(*this, "io_ram"), diff --git a/src/mame/drivers/hankin.cpp b/src/mame/drivers/hankin.cpp index b2d4c82685d..10cd8f17c14 100644 --- a/src/mame/drivers/hankin.cpp +++ b/src/mame/drivers/hankin.cpp @@ -24,7 +24,7 @@ ToDo: class hankin_state : public genpin_class { public: - hankin_state(const machine_config &mconfig, device_type type, std::string tag) + hankin_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp index 3b5439639d1..5f9dd079869 100644 --- a/src/mame/drivers/harddriv.cpp +++ b/src/mame/drivers/harddriv.cpp @@ -340,7 +340,7 @@ Notes: const device_type HARDDRIV_DEVICE = &device_creator; -harddriv_state::harddriv_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +harddriv_state::harddriv_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, HARDDRIV_DEVICE, "Hard Drivin' PCB Family", tag, owner, clock, "harddriv_pcb", __FILE__), /* device_video_interface(mconfig, *this, false), */ m_maincpu(*this, "maincpu"), @@ -504,7 +504,7 @@ harddriv_state::harddriv_state(const machine_config &mconfig, std::string tag, d class harddriv_new_state : public driver_device { public: - harddriv_new_state(const machine_config &mconfig, device_type type, std::string tag) + harddriv_new_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_mainpcb(*this, "mainpcb") , m_leftpcb(*this, "leftpcb") @@ -1740,7 +1740,7 @@ MACHINE_CONFIG_END const device_type HARDDRIV_BOARD_DEVICE = &device_creator; -harddriv_board_device_state::harddriv_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +harddriv_board_device_state::harddriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : harddriv_state(mconfig, tag, owner, clock) { } @@ -1766,7 +1766,7 @@ void harddrivc_board_device_state::device_start() const device_type HARDDRIVC_BOARD_DEVICE = &device_creator; -harddrivc_board_device_state::harddrivc_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +harddrivc_board_device_state::harddrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : harddriv_state(mconfig, tag, owner, clock) { } @@ -1794,7 +1794,7 @@ void racedrivb1_board_device_state::device_start() const device_type RACEDRIV_BOARD_DEVICE = &device_creator; const device_type RACEDRIVB1_BOARD_DEVICE = &device_creator; -racedriv_board_device_state::racedriv_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +racedriv_board_device_state::racedriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : harddriv_state(mconfig, tag, owner, clock) { } @@ -1831,7 +1831,7 @@ const device_type RACEDRIVC_BOARD_DEVICE = &device_creator; const device_type RACEDRIVC_PANORAMA_SIDE_BOARD_DEVICE = &device_creator; -racedrivc_board_device_state::racedrivc_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +racedrivc_board_device_state::racedrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : harddriv_state(mconfig, tag, owner, clock) { } @@ -1857,7 +1857,7 @@ void stunrun_board_device_state::device_start() const device_type STUNRUN_BOARD_DEVICE = &device_creator; -stunrun_board_device_state::stunrun_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +stunrun_board_device_state::stunrun_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : harddriv_state(mconfig, tag, owner, clock) { } @@ -1891,7 +1891,7 @@ const device_type STEELTAL_BOARD_DEVICE = &device_creator; const device_type STEELTALP_BOARD_DEVICE = &device_creator; -steeltal_board_device_state::steeltal_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +steeltal_board_device_state::steeltal_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : harddriv_state(mconfig, tag, owner, clock) { } @@ -1911,7 +1911,7 @@ void strtdriv_board_device_state::device_start() const device_type STRTDRIV_BOARD_DEVICE = &device_creator; -strtdriv_board_device_state::strtdriv_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +strtdriv_board_device_state::strtdriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : harddriv_state(mconfig, tag, owner, clock) { } @@ -1938,7 +1938,7 @@ void hdrivairp_board_device_state::device_start() const device_type HDRIVAIR_BOARD_DEVICE = &device_creator; const device_type HDRIVAIRP_BOARD_DEVICE = &device_creator; -hdrivair_board_device_state::hdrivair_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +hdrivair_board_device_state::hdrivair_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : harddriv_state(mconfig, tag, owner, clock) { } diff --git a/src/mame/drivers/harriet.cpp b/src/mame/drivers/harriet.cpp index 9f36a4abf31..a589f2d51af 100644 --- a/src/mame/drivers/harriet.cpp +++ b/src/mame/drivers/harriet.cpp @@ -21,7 +21,7 @@ class harriet_state : public driver_device { public: - harriet_state(const machine_config &mconfig, device_type type, std::string tag) + harriet_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/hazelgr.cpp b/src/mame/drivers/hazelgr.cpp index 8cc64d0df47..b22c62381f9 100644 --- a/src/mame/drivers/hazelgr.cpp +++ b/src/mame/drivers/hazelgr.cpp @@ -12,7 +12,7 @@ class haze_state : public driver_device { public: - haze_state(const machine_config &mconfig, device_type type, std::string tag) + haze_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp index 529f1470339..5eddfa20c66 100644 --- a/src/mame/drivers/headonb.cpp +++ b/src/mame/drivers/headonb.cpp @@ -35,7 +35,7 @@ Other outs: class headonb_state : public driver_device { public: - headonb_state(const machine_config &mconfig, device_type type, std::string tag) + headonb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp index 9fa045f51c5..486f6882b28 100644 --- a/src/mame/drivers/hh_cop400.cpp +++ b/src/mame/drivers/hh_cop400.cpp @@ -28,7 +28,7 @@ class hh_cop400_state : public driver_device { public: - hh_cop400_state(const machine_config &mconfig, device_type type, std::string tag) + hh_cop400_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_inp_matrix(*this, "IN"), @@ -239,7 +239,7 @@ UINT8 hh_cop400_state::read_inputs(int columns) class ctstein_state : public hh_cop400_state { public: - ctstein_state(const machine_config &mconfig, device_type type, std::string tag) + ctstein_state(const machine_config &mconfig, device_type type, const char *tag) : hh_cop400_state(mconfig, type, tag) { } }; @@ -289,7 +289,7 @@ MACHINE_CONFIG_END class einvaderc_state : public hh_cop400_state { public: - einvaderc_state(const machine_config &mconfig, device_type type, std::string tag) + einvaderc_state(const machine_config &mconfig, device_type type, const char *tag) : hh_cop400_state(mconfig, type, tag) { } @@ -400,7 +400,7 @@ MACHINE_CONFIG_END class funjacks_state : public hh_cop400_state { public: - funjacks_state(const machine_config &mconfig, device_type type, std::string tag) + funjacks_state(const machine_config &mconfig, device_type type, const char *tag) : hh_cop400_state(mconfig, type, tag) { } @@ -511,7 +511,7 @@ MACHINE_CONFIG_END class funrlgl_state : public hh_cop400_state { public: - funrlgl_state(const machine_config &mconfig, device_type type, std::string tag) + funrlgl_state(const machine_config &mconfig, device_type type, const char *tag) : hh_cop400_state(mconfig, type, tag) { } @@ -602,7 +602,7 @@ MACHINE_CONFIG_END class plus1_state : public hh_cop400_state { public: - plus1_state(const machine_config &mconfig, device_type type, std::string tag) + plus1_state(const machine_config &mconfig, device_type type, const char *tag) : hh_cop400_state(mconfig, type, tag) { } }; @@ -658,7 +658,7 @@ MACHINE_CONFIG_END class lightfgt_state : public hh_cop400_state { public: - lightfgt_state(const machine_config &mconfig, device_type type, std::string tag) + lightfgt_state(const machine_config &mconfig, device_type type, const char *tag) : hh_cop400_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp index 28708d86516..8ded810c534 100644 --- a/src/mame/drivers/hh_hmcs40.cpp +++ b/src/mame/drivers/hh_hmcs40.cpp @@ -94,7 +94,7 @@ class hh_hmcs40_state : public driver_device { public: - hh_hmcs40_state(const machine_config &mconfig, device_type type, std::string tag) + hh_hmcs40_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), @@ -341,7 +341,7 @@ INPUT_CHANGED_MEMBER(hh_hmcs40_state::single_interrupt_line) class bambball_state : public hh_hmcs40_state { public: - bambball_state(const machine_config &mconfig, device_type type, std::string tag) + bambball_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -451,7 +451,7 @@ MACHINE_CONFIG_END class bmboxing_state : public hh_hmcs40_state { public: - bmboxing_state(const machine_config &mconfig, device_type type, std::string tag) + bmboxing_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -585,7 +585,7 @@ MACHINE_CONFIG_END class bfriskyt_state : public hh_hmcs40_state { public: - bfriskyt_state(const machine_config &mconfig, device_type type, std::string tag) + bfriskyt_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -713,7 +713,7 @@ MACHINE_CONFIG_END class packmon_state : public hh_hmcs40_state { public: - packmon_state(const machine_config &mconfig, device_type type, std::string tag) + packmon_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -822,7 +822,7 @@ MACHINE_CONFIG_END class msthawk_state : public hh_hmcs40_state { public: - msthawk_state(const machine_config &mconfig, device_type type, std::string tag) + msthawk_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -948,7 +948,7 @@ MACHINE_CONFIG_END class bzaxxon_state : public hh_hmcs40_state { public: - bzaxxon_state(const machine_config &mconfig, device_type type, std::string tag) + bzaxxon_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -1066,7 +1066,7 @@ MACHINE_CONFIG_END class zackman_state : public hh_hmcs40_state { public: - zackman_state(const machine_config &mconfig, device_type type, std::string tag) + zackman_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -1183,7 +1183,7 @@ MACHINE_CONFIG_END class bpengo_state : public hh_hmcs40_state { public: - bpengo_state(const machine_config &mconfig, device_type type, std::string tag) + bpengo_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -1309,7 +1309,7 @@ MACHINE_CONFIG_END class bbtime_state : public hh_hmcs40_state { public: - bbtime_state(const machine_config &mconfig, device_type type, std::string tag) + bbtime_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -1431,7 +1431,7 @@ MACHINE_CONFIG_END class bdoramon_state : public hh_hmcs40_state { public: - bdoramon_state(const machine_config &mconfig, device_type type, std::string tag) + bdoramon_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -1527,7 +1527,7 @@ MACHINE_CONFIG_END class bultrman_state : public hh_hmcs40_state { public: - bultrman_state(const machine_config &mconfig, device_type type, std::string tag) + bultrman_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -1615,7 +1615,7 @@ MACHINE_CONFIG_END class machiman_state : public hh_hmcs40_state { public: - machiman_state(const machine_config &mconfig, device_type type, std::string tag) + machiman_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -1707,7 +1707,7 @@ MACHINE_CONFIG_END class pairmtch_state : public hh_hmcs40_state { public: - pairmtch_state(const machine_config &mconfig, device_type type, std::string tag) + pairmtch_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -1857,7 +1857,7 @@ MACHINE_CONFIG_END class alnattck_state : public hh_hmcs40_state { public: - alnattck_state(const machine_config &mconfig, device_type type, std::string tag) + alnattck_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -1966,7 +1966,7 @@ MACHINE_CONFIG_END class cdkong_state : public hh_hmcs40_state { public: - cdkong_state(const machine_config &mconfig, device_type type, std::string tag) + cdkong_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -2098,7 +2098,7 @@ MACHINE_CONFIG_END class cgalaxn_state : public hh_hmcs40_state { public: - cgalaxn_state(const machine_config &mconfig, device_type type, std::string tag) + cgalaxn_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -2229,7 +2229,7 @@ MACHINE_CONFIG_END class cpacman_state : public hh_hmcs40_state { public: - cpacman_state(const machine_config &mconfig, device_type type, std::string tag) + cpacman_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -2343,7 +2343,7 @@ MACHINE_CONFIG_END class cmspacmn_state : public hh_hmcs40_state { public: - cmspacmn_state(const machine_config &mconfig, device_type type, std::string tag) + cmspacmn_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -2450,7 +2450,7 @@ MACHINE_CONFIG_END class egalaxn2_state : public hh_hmcs40_state { public: - egalaxn2_state(const machine_config &mconfig, device_type type, std::string tag) + egalaxn2_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -2572,7 +2572,7 @@ MACHINE_CONFIG_END class epacman2_state : public egalaxn2_state { public: - epacman2_state(const machine_config &mconfig, device_type type, std::string tag) + epacman2_state(const machine_config &mconfig, device_type type, const char *tag) : egalaxn2_state(mconfig, type, tag) { } }; @@ -2630,7 +2630,7 @@ INPUT_PORTS_END class eturtles_state : public hh_hmcs40_state { public: - eturtles_state(const machine_config &mconfig, device_type type, std::string tag) + eturtles_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag), m_cop_irq(0) { } @@ -2821,7 +2821,7 @@ MACHINE_CONFIG_END class estargte_state : public eturtles_state { public: - estargte_state(const machine_config &mconfig, device_type type, std::string tag) + estargte_state(const machine_config &mconfig, device_type type, const char *tag) : eturtles_state(mconfig, type, tag) { } @@ -2929,7 +2929,7 @@ MACHINE_CONFIG_END class ghalien_state : public hh_hmcs40_state { public: - ghalien_state(const machine_config &mconfig, device_type type, std::string tag) + ghalien_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -3043,7 +3043,7 @@ MACHINE_CONFIG_END class gckong_state : public hh_hmcs40_state { public: - gckong_state(const machine_config &mconfig, device_type type, std::string tag) + gckong_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -3164,7 +3164,7 @@ MACHINE_CONFIG_END class gdigdug_state : public hh_hmcs40_state { public: - gdigdug_state(const machine_config &mconfig, device_type type, std::string tag) + gdigdug_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -3287,7 +3287,7 @@ MACHINE_CONFIG_END class mwcbaseb_state : public hh_hmcs40_state { public: - mwcbaseb_state(const machine_config &mconfig, device_type type, std::string tag) + mwcbaseb_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -3443,7 +3443,7 @@ MACHINE_CONFIG_END class pbqbert_state : public hh_hmcs40_state { public: - pbqbert_state(const machine_config &mconfig, device_type type, std::string tag) + pbqbert_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -3529,7 +3529,7 @@ MACHINE_CONFIG_END class kingman_state : public hh_hmcs40_state { public: - kingman_state(const machine_config &mconfig, device_type type, std::string tag) + kingman_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -3648,7 +3648,7 @@ MACHINE_CONFIG_END class tmtron_state : public hh_hmcs40_state { public: - tmtron_state(const machine_config &mconfig, device_type type, std::string tag) + tmtron_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } @@ -3771,7 +3771,7 @@ MACHINE_CONFIG_END class vinvader_state : public hh_hmcs40_state { public: - vinvader_state(const machine_config &mconfig, device_type type, std::string tag) + vinvader_state(const machine_config &mconfig, device_type type, const char *tag) : hh_hmcs40_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp index ddc2e50d70a..541352078d7 100644 --- a/src/mame/drivers/hh_melps4.cpp +++ b/src/mame/drivers/hh_melps4.cpp @@ -17,7 +17,7 @@ class hh_melps4_state : public driver_device { public: - hh_melps4_state(const machine_config &mconfig, device_type type, std::string tag) + hh_melps4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_inp_matrix(*this, "IN"), @@ -231,7 +231,7 @@ INPUT_CHANGED_MEMBER(hh_melps4_state::reset_button) class cfrogger_state : public hh_melps4_state { public: - cfrogger_state(const machine_config &mconfig, device_type type, std::string tag) + cfrogger_state(const machine_config &mconfig, device_type type, const char *tag) : hh_melps4_state(mconfig, type, tag) { } @@ -344,7 +344,7 @@ MACHINE_CONFIG_END class gjungler_state : public hh_melps4_state { public: - gjungler_state(const machine_config &mconfig, device_type type, std::string tag) + gjungler_state(const machine_config &mconfig, device_type type, const char *tag) : hh_melps4_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp index 7c4855944fd..bb65a69265e 100644 --- a/src/mame/drivers/hh_pic16.cpp +++ b/src/mame/drivers/hh_pic16.cpp @@ -34,7 +34,7 @@ class hh_pic16_state : public driver_device { public: - hh_pic16_state(const machine_config &mconfig, device_type type, std::string tag) + hh_pic16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_inp_matrix(*this, "IN"), @@ -217,7 +217,7 @@ void hh_pic16_state::display_matrix(int maxx, int maxy, UINT32 setx, UINT32 sety class maniac_state : public hh_pic16_state { public: - maniac_state(const machine_config &mconfig, device_type type, std::string tag) + maniac_state(const machine_config &mconfig, device_type type, const char *tag) : hh_pic16_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp index 814fddb4e2e..13c8b835fc4 100644 --- a/src/mame/drivers/hh_sm510.cpp +++ b/src/mame/drivers/hh_sm510.cpp @@ -19,7 +19,7 @@ class hh_sm510_state : public driver_device { public: - hh_sm510_state(const machine_config &mconfig, device_type type, std::string tag) + hh_sm510_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_inp_matrix(*this, "IN"), @@ -159,7 +159,7 @@ READ8_MEMBER(hh_sm510_state::input_r) class ktopgun_state : public hh_sm510_state { public: - ktopgun_state(const machine_config &mconfig, device_type type, std::string tag) + ktopgun_state(const machine_config &mconfig, device_type type, const char *tag) : hh_sm510_state(mconfig, type, tag) { m_inp_lines = 3; @@ -232,7 +232,7 @@ MACHINE_CONFIG_END class ktmnt_state : public hh_sm510_state { public: - ktmnt_state(const machine_config &mconfig, device_type type, std::string tag) + ktmnt_state(const machine_config &mconfig, device_type type, const char *tag) : hh_sm510_state(mconfig, type, tag) { m_inp_lines = 3; @@ -305,7 +305,7 @@ MACHINE_CONFIG_END class gnwmndon_state : public hh_sm510_state { public: - gnwmndon_state(const machine_config &mconfig, device_type type, std::string tag) + gnwmndon_state(const machine_config &mconfig, device_type type, const char *tag) : hh_sm510_state(mconfig, type, tag) { m_inp_lines = 2; diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index 21158dd907a..9702aded253 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -351,7 +351,7 @@ INPUT_CHANGED_MEMBER(hh_tms1k_state::power_button) class mathmagi_state : public hh_tms1k_state { public: - mathmagi_state(const machine_config &mconfig, device_type type, std::string tag) + mathmagi_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -529,7 +529,7 @@ MACHINE_CONFIG_END class amaztron_state : public hh_tms1k_state { public: - amaztron_state(const machine_config &mconfig, device_type type, std::string tag) + amaztron_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -670,7 +670,7 @@ MACHINE_CONFIG_END class h2hbaseb_state : public hh_tms1k_state { public: - h2hbaseb_state(const machine_config &mconfig, device_type type, std::string tag) + h2hbaseb_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -808,7 +808,7 @@ MACHINE_CONFIG_END class h2hfootb_state : public hh_tms1k_state { public: - h2hfootb_state(const machine_config &mconfig, device_type type, std::string tag) + h2hfootb_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -946,7 +946,7 @@ MACHINE_CONFIG_END class tc4_state : public hh_tms1k_state { public: - tc4_state(const machine_config &mconfig, device_type type, std::string tag) + tc4_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -1101,7 +1101,7 @@ MACHINE_CONFIG_END class ebball_state : public hh_tms1k_state { public: - ebball_state(const machine_config &mconfig, device_type type, std::string tag) + ebball_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -1232,7 +1232,7 @@ MACHINE_CONFIG_END class ebball2_state : public hh_tms1k_state { public: - ebball2_state(const machine_config &mconfig, device_type type, std::string tag) + ebball2_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -1362,7 +1362,7 @@ MACHINE_CONFIG_END class ebball3_state : public hh_tms1k_state { public: - ebball3_state(const machine_config &mconfig, device_type type, std::string tag) + ebball3_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -1525,7 +1525,7 @@ MACHINE_CONFIG_END class einvader_state : public hh_tms1k_state { public: - einvader_state(const machine_config &mconfig, device_type type, std::string tag) + einvader_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -1633,7 +1633,7 @@ MACHINE_CONFIG_END class efootb4_state : public hh_tms1k_state { public: - efootb4_state(const machine_config &mconfig, device_type type, std::string tag) + efootb4_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -1762,7 +1762,7 @@ MACHINE_CONFIG_END class ebaskb2_state : public hh_tms1k_state { public: - ebaskb2_state(const machine_config &mconfig, device_type type, std::string tag) + ebaskb2_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -1888,7 +1888,7 @@ MACHINE_CONFIG_END class raisedvl_state : public hh_tms1k_state { public: - raisedvl_state(const machine_config &mconfig, device_type type, std::string tag) + raisedvl_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -2020,7 +2020,7 @@ MACHINE_CONFIG_END class gpoker_state : public hh_tms1k_state { public: - gpoker_state(const machine_config &mconfig, device_type type, std::string tag) + gpoker_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag), m_beeper(*this, "beeper") { } @@ -2165,7 +2165,7 @@ MACHINE_CONFIG_END class gjackpot_state : public gpoker_state { public: - gjackpot_state(const machine_config &mconfig, device_type type, std::string tag) + gjackpot_state(const machine_config &mconfig, device_type type, const char *tag) : gpoker_state(mconfig, type, tag) { } @@ -2280,7 +2280,7 @@ MACHINE_CONFIG_END class elecdet_state : public hh_tms1k_state { public: - elecdet_state(const machine_config &mconfig, device_type type, std::string tag) + elecdet_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -2404,7 +2404,7 @@ MACHINE_CONFIG_END class starwbc_state : public hh_tms1k_state { public: - starwbc_state(const machine_config &mconfig, device_type type, std::string tag) + starwbc_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -2529,7 +2529,7 @@ MACHINE_CONFIG_END class astro_state : public hh_tms1k_state { public: - astro_state(const machine_config &mconfig, device_type type, std::string tag) + astro_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -2653,7 +2653,7 @@ MACHINE_CONFIG_END class mdndclab_state : public hh_tms1k_state { public: - mdndclab_state(const machine_config &mconfig, device_type type, std::string tag) + mdndclab_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -2850,7 +2850,7 @@ MACHINE_CONFIG_END class comp4_state : public hh_tms1k_state { public: - comp4_state(const machine_config &mconfig, device_type type, std::string tag) + comp4_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -2949,7 +2949,7 @@ MACHINE_CONFIG_END class simon_state : public hh_tms1k_state { public: - simon_state(const machine_config &mconfig, device_type type, std::string tag) + simon_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -3048,7 +3048,7 @@ MACHINE_CONFIG_END class ssimon_state : public hh_tms1k_state { public: - ssimon_state(const machine_config &mconfig, device_type type, std::string tag) + ssimon_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -3196,7 +3196,7 @@ MACHINE_CONFIG_END class bigtrak_state : public hh_tms1k_state { public: - bigtrak_state(const machine_config &mconfig, device_type type, std::string tag) + bigtrak_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -3375,7 +3375,7 @@ MACHINE_CONFIG_END class cnsector_state : public hh_tms1k_state { public: - cnsector_state(const machine_config &mconfig, device_type type, std::string tag) + cnsector_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -3508,7 +3508,7 @@ MACHINE_CONFIG_END class merlin_state : public hh_tms1k_state { public: - merlin_state(const machine_config &mconfig, device_type type, std::string tag) + merlin_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -3627,7 +3627,7 @@ MACHINE_CONFIG_END class mmerlin_state : public merlin_state { public: - mmerlin_state(const machine_config &mconfig, device_type type, std::string tag) + mmerlin_state(const machine_config &mconfig, device_type type, const char *tag) : merlin_state(mconfig, type, tag) { } }; @@ -3681,7 +3681,7 @@ MACHINE_CONFIG_END class stopthief_state : public hh_tms1k_state { public: - stopthief_state(const machine_config &mconfig, device_type type, std::string tag) + stopthief_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -3802,7 +3802,7 @@ MACHINE_CONFIG_END class bankshot_state : public hh_tms1k_state { public: - bankshot_state(const machine_config &mconfig, device_type type, std::string tag) + bankshot_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -3925,7 +3925,7 @@ MACHINE_CONFIG_END class splitsec_state : public hh_tms1k_state { public: - splitsec_state(const machine_config &mconfig, device_type type, std::string tag) + splitsec_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -4026,7 +4026,7 @@ MACHINE_CONFIG_END class tandy12_state : public hh_tms1k_state { public: - tandy12_state(const machine_config &mconfig, device_type type, std::string tag) + tandy12_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -4198,7 +4198,7 @@ MACHINE_CONFIG_END class tbreakup_state : public hh_tms1k_state { public: - tbreakup_state(const machine_config &mconfig, device_type type, std::string tag) + tbreakup_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag), m_expander(*this, "expander") { } @@ -4394,7 +4394,7 @@ MACHINE_CONFIG_END class phpball_state : public hh_tms1k_state { public: - phpball_state(const machine_config &mconfig, device_type type, std::string tag) + phpball_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp index f4132559f01..1b7c020bba3 100644 --- a/src/mame/drivers/hh_ucom4.cpp +++ b/src/mame/drivers/hh_ucom4.cpp @@ -244,7 +244,7 @@ UINT8 hh_ucom4_state::read_inputs(int columns) class ufombs_state : public hh_ucom4_state { public: - ufombs_state(const machine_config &mconfig, device_type type, std::string tag) + ufombs_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -354,7 +354,7 @@ MACHINE_CONFIG_END class ssfball_state : public hh_ucom4_state { public: - ssfball_state(const machine_config &mconfig, device_type type, std::string tag) + ssfball_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -492,7 +492,7 @@ MACHINE_CONFIG_END class bmsoccer_state : public hh_ucom4_state { public: - bmsoccer_state(const machine_config &mconfig, device_type type, std::string tag) + bmsoccer_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -612,7 +612,7 @@ MACHINE_CONFIG_END class bmsafari_state : public hh_ucom4_state { public: - bmsafari_state(const machine_config &mconfig, device_type type, std::string tag) + bmsafari_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -719,7 +719,7 @@ MACHINE_CONFIG_END class splasfgt_state : public hh_ucom4_state { public: - splasfgt_state(const machine_config &mconfig, device_type type, std::string tag) + splasfgt_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -870,7 +870,7 @@ MACHINE_CONFIG_END class bcclimbr_state : public hh_ucom4_state { public: - bcclimbr_state(const machine_config &mconfig, device_type type, std::string tag) + bcclimbr_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -972,7 +972,7 @@ MACHINE_CONFIG_END class tactix_state : public hh_ucom4_state { public: - tactix_state(const machine_config &mconfig, device_type type, std::string tag) + tactix_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -1087,7 +1087,7 @@ MACHINE_CONFIG_END class invspace_state : public hh_ucom4_state { public: - invspace_state(const machine_config &mconfig, device_type type, std::string tag) + invspace_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -1186,7 +1186,7 @@ MACHINE_CONFIG_END class efball_state : public hh_ucom4_state { public: - efball_state(const machine_config &mconfig, device_type type, std::string tag) + efball_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -1297,7 +1297,7 @@ MACHINE_CONFIG_END class galaxy2_state : public hh_ucom4_state { public: - galaxy2_state(const machine_config &mconfig, device_type type, std::string tag) + galaxy2_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -1397,7 +1397,7 @@ MACHINE_CONFIG_END class astrocmd_state : public hh_ucom4_state { public: - astrocmd_state(const machine_config &mconfig, device_type type, std::string tag) + astrocmd_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -1504,7 +1504,7 @@ MACHINE_CONFIG_END class edracula_state : public hh_ucom4_state { public: - edracula_state(const machine_config &mconfig, device_type type, std::string tag) + edracula_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -1592,7 +1592,7 @@ MACHINE_CONFIG_END class mvbfree_state : public hh_ucom4_state { public: - mvbfree_state(const machine_config &mconfig, device_type type, std::string tag) + mvbfree_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -1701,7 +1701,7 @@ MACHINE_CONFIG_END class tccombat_state : public hh_ucom4_state { public: - tccombat_state(const machine_config &mconfig, device_type type, std::string tag) + tccombat_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -1798,7 +1798,7 @@ MACHINE_CONFIG_END class tmtennis_state : public hh_ucom4_state { public: - tmtennis_state(const machine_config &mconfig, device_type type, std::string tag) + tmtennis_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -1958,7 +1958,7 @@ MACHINE_CONFIG_END class tmpacman_state : public hh_ucom4_state { public: - tmpacman_state(const machine_config &mconfig, device_type type, std::string tag) + tmpacman_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -2060,7 +2060,7 @@ MACHINE_CONFIG_END class tmscramb_state : public hh_ucom4_state { public: - tmscramb_state(const machine_config &mconfig, device_type type, std::string tag) + tmscramb_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -2159,7 +2159,7 @@ MACHINE_CONFIG_END class tcaveman_state : public hh_ucom4_state { public: - tcaveman_state(const machine_config &mconfig, device_type type, std::string tag) + tcaveman_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } @@ -2256,7 +2256,7 @@ MACHINE_CONFIG_END class alnchase_state : public hh_ucom4_state { public: - alnchase_state(const machine_config &mconfig, device_type type, std::string tag) + alnchase_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/hideseek.cpp b/src/mame/drivers/hideseek.cpp index 1f9021ec75e..59ae4bd5d51 100644 --- a/src/mame/drivers/hideseek.cpp +++ b/src/mame/drivers/hideseek.cpp @@ -33,7 +33,7 @@ Other stuff: NEC D4992 (RTC?) and xtal possibly 32.768kHz, 3V coin battery, 93L4 class hideseek_state : public driver_device { public: - hideseek_state(const machine_config &mconfig, device_type type, std::string tag) + hideseek_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp index 85c0bac9d42..72be90d47f7 100644 --- a/src/mame/drivers/highvdeo.cpp +++ b/src/mame/drivers/highvdeo.cpp @@ -108,7 +108,7 @@ Game is V30 based, with rom banking (2Mb) class highvdeo_state : public driver_device { public: - highvdeo_state(const machine_config &mconfig, device_type type, std::string tag) + highvdeo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_blit_ram(*this, "blit_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/hikaru.cpp b/src/mame/drivers/hikaru.cpp index 0755e84d04f..b5939d4e09e 100644 --- a/src/mame/drivers/hikaru.cpp +++ b/src/mame/drivers/hikaru.cpp @@ -391,7 +391,7 @@ Notes: class hikaru_state : public driver_device { public: - hikaru_state(const machine_config &mconfig, device_type type, std::string tag) + hikaru_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } virtual void video_start() override; diff --git a/src/mame/drivers/hitpoker.cpp b/src/mame/drivers/hitpoker.cpp index 4679e485f23..5991792fb5a 100644 --- a/src/mame/drivers/hitpoker.cpp +++ b/src/mame/drivers/hitpoker.cpp @@ -54,7 +54,7 @@ Some debug tricks (let's test this CPU as more as possible): class hitpoker_state : public driver_device { public: - hitpoker_state(const machine_config &mconfig, device_type type, std::string tag) + hitpoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sys_regs(*this, "sys_regs"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/hk68v10.cpp b/src/mame/drivers/hk68v10.cpp index 2b869cd7797..a6b5a357595 100644 --- a/src/mame/drivers/hk68v10.cpp +++ b/src/mame/drivers/hk68v10.cpp @@ -191,7 +191,7 @@ class hk68v10_state : public driver_device { public: -hk68v10_state(const machine_config &mconfig, device_type type, std::string tag) : +hk68v10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device (mconfig, type, tag), m_maincpu (*this, "maincpu") ,m_sccterm(*this, "scc") diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp index 6f3a5bd4a7d..0d6fc6735f1 100644 --- a/src/mame/drivers/homelab.cpp +++ b/src/mame/drivers/homelab.cpp @@ -46,7 +46,7 @@ MB7051 - fuse programmed prom. class homelab_state : public driver_device { public: - homelab_state(const machine_config &mconfig, device_type type, std::string tag) + homelab_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp index 0f4976cae76..ccddfcddccd 100644 --- a/src/mame/drivers/homez80.cpp +++ b/src/mame/drivers/homez80.cpp @@ -27,7 +27,7 @@ class homez80_state : public driver_device { public: - homez80_state(const machine_config &mconfig, device_type type, std::string tag) + homez80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") , diff --git a/src/mame/drivers/horizon.cpp b/src/mame/drivers/horizon.cpp index 05c9c89a7dd..11076e517f2 100644 --- a/src/mame/drivers/horizon.cpp +++ b/src/mame/drivers/horizon.cpp @@ -47,7 +47,7 @@ class horizon_state : public driver_device { public: - horizon_state(const machine_config &mconfig, device_type type, std::string tag) + horizon_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_usart_l(*this, I8251_L_TAG), diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp index 28d358bb450..71f94ad4929 100644 --- a/src/mame/drivers/hornet.cpp +++ b/src/mame/drivers/hornet.cpp @@ -329,7 +329,7 @@ class hornet_state : public driver_device { public: - hornet_state(const machine_config &mconfig, device_type type, std::string tag) + hornet_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_workram(*this, "workram"), m_sharc_dataram0(*this, "sharc_dataram0"), @@ -487,7 +487,7 @@ UINT32 hornet_state::screen_update_hornet(screen_device &screen, bitmap_rgb32 &b UINT32 hornet_state::screen_update_hornet_2board(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - if (screen.tag()==":lscreen") + if (strcmp(screen.tag(), ":lscreen") == 0) { device_t *voodoo = machine().device("voodoo0"); voodoo_update(voodoo, bitmap, cliprect); @@ -495,7 +495,7 @@ UINT32 hornet_state::screen_update_hornet_2board(screen_device &screen, bitmap_r /* TODO: tilemaps per screen */ m_k037122_1->tile_draw(screen, bitmap, cliprect); } - else if (screen.tag()==":rscreen") + else if (strcmp(screen.tag(), ":rscreen") == 0) { device_t *voodoo = machine().device("voodoo1"); voodoo_update(voodoo, bitmap, cliprect); diff --git a/src/mame/drivers/hotblock.cpp b/src/mame/drivers/hotblock.cpp index 3da421f75c0..e6fd43c2d78 100644 --- a/src/mame/drivers/hotblock.cpp +++ b/src/mame/drivers/hotblock.cpp @@ -45,7 +45,7 @@ so it could be by them instead class hotblock_state : public driver_device { public: - hotblock_state(const machine_config &mconfig, device_type type, std::string tag) + hotblock_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette"), diff --git a/src/mame/drivers/hotstuff.cpp b/src/mame/drivers/hotstuff.cpp index b891eadf90a..ac5d14e0366 100644 --- a/src/mame/drivers/hotstuff.cpp +++ b/src/mame/drivers/hotstuff.cpp @@ -9,7 +9,7 @@ class hotstuff_state : public driver_device { public: - hotstuff_state(const machine_config &mconfig, device_type type, std::string tag) + hotstuff_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bitmapram(*this, "bitmapram"), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/hp16500.cpp b/src/mame/drivers/hp16500.cpp index 10ec05cc9d8..d1783557ad7 100644 --- a/src/mame/drivers/hp16500.cpp +++ b/src/mame/drivers/hp16500.cpp @@ -60,7 +60,7 @@ class hp16500_state : public driver_device { public: - hp16500_state(const machine_config &mconfig, device_type type, std::string tag) + hp16500_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, MAINCPU_TAG) { } diff --git a/src/mame/drivers/hp49gp.cpp b/src/mame/drivers/hp49gp.cpp index f79c01ec9d4..4dbfe0bdb56 100644 --- a/src/mame/drivers/hp49gp.cpp +++ b/src/mame/drivers/hp49gp.cpp @@ -24,7 +24,7 @@ struct lcd_spi_t class hp49gp_state : public driver_device { public: - hp49gp_state(const machine_config &mconfig, device_type type, std::string tag) + hp49gp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_s3c2410(*this, "s3c2410"), m_steppingstone(*this, "steppingstone"), diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp index 9bd8440b9de..02f6fd696a1 100644 --- a/src/mame/drivers/hp64k.cpp +++ b/src/mame/drivers/hp64k.cpp @@ -169,7 +169,7 @@ class hp64k_state : public driver_device { public: - hp64k_state(const machine_config &mconfig, device_type type, std::string tag); + hp64k_state(const machine_config &mconfig, device_type type, const char *tag); virtual void driver_start() override; //virtual void machine_start(); @@ -347,7 +347,7 @@ static ADDRESS_MAP_START(cpu_io_map , AS_IO , 16 , hp64k_state) AM_RANGE(HP_MAKE_IOADDR(12 , 0) , HP_MAKE_IOADDR(12 , 3)) AM_WRITE(hp64k_irl_mask_w) ADDRESS_MAP_END -hp64k_state::hp64k_state(const machine_config &mconfig, device_type type, std::string tag) +hp64k_state::hp64k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig , type , tag), m_cpu(*this , "cpu"), m_crtc(*this , "crtc"), diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index c308e890cbb..c303d1066d3 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -56,7 +56,7 @@ class hp9845_state : public driver_device { public: - hp9845_state(const machine_config &mconfig, device_type type, std::string tag) : + hp9845_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } @@ -69,7 +69,7 @@ INPUT_PORTS_END class hp9845b_state : public driver_device { public: - hp9845b_state(const machine_config &mconfig, device_type type, std::string tag) : + hp9845b_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_lpu(*this , "lpu"), m_ppu(*this , "ppu"), diff --git a/src/mame/drivers/hp9k.cpp b/src/mame/drivers/hp9k.cpp index 1d9b947926a..9fa6ae09513 100644 --- a/src/mame/drivers/hp9k.cpp +++ b/src/mame/drivers/hp9k.cpp @@ -120,7 +120,7 @@ private: void putChar(UINT8 thec,int x,int y,bitmap_ind16 &bitmap); public: - hp9k_state(const machine_config &mconfig, device_type type, std::string tag) + hp9k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), //m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp index f3117d8afcc..8bc7b1ec410 100644 --- a/src/mame/drivers/hp9k_3xx.cpp +++ b/src/mame/drivers/hp9k_3xx.cpp @@ -57,7 +57,7 @@ class hp9k3xx_state : public driver_device { public: - hp9k3xx_state(const machine_config &mconfig, device_type type, std::string tag) + hp9k3xx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, MAINCPU_TAG), m_vram16(*this, "vram16"), diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp index 845a23f1958..1eddffdf46f 100644 --- a/src/mame/drivers/hp_ipc.cpp +++ b/src/mame/drivers/hp_ipc.cpp @@ -268,7 +268,7 @@ Note external interrupt lines NBIR0 to NBIR3 can be asserted by an interface con class hp_ipc_state : public driver_device { public: - hp_ipc_state(const machine_config &mconfig, device_type type, std::string tag) + hp_ipc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/hprot1.cpp b/src/mame/drivers/hprot1.cpp index e7a3c7fe7d6..dabd2b3d0f4 100644 --- a/src/mame/drivers/hprot1.cpp +++ b/src/mame/drivers/hprot1.cpp @@ -64,7 +64,7 @@ Infinite loop is reached at address 0x7699 class hprot1_state : public driver_device { public: - hprot1_state(const machine_config &mconfig, device_type type, std::string tag) + hprot1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_lcdc(*this, "hd44780") diff --git a/src/mame/drivers/hpz80unk.cpp b/src/mame/drivers/hpz80unk.cpp index 6c82c7f0b21..db39fbcc6d6 100644 --- a/src/mame/drivers/hpz80unk.cpp +++ b/src/mame/drivers/hpz80unk.cpp @@ -41,7 +41,7 @@ Z nothing class hpz80unk_state : public driver_device { public: - hpz80unk_state(const machine_config &mconfig, device_type type, std::string tag) + hpz80unk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/ht68k.cpp b/src/mame/drivers/ht68k.cpp index 563229b5094..b09ae69ce60 100644 --- a/src/mame/drivers/ht68k.cpp +++ b/src/mame/drivers/ht68k.cpp @@ -37,7 +37,7 @@ Lot of infos available at: http://www.classiccmp.org/cini/ht68k.htm class ht68k_state : public driver_device { public: - ht68k_state(const machine_config &mconfig, device_type type, std::string tag) + ht68k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_duart(*this, "duart68681"), diff --git a/src/mame/drivers/hunter2.cpp b/src/mame/drivers/hunter2.cpp index c94724f44a0..246d8fcf641 100644 --- a/src/mame/drivers/hunter2.cpp +++ b/src/mame/drivers/hunter2.cpp @@ -34,7 +34,7 @@ class hunter2_state : public driver_device { public: - hunter2_state(const machine_config &mconfig, device_type type, std::string tag) + hunter2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_speaker(*this, "speaker") diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp index 8e150b0aca5..21ec09dfe4b 100644 --- a/src/mame/drivers/hvyunit.cpp +++ b/src/mame/drivers/hvyunit.cpp @@ -76,7 +76,7 @@ To Do: class hvyunit_state : public driver_device { public: - hvyunit_state(const machine_config &mconfig, device_type type, std::string tag) + hvyunit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mastercpu(*this, "master"), m_slavecpu(*this, "slave"), diff --git a/src/mame/drivers/hyperscan.cpp b/src/mame/drivers/hyperscan.cpp index 598af762fa7..6813997dc33 100644 --- a/src/mame/drivers/hyperscan.cpp +++ b/src/mame/drivers/hyperscan.cpp @@ -63,7 +63,7 @@ class hyperscan_state : public driver_device { public: - hyperscan_state(const machine_config &mconfig, device_type type, std::string tag) + hyperscan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp index 87fa0f712f3..378c585cf64 100644 --- a/src/mame/drivers/i7000.cpp +++ b/src/mame/drivers/i7000.cpp @@ -54,7 +54,7 @@ class i7000_state : public driver_device { public: - i7000_state(const machine_config &mconfig, device_type type, std::string tag) + i7000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_card(*this, "cardslot"), diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp index 2caa74d04f1..93162d7a3a9 100644 --- a/src/mame/drivers/ibm6580.cpp +++ b/src/mame/drivers/ibm6580.cpp @@ -22,7 +22,7 @@ ToDo: class ibm6580_state : public driver_device { public: - ibm6580_state(const machine_config &mconfig, device_type type, std::string tag) + ibm6580_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/ibmpc.cpp b/src/mame/drivers/ibmpc.cpp index a4349857dd2..f49d500e829 100644 --- a/src/mame/drivers/ibmpc.cpp +++ b/src/mame/drivers/ibmpc.cpp @@ -268,7 +268,7 @@ XT U44 IBM.bin: IBM 5160 PC/XT Bank-selection decoding ROM (256x4 bit). Not mapp class ibmpc_state : public driver_device { public: - ibmpc_state(const machine_config &mconfig, device_type type, std::string tag) + ibmpc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp index 37bbf9d40a7..f67bc071494 100644 --- a/src/mame/drivers/ibmpcjr.cpp +++ b/src/mame/drivers/ibmpcjr.cpp @@ -27,7 +27,7 @@ class pcjr_state : public driver_device { public: - pcjr_state(const machine_config &mconfig, device_type type, std::string tag) + pcjr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pic8259(*this, "pic8259"), diff --git a/src/mame/drivers/icatel.cpp b/src/mame/drivers/icatel.cpp index 10124c3727b..34e88e683fa 100644 --- a/src/mame/drivers/icatel.cpp +++ b/src/mame/drivers/icatel.cpp @@ -27,7 +27,7 @@ class icatel_state : public driver_device { public: - icatel_state(const machine_config &mconfig, device_type type, std::string tag) + icatel_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_lcdc(*this, "hd44780") diff --git a/src/mame/drivers/ice_bozopail.cpp b/src/mame/drivers/ice_bozopail.cpp index 4bff01178c0..0fb674c3e0e 100644 --- a/src/mame/drivers/ice_bozopail.cpp +++ b/src/mame/drivers/ice_bozopail.cpp @@ -22,7 +22,7 @@ http://www.highwaygames.com/arcade-machines/bozo-s-grand-prize-game-6751/ class ice_bozopail : public driver_device { public: - ice_bozopail(const machine_config &mconfig, device_type type, std::string tag) + ice_bozopail(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) // ,m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/ice_tbd.cpp b/src/mame/drivers/ice_tbd.cpp index 04f92cd74f1..1d5fada7d9d 100644 --- a/src/mame/drivers/ice_tbd.cpp +++ b/src/mame/drivers/ice_tbd.cpp @@ -23,7 +23,7 @@ not sure what the actual inputs / outputs would be on this, maybe just track pos class ice_tbd_state : public driver_device { public: - ice_tbd_state(const machine_config &mconfig, device_type type, std::string tag) + ice_tbd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) ,m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp index 55a92b5f8d6..a21cb19976b 100644 --- a/src/mame/drivers/icecold.cpp +++ b/src/mame/drivers/icecold.cpp @@ -16,7 +16,7 @@ class icecold_state : public driver_device { public: - icecold_state(const machine_config &mconfig, device_type type, std::string tag) + icecold_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ay8910_0(*this, "ay0"), diff --git a/src/mame/drivers/ichiban.cpp b/src/mame/drivers/ichiban.cpp index 23db14b22c5..6ac2c0c0404 100644 --- a/src/mame/drivers/ichiban.cpp +++ b/src/mame/drivers/ichiban.cpp @@ -47,7 +47,7 @@ HSync - 15.510kHz class ichibanjyan_state : public driver_device { public: - ichibanjyan_state(const machine_config &mconfig, device_type type, std::string tag) + ichibanjyan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/ie15.cpp b/src/mame/drivers/ie15.cpp index edadf371478..558f6402d7f 100644 --- a/src/mame/drivers/ie15.cpp +++ b/src/mame/drivers/ie15.cpp @@ -52,7 +52,7 @@ class ie15_state : public driver_device, public device_serial_interface { public: - ie15_state(const machine_config &mconfig, device_type type, std::string tag) : + ie15_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), device_serial_interface(mconfig, *this), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/if800.cpp b/src/mame/drivers/if800.cpp index d840a7fbc5a..70e04f531d1 100644 --- a/src/mame/drivers/if800.cpp +++ b/src/mame/drivers/if800.cpp @@ -16,7 +16,7 @@ class if800_state : public driver_device { public: - if800_state(const machine_config &mconfig, device_type type, std::string tag) + if800_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_hgdc(*this, "upd7220"), m_video_ram(*this, "video_ram"), diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp index 8ae172df9e3..effc725129c 100644 --- a/src/mame/drivers/igs009.cpp +++ b/src/mame/drivers/igs009.cpp @@ -35,7 +35,7 @@ Year Game Manufacturer Notes class igs009_state : public driver_device { public: - igs009_state(const machine_config &mconfig, device_type type, std::string tag) + igs009_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp index 1f5629ff019..5375a46d499 100644 --- a/src/mame/drivers/igs011.cpp +++ b/src/mame/drivers/igs011.cpp @@ -83,7 +83,7 @@ struct blitter_t class igs011_state : public driver_device { public: - igs011_state(const machine_config &mconfig, device_type type, std::string tag) + igs011_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp index 64e6a2da50d..1d1d439b3fc 100644 --- a/src/mame/drivers/igs017.cpp +++ b/src/mame/drivers/igs017.cpp @@ -58,7 +58,7 @@ Notes: class igs017_state : public driver_device { public: - igs017_state(const machine_config &mconfig, device_type type, std::string tag) + igs017_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_input_addr(-1), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/igs_fear.cpp b/src/mame/drivers/igs_fear.cpp index fb74a19e951..19a3976954c 100644 --- a/src/mame/drivers/igs_fear.cpp +++ b/src/mame/drivers/igs_fear.cpp @@ -12,7 +12,7 @@ class igs_fear_state : public driver_device { public: - igs_fear_state(const machine_config &mconfig, device_type type, std::string tag) + igs_fear_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/igs_m027.cpp b/src/mame/drivers/igs_m027.cpp index 8939d49865a..48d85476b15 100644 --- a/src/mame/drivers/igs_m027.cpp +++ b/src/mame/drivers/igs_m027.cpp @@ -31,7 +31,7 @@ class igs_m027_state : public driver_device { public: - igs_m027_state(const machine_config &mconfig, device_type type, std::string tag) + igs_m027_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_igs_mainram(*this, "igs_mainram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/igs_m036.cpp b/src/mame/drivers/igs_m036.cpp index 2dffab6d176..a101a74b3b9 100644 --- a/src/mame/drivers/igs_m036.cpp +++ b/src/mame/drivers/igs_m036.cpp @@ -66,7 +66,7 @@ check more info and photo from cjdh2.zip!!! class igs_m036_state : public driver_device { public: - igs_m036_state(const machine_config &mconfig, device_type type, std::string tag) + igs_m036_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/igspc.cpp b/src/mame/drivers/igspc.cpp index c6afd16a2ca..2acd3fc9b2f 100644 --- a/src/mame/drivers/igspc.cpp +++ b/src/mame/drivers/igspc.cpp @@ -49,7 +49,7 @@ can't be emulated without proper mb bios class speeddrv_state : public driver_device { public: - speeddrv_state(const machine_config &mconfig, device_type type, std::string tag) + speeddrv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp index 9bd844b6e27..18d32b1d5e1 100644 --- a/src/mame/drivers/igspoker.cpp +++ b/src/mame/drivers/igspoker.cpp @@ -76,7 +76,7 @@ FIX: PK Tetris have an input named AMUSE which I couldn't map. Maybe it is class igspoker_state : public driver_device { public: - igspoker_state(const machine_config &mconfig, device_type type, std::string tag) + igspoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_bg_tile_ram(*this, "bg_tile_ram"), diff --git a/src/mame/drivers/imds.cpp b/src/mame/drivers/imds.cpp index 6de967bb957..0748c6d700f 100644 --- a/src/mame/drivers/imds.cpp +++ b/src/mame/drivers/imds.cpp @@ -26,7 +26,7 @@ real hardware. class imds_state : public driver_device { public: - imds_state(const machine_config &mconfig, device_type type, std::string tag) + imds_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp index 64694decc76..7a579f7a89b 100644 --- a/src/mame/drivers/imds2.cpp +++ b/src/mame/drivers/imds2.cpp @@ -164,7 +164,7 @@ static ADDRESS_MAP_START(kb_io_map , AS_IO , 8 , imds2_state) AM_RANGE(MCS48_PORT_T1 , MCS48_PORT_T1) AM_READ(imds2_kb_port_t1_r) ADDRESS_MAP_END -imds2_state::imds2_state(const machine_config &mconfig, device_type type, std::string tag) +imds2_state::imds2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig , type , tag), m_ipccpu(*this , "ipccpu"), m_ipcsyspic(*this , "ipcsyspic"), diff --git a/src/mame/drivers/imolagp.cpp b/src/mame/drivers/imolagp.cpp index 2749dc48f8f..5de4ed28812 100644 --- a/src/mame/drivers/imolagp.cpp +++ b/src/mame/drivers/imolagp.cpp @@ -90,7 +90,7 @@ www.andys-arcade.com class imolagp_state : public driver_device { public: - imolagp_state(const machine_config &mconfig, device_type type, std::string tag) + imolagp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_slavecpu(*this, "slave"), diff --git a/src/mame/drivers/imsai.cpp b/src/mame/drivers/imsai.cpp index e477ba7c71b..c41ada8d586 100644 --- a/src/mame/drivers/imsai.cpp +++ b/src/mame/drivers/imsai.cpp @@ -27,7 +27,7 @@ class imsai_state : public driver_device { public: - imsai_state(const machine_config &mconfig, device_type type, std::string tag) + imsai_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp index 259ac816d19..f0dea109f11 100644 --- a/src/mame/drivers/inder.cpp +++ b/src/mame/drivers/inder.cpp @@ -40,7 +40,7 @@ class inder_state : public genpin_class { public: - inder_state(const machine_config &mconfig, device_type type, std::string tag) + inder_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/indiana.cpp b/src/mame/drivers/indiana.cpp index f293d0e949f..7852506df7a 100644 --- a/src/mame/drivers/indiana.cpp +++ b/src/mame/drivers/indiana.cpp @@ -27,7 +27,7 @@ class indiana_state : public driver_device { public: - indiana_state(const machine_config &mconfig, device_type type, std::string tag) + indiana_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, M68K_TAG) { } DECLARE_DRIVER_INIT(indiana); diff --git a/src/mame/drivers/indigo.cpp b/src/mame/drivers/indigo.cpp index c10f7fa8c11..64a3a1c1c01 100644 --- a/src/mame/drivers/indigo.cpp +++ b/src/mame/drivers/indigo.cpp @@ -36,7 +36,7 @@ public: TIMER_RTC }; - indigo_state(const machine_config &mconfig, device_type type, std::string tag) + indigo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_wd33c93(*this, "wd33c93") diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp index ed894f3e1b0..9d76f45c753 100644 --- a/src/mame/drivers/indy_indigo2.cpp +++ b/src/mame/drivers/indy_indigo2.cpp @@ -99,7 +99,7 @@ public: TIMER_IP22_MSEC }; - ip22_state(const machine_config &mconfig, device_type type, std::string tag) : + ip22_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_wd33c93(*this, "wd33c93"), diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp index c4eaca9a4fd..469203c59cc 100644 --- a/src/mame/drivers/instruct.cpp +++ b/src/mame/drivers/instruct.cpp @@ -52,7 +52,7 @@ class instruct_state : public driver_device { public: - instruct_state(const machine_config &mconfig, device_type type, std::string tag) + instruct_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_p_ram(*this, "mainram") diff --git a/src/mame/drivers/interact.cpp b/src/mame/drivers/interact.cpp index e0281ecf65f..35ecbbf2276 100644 --- a/src/mame/drivers/interact.cpp +++ b/src/mame/drivers/interact.cpp @@ -66,7 +66,7 @@ class interact_state : public hec2hrp_state { public: - interact_state(const machine_config &mconfig, device_type type, std::string tag) + interact_state(const machine_config &mconfig, device_type type, const char *tag) : hec2hrp_state(mconfig, type, tag), m_videoram(*this, "videoram") { } diff --git a/src/mame/drivers/intrscti.cpp b/src/mame/drivers/intrscti.cpp index e30bc8223fc..9c27cd17f45 100644 --- a/src/mame/drivers/intrscti.cpp +++ b/src/mame/drivers/intrscti.cpp @@ -20,7 +20,7 @@ I've not had a chance to wire up the board yet, but it might be possible to writ class intrscti_state : public driver_device { public: - intrscti_state(const machine_config &mconfig, device_type type, std::string tag) + intrscti_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_subcpu(*this,"subcpu"), diff --git a/src/mame/drivers/invqix.cpp b/src/mame/drivers/invqix.cpp index 05c8b7b79a8..b0daddc94f2 100644 --- a/src/mame/drivers/invqix.cpp +++ b/src/mame/drivers/invqix.cpp @@ -126,7 +126,7 @@ as well as Up Right, Cocktail or Flip Screen from the service menu. class invqix_state : public driver_device { public: - invqix_state(const machine_config &mconfig, device_type type, std::string tag) + invqix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), diff --git a/src/mame/drivers/ipc.cpp b/src/mame/drivers/ipc.cpp index 94d103fa259..04798d223a9 100644 --- a/src/mame/drivers/ipc.cpp +++ b/src/mame/drivers/ipc.cpp @@ -48,7 +48,7 @@ class ipc_state : public driver_device { public: - ipc_state(const machine_config &mconfig, device_type type, std::string tag) + ipc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp index 7462cf98c0c..00df139e72e 100644 --- a/src/mame/drivers/ipds.cpp +++ b/src/mame/drivers/ipds.cpp @@ -18,7 +18,7 @@ class ipds_state : public driver_device { public: - ipds_state(const machine_config &mconfig, device_type type, std::string tag) + ipds_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_crtc(*this, "i8275"), diff --git a/src/mame/drivers/iq151.cpp b/src/mame/drivers/iq151.cpp index 1214ce8e6b2..76986eae7f9 100644 --- a/src/mame/drivers/iq151.cpp +++ b/src/mame/drivers/iq151.cpp @@ -66,7 +66,7 @@ ToDo: class iq151_state : public driver_device { public: - iq151_state(const machine_config &mconfig, device_type type, std::string tag) + iq151_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pic(*this, "pic8259"), diff --git a/src/mame/drivers/iris3130.cpp b/src/mame/drivers/iris3130.cpp index 9a4eb17bc5e..47d8c0fb9b1 100644 --- a/src/mame/drivers/iris3130.cpp +++ b/src/mame/drivers/iris3130.cpp @@ -51,7 +51,7 @@ class sgi_ip2_state : public driver_device { public: - sgi_ip2_state(const machine_config &mconfig, device_type type, std::string tag) + sgi_ip2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mainram(*this, "mainram"), diff --git a/src/mame/drivers/irisha.cpp b/src/mame/drivers/irisha.cpp index 62e624899c2..bdb0a39dd36 100644 --- a/src/mame/drivers/irisha.cpp +++ b/src/mame/drivers/irisha.cpp @@ -27,7 +27,7 @@ class irisha_state : public driver_device { public: - irisha_state(const machine_config &mconfig, device_type type, std::string tag) : + irisha_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp index 304bf1184cd..600b0886b74 100644 --- a/src/mame/drivers/isbc.cpp +++ b/src/mame/drivers/isbc.cpp @@ -28,7 +28,7 @@ isbc86 commands: BYTE WORD REAL EREAL ROMTEST. ROMTEST works, the others hang. class isbc_state : public driver_device { public: - isbc_state(const machine_config &mconfig, device_type type, std::string tag) + isbc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_uart8251(*this, "uart8251"), diff --git a/src/mame/drivers/iskr103x.cpp b/src/mame/drivers/iskr103x.cpp index 45106f3743a..945415f676b 100644 --- a/src/mame/drivers/iskr103x.cpp +++ b/src/mame/drivers/iskr103x.cpp @@ -32,7 +32,7 @@ class iskr103x_state : public driver_device { public: - iskr103x_state(const machine_config &mconfig, device_type type, std::string tag) + iskr103x_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/istellar.cpp b/src/mame/drivers/istellar.cpp index 8913b15a2df..272eb7b1e9a 100644 --- a/src/mame/drivers/istellar.cpp +++ b/src/mame/drivers/istellar.cpp @@ -30,7 +30,7 @@ Todo: class istellar_state : public driver_device { public: - istellar_state(const machine_config &mconfig, device_type type, std::string tag) + istellar_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc") , m_tile_ram(*this, "tile_ram"), diff --git a/src/mame/drivers/iteagle.cpp b/src/mame/drivers/iteagle.cpp index 106cf700641..7346b6db62d 100644 --- a/src/mame/drivers/iteagle.cpp +++ b/src/mame/drivers/iteagle.cpp @@ -117,7 +117,7 @@ www.multitech.com class iteagle_state : public driver_device { public: - iteagle_state(const machine_config &mconfig, device_type type, std::string tag) + iteagle_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") {} diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index 834057e8bae..13b33bdaf1d 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -1093,8 +1093,8 @@ INPUT_PORTS_END CUSTOM_INPUT_MEMBER(itech8_state::gtg_mux) { - const char * tag1 = (const char *)param; - const char * tag2 = tag1 + strlen(tag1) + 1; + const char *tag1 = (const char *)param; + const char *tag2 = tag1 + strlen(tag1) + 1; return ioport(tag1)->read() & ioport(tag2)->read(); } diff --git a/src/mame/drivers/itgambl2.cpp b/src/mame/drivers/itgambl2.cpp index 67812206cd3..1852545ccc3 100644 --- a/src/mame/drivers/itgambl2.cpp +++ b/src/mame/drivers/itgambl2.cpp @@ -62,7 +62,7 @@ class itgambl2_state : public driver_device { public: - itgambl2_state(const machine_config &mconfig, device_type type, std::string tag) + itgambl2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette") { } diff --git a/src/mame/drivers/itgambl3.cpp b/src/mame/drivers/itgambl3.cpp index d1ed0b20cac..96ac6efe2b8 100644 --- a/src/mame/drivers/itgambl3.cpp +++ b/src/mame/drivers/itgambl3.cpp @@ -50,7 +50,7 @@ class itgambl3_state : public driver_device { public: - itgambl3_state(const machine_config &mconfig, device_type type, std::string tag) + itgambl3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette") { } diff --git a/src/mame/drivers/itgamble.cpp b/src/mame/drivers/itgamble.cpp index d61efae2663..8c9cf972924 100644 --- a/src/mame/drivers/itgamble.cpp +++ b/src/mame/drivers/itgamble.cpp @@ -64,7 +64,7 @@ class itgamble_state : public driver_device { public: - itgamble_state(const machine_config &mconfig, device_type type, std::string tag) + itgamble_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette") diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp index b3f02baa35f..98a2f64c7cc 100644 --- a/src/mame/drivers/itt3030.cpp +++ b/src/mame/drivers/itt3030.cpp @@ -205,7 +205,7 @@ Beeper Circuit, all ICs shown: class itt3030_state : public driver_device { public: - itt3030_state(const machine_config &mconfig, device_type type, std::string tag) + itt3030_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_kbdmcu(*this, "kbdmcu") diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp index 3e0667632d7..26fb86afcbf 100644 --- a/src/mame/drivers/jackie.cpp +++ b/src/mame/drivers/jackie.cpp @@ -53,7 +53,7 @@ Note class jackie_state : public driver_device { public: - jackie_state(const machine_config &mconfig, device_type type, std::string tag) + jackie_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/jackpool.cpp b/src/mame/drivers/jackpool.cpp index 2d2ed3c47b0..b5528b4fc8b 100644 --- a/src/mame/drivers/jackpool.cpp +++ b/src/mame/drivers/jackpool.cpp @@ -26,7 +26,7 @@ TODO: class jackpool_state : public driver_device { public: - jackpool_state(const machine_config &mconfig, device_type type, std::string tag) + jackpool_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_io(*this, "io"), diff --git a/src/mame/drivers/jade.cpp b/src/mame/drivers/jade.cpp index 659075458c8..38710c20bd8 100644 --- a/src/mame/drivers/jade.cpp +++ b/src/mame/drivers/jade.cpp @@ -23,7 +23,7 @@ class jade_state : public driver_device { public: - jade_state(const machine_config &mconfig, device_type type, std::string tag) + jade_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp index aba346f274e..17fa609b29c 100644 --- a/src/mame/drivers/jaguar.cpp +++ b/src/mame/drivers/jaguar.cpp @@ -377,7 +377,7 @@ extern const device_type COJAG_HARDDISK; class cojag_hdd : public ide_hdd_device { public: - cojag_hdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) + cojag_hdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ide_hdd_device(mconfig, COJAG_HARDDISK, "HDD CoJag", tag, owner, clock, "cojag_hdd", __FILE__) { } diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp index 32b541b4357..426aab1e010 100644 --- a/src/mame/drivers/jalmah.cpp +++ b/src/mame/drivers/jalmah.cpp @@ -121,7 +121,7 @@ OSC: 12.000MHz class jalmah_state : public driver_device { public: - jalmah_state(const machine_config &mconfig, device_type type, std::string tag) + jalmah_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sc0_vram(*this, "sc0_vram"), m_sc1_vram(*this, "sc1_vram"), diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp index 75ecbb1622d..a72c7c1a9b6 100644 --- a/src/mame/drivers/jangou.cpp +++ b/src/mame/drivers/jangou.cpp @@ -40,7 +40,7 @@ $c088-$c095 player tiles class jangou_state : public driver_device { public: - jangou_state(const machine_config &mconfig, device_type type, std::string tag) + jangou_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cpu_0(*this, "cpu0"), m_cpu_1(*this, "cpu1"), diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp index 104724ff750..f6182842d14 100644 --- a/src/mame/drivers/jankenmn.cpp +++ b/src/mame/drivers/jankenmn.cpp @@ -160,7 +160,7 @@ class jankenmn_state : public driver_device { public: - jankenmn_state(const machine_config &mconfig, device_type type, std::string tag) + jankenmn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/jantotsu.cpp b/src/mame/drivers/jantotsu.cpp index b42950e2db6..94a3cbd8710 100644 --- a/src/mame/drivers/jantotsu.cpp +++ b/src/mame/drivers/jantotsu.cpp @@ -104,7 +104,7 @@ dumped by sayu class jantotsu_state : public driver_device { public: - jantotsu_state(const machine_config &mconfig, device_type type, std::string tag) + jantotsu_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_adpcm(*this, "adpcm") , diff --git a/src/mame/drivers/jchan.cpp b/src/mame/drivers/jchan.cpp index d98c66aad21..a5eb0ba0699 100644 --- a/src/mame/drivers/jchan.cpp +++ b/src/mame/drivers/jchan.cpp @@ -165,7 +165,7 @@ JC-301-00 W11 9510K7059 23C16000 U85 class jchan_state : public driver_device { public: - jchan_state(const machine_config &mconfig, device_type type, std::string tag) + jchan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_subcpu(*this,"sub"), diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp index 777d9f82d79..e3135dcbc6e 100644 --- a/src/mame/drivers/jclub2.cpp +++ b/src/mame/drivers/jclub2.cpp @@ -105,7 +105,7 @@ To do: class darkhors_state : public driver_device { public: - darkhors_state(const machine_config &mconfig, device_type type, std::string tag) + darkhors_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tmapram(*this, "tmapram"), m_tmapscroll(*this, "tmapscroll"), diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp index 0cd387c68d8..c86dc4821e5 100644 --- a/src/mame/drivers/jeutel.cpp +++ b/src/mame/drivers/jeutel.cpp @@ -25,7 +25,7 @@ ToDo: class jeutel_state : public genpin_class { public: - jeutel_state(const machine_config &mconfig, device_type type, std::string tag) + jeutel_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_cpu2(*this, "cpu2") diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp index 0599f23a050..67c76df6eb8 100644 --- a/src/mame/drivers/jokrwild.cpp +++ b/src/mame/drivers/jokrwild.cpp @@ -83,7 +83,7 @@ class jokrwild_state : public driver_device { public: - jokrwild_state(const machine_config &mconfig, device_type type, std::string tag) + jokrwild_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp index 78862f77700..8026d553914 100644 --- a/src/mame/drivers/jollyjgr.cpp +++ b/src/mame/drivers/jollyjgr.cpp @@ -107,7 +107,7 @@ Notes: class jollyjgr_state : public driver_device { public: - jollyjgr_state(const machine_config &mconfig, device_type type, std::string tag) + jollyjgr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/jongkyo.cpp b/src/mame/drivers/jongkyo.cpp index c8dffe3c1ac..46e762a799f 100644 --- a/src/mame/drivers/jongkyo.cpp +++ b/src/mame/drivers/jongkyo.cpp @@ -37,7 +37,7 @@ class jongkyo_state : public driver_device { public: - jongkyo_state(const machine_config &mconfig, device_type type, std::string tag) + jongkyo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/jonos.cpp b/src/mame/drivers/jonos.cpp index 96c4b133336..657d2dca18b 100644 --- a/src/mame/drivers/jonos.cpp +++ b/src/mame/drivers/jonos.cpp @@ -19,7 +19,7 @@ class jonos_state : public driver_device { public: - jonos_state(const machine_config &mconfig, device_type type, std::string tag) + jonos_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_p_videoram(*this, "videoram") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp index f31cc2e1e83..a17aacc787a 100644 --- a/src/mame/drivers/joystand.cpp +++ b/src/mame/drivers/joystand.cpp @@ -100,7 +100,7 @@ Notes: class joystand_state : public driver_device { public: - joystand_state(const machine_config &mconfig, device_type type, std::string tag) + joystand_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tmp68301(*this, "tmp68301"), diff --git a/src/mame/drivers/jp.cpp b/src/mame/drivers/jp.cpp index 0df22f3677a..4e25800686a 100644 --- a/src/mame/drivers/jp.cpp +++ b/src/mame/drivers/jp.cpp @@ -26,7 +26,7 @@ ToDo: class jp_state : public genpin_class { public: - jp_state(const machine_config &mconfig, device_type type, std::string tag) + jp_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/jpmmps.cpp b/src/mame/drivers/jpmmps.cpp index 6071aaa5d6a..c80b2c8fa64 100644 --- a/src/mame/drivers/jpmmps.cpp +++ b/src/mame/drivers/jpmmps.cpp @@ -40,7 +40,7 @@ class jpmmps_state : public driver_device { public: - jpmmps_state(const machine_config &mconfig, device_type type, std::string tag) + jpmmps_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_psg(*this, "sn"), diff --git a/src/mame/drivers/jpms80.cpp b/src/mame/drivers/jpms80.cpp index 9decebb1123..ff3edef631a 100644 --- a/src/mame/drivers/jpms80.cpp +++ b/src/mame/drivers/jpms80.cpp @@ -32,7 +32,7 @@ System80 is based on the SRU platform, but with more outputs and finally a separ class jpms80_state : public driver_device { public: - jpms80_state(const machine_config &mconfig, device_type type, std::string tag) + jpms80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/jpmsru.cpp b/src/mame/drivers/jpmsru.cpp index 2b51e6b84e1..98a3a895991 100644 --- a/src/mame/drivers/jpmsru.cpp +++ b/src/mame/drivers/jpmsru.cpp @@ -25,7 +25,7 @@ class jpmsru_state : public driver_device { public: - jpmsru_state(const machine_config &mconfig, device_type type, std::string tag) + jpmsru_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/jpmsys7.cpp b/src/mame/drivers/jpmsys7.cpp index 60e4c3062c7..44b8134d67e 100644 --- a/src/mame/drivers/jpmsys7.cpp +++ b/src/mame/drivers/jpmsys7.cpp @@ -28,7 +28,7 @@ Pluto 8: ColdFire 5475 class jpmsys7_state : public driver_device { public: - jpmsys7_state(const machine_config &mconfig, device_type type, std::string tag) + jpmsys7_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp index e9cd0ed0872..8ec6d10dfc1 100644 --- a/src/mame/drivers/jr100.cpp +++ b/src/mame/drivers/jr100.cpp @@ -26,7 +26,7 @@ class jr100_state : public driver_device { public: - jr100_state(const machine_config &mconfig, device_type type, std::string tag) + jr100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this, "ram"), m_pcg(*this, "pcg"), diff --git a/src/mame/drivers/jr200.cpp b/src/mame/drivers/jr200.cpp index 961688c0bff..f04d8bb1c07 100644 --- a/src/mame/drivers/jr200.cpp +++ b/src/mame/drivers/jr200.cpp @@ -25,7 +25,7 @@ class jr200_state : public driver_device { public: - jr200_state(const machine_config &mconfig, device_type type, std::string tag) + jr200_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_cram(*this, "cram"), diff --git a/src/mame/drivers/jrpacman.cpp b/src/mame/drivers/jrpacman.cpp index 02a8fa6aacb..773a6788d4a 100644 --- a/src/mame/drivers/jrpacman.cpp +++ b/src/mame/drivers/jrpacman.cpp @@ -108,7 +108,7 @@ class jrpacman_state : public pacman_state { public: - jrpacman_state(const machine_config &mconfig, device_type type, std::string tag) + jrpacman_state(const machine_config &mconfig, device_type type, const char *tag) : pacman_state(mconfig, type, tag) { } DECLARE_WRITE8_MEMBER(jrpacman_interrupt_vector_w); DECLARE_WRITE8_MEMBER(irq_mask_w); diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp index 9b1c4c9544d..07114be0ac1 100644 --- a/src/mame/drivers/jtc.cpp +++ b/src/mame/drivers/jtc.cpp @@ -25,7 +25,7 @@ class jtc_state : public driver_device { public: - jtc_state(const machine_config &mconfig, device_type type, std::string tag) + jtc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, UB8830D_TAG), m_cassette(*this, "cassette"), @@ -57,7 +57,7 @@ public: class jtces88_state : public jtc_state { public: - jtces88_state(const machine_config &mconfig, device_type type, std::string tag) + jtces88_state(const machine_config &mconfig, device_type type, const char *tag) : jtc_state(mconfig, type, tag) { } }; @@ -66,7 +66,7 @@ public: class jtces23_state : public jtc_state { public: - jtces23_state(const machine_config &mconfig, device_type type, std::string tag) + jtces23_state(const machine_config &mconfig, device_type type, const char *tag) : jtc_state(mconfig, type, tag) { } @@ -78,7 +78,7 @@ public: class jtces40_state : public jtc_state { public: - jtces40_state(const machine_config &mconfig, device_type type, std::string tag) + jtces40_state(const machine_config &mconfig, device_type type, const char *tag) : jtc_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp index 95ab37d9d18..cee308786cd 100644 --- a/src/mame/drivers/jubilee.cpp +++ b/src/mame/drivers/jubilee.cpp @@ -206,7 +206,7 @@ class jubilee_state : public driver_device { public: - jubilee_state(const machine_config &mconfig, device_type type, std::string tag) + jubilee_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoworkram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/juicebox.cpp b/src/mame/drivers/juicebox.cpp index 0b1f2fb62e1..3b6a24e568c 100644 --- a/src/mame/drivers/juicebox.cpp +++ b/src/mame/drivers/juicebox.cpp @@ -31,7 +31,7 @@ struct jb_smc_t class juicebox_state : public driver_device { public: - juicebox_state(const machine_config &mconfig, device_type type, std::string tag) + juicebox_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), diff --git a/src/mame/drivers/junior.cpp b/src/mame/drivers/junior.cpp index f88c2abf3ad..6a3f4c3928c 100644 --- a/src/mame/drivers/junior.cpp +++ b/src/mame/drivers/junior.cpp @@ -34,7 +34,7 @@ Test Paste: class junior_state : public driver_device { public: - junior_state(const machine_config &mconfig, device_type type, std::string tag) + junior_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_riot(*this, "riot") , diff --git a/src/mame/drivers/junofrst.cpp b/src/mame/drivers/junofrst.cpp index 159f94bddb8..f8a5b55b9d8 100644 --- a/src/mame/drivers/junofrst.cpp +++ b/src/mame/drivers/junofrst.cpp @@ -94,7 +94,7 @@ Blitter source graphics class junofrst_state : public tutankhm_state { public: - junofrst_state(const machine_config &mconfig, device_type type, std::string tag) + junofrst_state(const machine_config &mconfig, device_type type, const char *tag) : tutankhm_state(mconfig, type, tag), m_audiocpu(*this, "audiocpu"), m_i8039(*this, "mcu"), diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index 85a053608e8..86ba95a41c6 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -68,7 +68,7 @@ Ports: class ace_state : public driver_device { public: - ace_state(const machine_config &mconfig, device_type type, std::string tag) + ace_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_ppi(*this, I8255_TAG), diff --git a/src/mame/drivers/jvh.cpp b/src/mame/drivers/jvh.cpp index eec499e8518..68c5c44b120 100644 --- a/src/mame/drivers/jvh.cpp +++ b/src/mame/drivers/jvh.cpp @@ -13,7 +13,7 @@ class jvh_state : public driver_device { public: - jvh_state(const machine_config &mconfig, device_type type, std::string tag) + jvh_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/k1003.cpp b/src/mame/drivers/k1003.cpp index c24017f1cca..fd95cf461d3 100644 --- a/src/mame/drivers/k1003.cpp +++ b/src/mame/drivers/k1003.cpp @@ -49,7 +49,7 @@ The writes to ports 0A, 11 & 13 are continuous. class k1003_state : public driver_device { public: - k1003_state(const machine_config &mconfig, device_type type, std::string tag) + k1003_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/k8915.cpp b/src/mame/drivers/k8915.cpp index b95f0dc81ce..568851f15e0 100644 --- a/src/mame/drivers/k8915.cpp +++ b/src/mame/drivers/k8915.cpp @@ -19,7 +19,7 @@ class k8915_state : public driver_device { public: - k8915_state(const machine_config &mconfig, device_type type, std::string tag) + k8915_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_p_videoram(*this, "p_videoram") diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp index 54440c69c7e..96b3987b6de 100644 --- a/src/mame/drivers/kaneko16.cpp +++ b/src/mame/drivers/kaneko16.cpp @@ -688,7 +688,7 @@ ADDRESS_MAP_END Shogun Warriors ***************************************************************************/ -void kaneko16_state::kaneko16_common_oki_bank_w( const char *bankname, std::string tag, int bank, size_t fixedsize, size_t bankedsize ) +void kaneko16_state::kaneko16_common_oki_bank_w( const char *bankname, const char* tag, int bank, size_t fixedsize, size_t bankedsize ) { UINT32 bankaddr; UINT8* samples = memregion(tag)->base(); diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp index 767ade46e8a..cf7cd47487f 100644 --- a/src/mame/drivers/kas89.cpp +++ b/src/mame/drivers/kas89.cpp @@ -204,7 +204,7 @@ class kas89_state : public driver_device { public: - kas89_state(const machine_config &mconfig, device_type type, std::string tag) + kas89_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/kenseim.cpp b/src/mame/drivers/kenseim.cpp index 9835db8afac..e5ec6e2cd78 100644 --- a/src/mame/drivers/kenseim.cpp +++ b/src/mame/drivers/kenseim.cpp @@ -149,7 +149,7 @@ GND | 20 class kenseim_state : public cps_state { public: - kenseim_state(const machine_config &mconfig, device_type type, std::string tag) + kenseim_state(const machine_config &mconfig, device_type type, const char *tag) : cps_state(mconfig, type, tag), m_to_68k_cmd_low(0), m_to_68k_cmd_d9(0), diff --git a/src/mame/drivers/kim1.cpp b/src/mame/drivers/kim1.cpp index ca0bc4073d0..828b8357805 100644 --- a/src/mame/drivers/kim1.cpp +++ b/src/mame/drivers/kim1.cpp @@ -107,7 +107,7 @@ Test Paste: class kim1_state : public driver_device { public: - kim1_state(const machine_config &mconfig, device_type type, std::string tag) + kim1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_riot2(*this, "miot_u2"), diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp index 2040c9281bd..ac0f42de2bd 100644 --- a/src/mame/drivers/kingdrby.cpp +++ b/src/mame/drivers/kingdrby.cpp @@ -85,7 +85,7 @@ sg1_b.e1 4096 0x92ef3c13 D2732D class kingdrby_state : public driver_device { public: - kingdrby_state(const machine_config &mconfig, device_type type, std::string tag) + kingdrby_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_attr(*this, "attr"), diff --git a/src/mame/drivers/kingpin.cpp b/src/mame/drivers/kingpin.cpp index 2dc917dfc43..6f72cd2ee2c 100644 --- a/src/mame/drivers/kingpin.cpp +++ b/src/mame/drivers/kingpin.cpp @@ -42,7 +42,7 @@ Todo: class kingpin_state : public driver_device { public: - kingpin_state(const machine_config &mconfig, device_type type, std::string tag) + kingpin_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/kinst.cpp b/src/mame/drivers/kinst.cpp index 56768ff65a1..46775f6378b 100644 --- a/src/mame/drivers/kinst.cpp +++ b/src/mame/drivers/kinst.cpp @@ -146,7 +146,7 @@ public: TIMER_IRQ0_STOP }; - kinst_state(const machine_config &mconfig, device_type type, std::string tag) + kinst_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_rambase(*this, "rambase"), m_rambase2(*this, "rambase2"), diff --git a/src/mame/drivers/kissproto.cpp b/src/mame/drivers/kissproto.cpp index 1d2e7a674fb..4ba8f744db8 100644 --- a/src/mame/drivers/kissproto.cpp +++ b/src/mame/drivers/kissproto.cpp @@ -14,7 +14,7 @@ class kissp_state : public driver_device { public: - kissp_state(const machine_config &mconfig, device_type type, std::string tag) + kissp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp index 48c77745419..9156ec999d6 100644 --- a/src/mame/drivers/koftball.cpp +++ b/src/mame/drivers/koftball.cpp @@ -40,7 +40,7 @@ ft5_v6_c4.u58 / class koftball_state : public driver_device { public: - koftball_state(const machine_config &mconfig, device_type type, std::string tag) + koftball_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_main_ram(*this, "main_ram"), diff --git a/src/mame/drivers/koikoi.cpp b/src/mame/drivers/koikoi.cpp index 7dc046acee7..2e374415c5c 100644 --- a/src/mame/drivers/koikoi.cpp +++ b/src/mame/drivers/koikoi.cpp @@ -50,7 +50,7 @@ static const int input_tab[]= { 0x22, 0x64, 0x44, 0x68, 0x30, 0x50, 0x70, 0x48, class koikoi_state : public driver_device { public: - koikoi_state(const machine_config &mconfig, device_type type, std::string tag) + koikoi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/konamigq.cpp b/src/mame/drivers/konamigq.cpp index 21051c57664..458737b8556 100644 --- a/src/mame/drivers/konamigq.cpp +++ b/src/mame/drivers/konamigq.cpp @@ -84,7 +84,7 @@ class konamigq_state : public driver_device { public: - konamigq_state(const machine_config &mconfig, device_type type, std::string tag) + konamigq_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp index cc426022594..24a2a64cbde 100644 --- a/src/mame/drivers/konamigv.cpp +++ b/src/mame/drivers/konamigv.cpp @@ -137,7 +137,7 @@ Notes: class konamigv_state : public driver_device { public: - konamigv_state(const machine_config &mconfig, device_type type, std::string tag) + konamigv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_am53cf96(*this, "am53cf96"), m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/konamim2.cpp b/src/mame/drivers/konamim2.cpp index db61f5d8077..426556d0e95 100644 --- a/src/mame/drivers/konamim2.cpp +++ b/src/mame/drivers/konamim2.cpp @@ -206,7 +206,7 @@ struct CDE_DMA class konamim2_state : public driver_device { public: - konamim2_state(const machine_config &mconfig, device_type type, std::string tag) + konamim2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_main_ram(*this, "main_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/konendev.cpp b/src/mame/drivers/konendev.cpp index 3535ddb3867..9e8f542eb65 100644 --- a/src/mame/drivers/konendev.cpp +++ b/src/mame/drivers/konendev.cpp @@ -44,7 +44,7 @@ class konendev_state : public driver_device { public: - konendev_state(const machine_config &mconfig, device_type type, std::string tag) + konendev_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gcu(*this, "gcu"), diff --git a/src/mame/drivers/konin.cpp b/src/mame/drivers/konin.cpp index e78bb1743b1..ac7c8a0d69c 100644 --- a/src/mame/drivers/konin.cpp +++ b/src/mame/drivers/konin.cpp @@ -36,7 +36,7 @@ class konin_state : public driver_device { public: - konin_state(const machine_config &mconfig, device_type type, std::string tag) + konin_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/kontest.cpp b/src/mame/drivers/kontest.cpp index 90266c31f87..f14f545f840 100644 --- a/src/mame/drivers/kontest.cpp +++ b/src/mame/drivers/kontest.cpp @@ -29,7 +29,7 @@ class kontest_state : public driver_device { public: - kontest_state(const machine_config &mconfig, device_type type, std::string tag) + kontest_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, "ram"), diff --git a/src/mame/drivers/korgm1.cpp b/src/mame/drivers/korgm1.cpp index f3fa5769c29..6714aaab7dc 100644 --- a/src/mame/drivers/korgm1.cpp +++ b/src/mame/drivers/korgm1.cpp @@ -21,7 +21,7 @@ class korgm1_state : public driver_device { public: - korgm1_state(const machine_config &mconfig, device_type type, std::string tag) + korgm1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp index 89c464476d9..18de66cf40d 100644 --- a/src/mame/drivers/ksys573.cpp +++ b/src/mame/drivers/ksys573.cpp @@ -371,7 +371,7 @@ G: gun mania only, drives air soft gun (this game uses real BB bullet) class ksys573_state : public driver_device { public: - ksys573_state( const machine_config &mconfig, device_type type, std::string tag ) : + ksys573_state( const machine_config &mconfig, device_type type, const char *tag ) : driver_device( mconfig, type, tag ), m_analog0(*this, "analog0" ), m_analog1(*this, "analog1" ), diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp index 827d11b0f3d..0a4d2b5c86c 100644 --- a/src/mame/drivers/kungfur.cpp +++ b/src/mame/drivers/kungfur.cpp @@ -67,7 +67,7 @@ mae(forward), migi(right), ushiro(back), hidari(left) class kungfur_state : public driver_device { public: - kungfur_state(const machine_config &mconfig, device_type type, std::string tag) + kungfur_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_adpcm1(*this, "adpcm1"), diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp index f6da4092398..ef8248de862 100644 --- a/src/mame/drivers/kurukuru.cpp +++ b/src/mame/drivers/kurukuru.cpp @@ -204,7 +204,7 @@ class kurukuru_state : public driver_device { public: - kurukuru_state(const machine_config &mconfig, device_type type, std::string tag) + kurukuru_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu"), m_v9938(*this, "v9938"), diff --git a/src/mame/drivers/laser3k.cpp b/src/mame/drivers/laser3k.cpp index c39112dffa8..c8732ac239d 100644 --- a/src/mame/drivers/laser3k.cpp +++ b/src/mame/drivers/laser3k.cpp @@ -66,7 +66,7 @@ enum class laser3k_state : public driver_device { public: - laser3k_state(const machine_config &mconfig, device_type type, std::string tag) + laser3k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_ram(*this, "mainram") diff --git a/src/mame/drivers/laserbas.cpp b/src/mame/drivers/laserbas.cpp index 9522234496c..77684ccfc78 100644 --- a/src/mame/drivers/laserbas.cpp +++ b/src/mame/drivers/laserbas.cpp @@ -57,7 +57,7 @@ expected: 43 FB CC 9A D4 23 6C 01 3E <- From ROM 4 class laserbas_state : public driver_device { public: - laserbas_state(const machine_config &mconfig, device_type type, std::string tag) + laserbas_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_protram(*this, "protram"), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/lastbank.cpp b/src/mame/drivers/lastbank.cpp index 77a0d5e2746..75bafbb6d6c 100644 --- a/src/mame/drivers/lastbank.cpp +++ b/src/mame/drivers/lastbank.cpp @@ -23,7 +23,7 @@ class lastbank_state : public driver_device { public: - lastbank_state(const machine_config &mconfig, device_type type, std::string tag) + lastbank_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_vdp(*this, "tc0091lvc") diff --git a/src/mame/drivers/lastfght.cpp b/src/mame/drivers/lastfght.cpp index 1c4e59edc8b..b4d34c73d1c 100644 --- a/src/mame/drivers/lastfght.cpp +++ b/src/mame/drivers/lastfght.cpp @@ -71,7 +71,7 @@ Notes: class lastfght_state : public driver_device { public: - lastfght_state(const machine_config &mconfig, device_type type, std::string tag) + lastfght_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_screen(*this, "screen"), diff --git a/src/mame/drivers/laz_aftrshok.cpp b/src/mame/drivers/laz_aftrshok.cpp index f92210e0416..d9611e29dd6 100644 --- a/src/mame/drivers/laz_aftrshok.cpp +++ b/src/mame/drivers/laz_aftrshok.cpp @@ -36,7 +36,7 @@ https://www.youtube.com/watch?v=9DIhuOEVwf4 class aftrshok_state : public driver_device { public: - aftrshok_state(const machine_config &mconfig, device_type type, std::string tag) + aftrshok_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) // ,m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/laz_awetoss.cpp b/src/mame/drivers/laz_awetoss.cpp index cc5cf7fc40c..e0ae4697f64 100644 --- a/src/mame/drivers/laz_awetoss.cpp +++ b/src/mame/drivers/laz_awetoss.cpp @@ -16,7 +16,7 @@ Awesome tossem u21 = 27c512 class awetoss_state : public driver_device { public: - awetoss_state(const machine_config &mconfig, device_type type, std::string tag) + awetoss_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) // ,m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/laz_ribrac.cpp b/src/mame/drivers/laz_ribrac.cpp index 15cc298f44a..fde9067a7b0 100644 --- a/src/mame/drivers/laz_ribrac.cpp +++ b/src/mame/drivers/laz_ribrac.cpp @@ -20,7 +20,7 @@ http://ohwow-arcade.com/Assets/Game_Manuals/RIBBIT%20RACIN.PDF class laz_ribrac_state : public driver_device { public: - laz_ribrac_state(const machine_config &mconfig, device_type type, std::string tag) + laz_ribrac_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) // ,m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp index 05acb63d805..22000e3069a 100644 --- a/src/mame/drivers/lbeach.cpp +++ b/src/mame/drivers/lbeach.cpp @@ -33,7 +33,7 @@ TODO: class lbeach_state : public driver_device { public: - lbeach_state(const machine_config &mconfig, device_type type, std::string tag) + lbeach_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_bg_vram(*this, "bg_vram"), diff --git a/src/mame/drivers/lcmate2.cpp b/src/mame/drivers/lcmate2.cpp index a633813b5c8..01daa3ce6d4 100644 --- a/src/mame/drivers/lcmate2.cpp +++ b/src/mame/drivers/lcmate2.cpp @@ -41,7 +41,7 @@ class lcmate2_state : public driver_device { public: - lcmate2_state(const machine_config &mconfig, device_type type, std::string tag) + lcmate2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_lcdc(*this, "hd44780"), diff --git a/src/mame/drivers/leapster.cpp b/src/mame/drivers/leapster.cpp index 45709316727..7f53fea59d4 100644 --- a/src/mame/drivers/leapster.cpp +++ b/src/mame/drivers/leapster.cpp @@ -215,7 +215,7 @@ PCB - LEAPSTER-TV: class leapster_state : public driver_device { public: - leapster_state(const machine_config &mconfig, device_type type, std::string tag) + leapster_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cart(*this, "cartslot") diff --git a/src/mame/drivers/lft.cpp b/src/mame/drivers/lft.cpp index e2ee2169d4a..63479765180 100644 --- a/src/mame/drivers/lft.cpp +++ b/src/mame/drivers/lft.cpp @@ -15,7 +15,7 @@ class lft_state : public driver_device { public: - lft_state(const machine_config &mconfig, device_type type, std::string tag) + lft_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_terminal(*this, "terminal") diff --git a/src/mame/drivers/lg-dvd.cpp b/src/mame/drivers/lg-dvd.cpp index 4ea7b54c03b..0ea3c2ad14a 100644 --- a/src/mame/drivers/lg-dvd.cpp +++ b/src/mame/drivers/lg-dvd.cpp @@ -10,7 +10,7 @@ class lg_dvd_state : public driver_device { public: - lg_dvd_state(const machine_config &mconfig, device_type type, std::string tag) + lg_dvd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/lgp.cpp b/src/mame/drivers/lgp.cpp index 58f5360f721..aa1f18ff8b6 100644 --- a/src/mame/drivers/lgp.cpp +++ b/src/mame/drivers/lgp.cpp @@ -74,7 +74,7 @@ Dumping Notes: class lgp_state : public driver_device { public: - lgp_state(const machine_config &mconfig, device_type type, std::string tag) + lgp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc") , m_tile_ram(*this, "tile_ram"), diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp index d89650c3155..57c7f1df3b4 100644 --- a/src/mame/drivers/limenko.cpp +++ b/src/mame/drivers/limenko.cpp @@ -34,7 +34,7 @@ class limenko_state : public driver_device { public: - limenko_state(const machine_config &mconfig, device_type type, std::string tag) + limenko_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), diff --git a/src/mame/drivers/lindbergh.cpp b/src/mame/drivers/lindbergh.cpp index 2bdcba66559..e83f0a37d39 100644 --- a/src/mame/drivers/lindbergh.cpp +++ b/src/mame/drivers/lindbergh.cpp @@ -343,13 +343,13 @@ Sega 2005 class lindbergh_state : public driver_device { public: - lindbergh_state(const machine_config &mconfig, device_type type, std::string tag); + lindbergh_state(const machine_config &mconfig, device_type type, const char *tag); virtual void machine_start() override; virtual void machine_reset() override; }; -lindbergh_state::lindbergh_state(const machine_config &mconfig, device_type type, std::string tag) : driver_device(mconfig, type, tag) +lindbergh_state::lindbergh_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } diff --git a/src/mame/drivers/littlerb.cpp b/src/mame/drivers/littlerb.cpp index bbb9b862877..6ec40e52ff2 100644 --- a/src/mame/drivers/littlerb.cpp +++ b/src/mame/drivers/littlerb.cpp @@ -74,7 +74,7 @@ Dip sw.2 class littlerb_state : public driver_device { public: - littlerb_state(const machine_config &mconfig, device_type type, std::string tag) + littlerb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_indervid(*this, "inder_vid"), diff --git a/src/mame/drivers/lola8a.cpp b/src/mame/drivers/lola8a.cpp index 095463e2478..ae8b90b6a8e 100644 --- a/src/mame/drivers/lola8a.cpp +++ b/src/mame/drivers/lola8a.cpp @@ -33,7 +33,7 @@ class lola8a_state : public driver_device { public: - lola8a_state(const machine_config &mconfig, device_type type, std::string tag) + lola8a_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_cass(*this, "cassette"), diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp index 897312e90a7..09ba6ffeda2 100644 --- a/src/mame/drivers/looping.cpp +++ b/src/mame/drivers/looping.cpp @@ -100,7 +100,7 @@ L056-6 9A " " VLI-8-4 7A " class looping_state : public driver_device { public: - looping_state(const machine_config &mconfig, device_type type, std::string tag) + looping_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/ltcasino.cpp b/src/mame/drivers/ltcasino.cpp index 7fe1453feb8..49bc8da5301 100644 --- a/src/mame/drivers/ltcasino.cpp +++ b/src/mame/drivers/ltcasino.cpp @@ -23,7 +23,7 @@ etc. class ltcasino_state : public driver_device { public: - ltcasino_state(const machine_config &mconfig, device_type type, std::string tag) + ltcasino_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tile_num_ram(*this, "tile_nuram"), m_tile_atr_ram(*this, "tile_atr_ram"), diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp index 36f12f993e3..23749cd2313 100644 --- a/src/mame/drivers/ltd.cpp +++ b/src/mame/drivers/ltd.cpp @@ -48,7 +48,7 @@ ToDo: class ltd_state : public genpin_class { public: - ltd_state(const machine_config &mconfig, device_type type, std::string tag) + ltd_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_p_ram(*this, "nvram") diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp index 0f193fe2701..56d5747a5e7 100644 --- a/src/mame/drivers/luckgrln.cpp +++ b/src/mame/drivers/luckgrln.cpp @@ -88,7 +88,7 @@ class luckgrln_state : public driver_device { public: - luckgrln_state(const machine_config &mconfig, device_type type, std::string tag) + luckgrln_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_reel1_ram(*this, "reel1_ram"), m_reel1_attr(*this, "reel1_attr"), diff --git a/src/mame/drivers/m14.cpp b/src/mame/drivers/m14.cpp index 1858d42f501..7a81d5fab73 100644 --- a/src/mame/drivers/m14.cpp +++ b/src/mame/drivers/m14.cpp @@ -59,7 +59,7 @@ Dumped by Chackn class m14_state : public driver_device { public: - m14_state(const machine_config &mconfig, device_type type, std::string tag) + m14_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_color_ram(*this, "color_ram"), diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp index 4c16424cbbe..89e792e83ad 100644 --- a/src/mame/drivers/m20.cpp +++ b/src/mame/drivers/m20.cpp @@ -56,7 +56,7 @@ E I1 Vectored interrupt error class m20_state : public driver_device { public: - m20_state(const machine_config &mconfig, device_type type, std::string tag) + m20_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/drivers/m24.cpp b/src/mame/drivers/m24.cpp index 810b5e1d1cd..a055e1df881 100644 --- a/src/mame/drivers/m24.cpp +++ b/src/mame/drivers/m24.cpp @@ -18,7 +18,7 @@ class m24_state : public driver_device { public: - m24_state(const machine_config &mconfig, device_type type, std::string tag) : + m24_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mb(*this, "mb"), diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp index fb84e8be149..1a0f04752eb 100644 --- a/src/mame/drivers/m63.cpp +++ b/src/mame/drivers/m63.cpp @@ -126,7 +126,7 @@ Dip locations verified for: class m63_state : public driver_device { public: - m63_state(const machine_config &mconfig, device_type type, std::string tag) + m63_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_scrollram(*this, "scrollram"), diff --git a/src/mame/drivers/m6805evs.cpp b/src/mame/drivers/m6805evs.cpp index 9563eee16b1..ce7ee0a89fa 100644 --- a/src/mame/drivers/m6805evs.cpp +++ b/src/mame/drivers/m6805evs.cpp @@ -33,7 +33,7 @@ ToDo: class m6805evs_state : public driver_device { public: - m6805evs_state(const machine_config &mconfig, device_type type, std::string tag) + m6805evs_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/m79152pc.cpp b/src/mame/drivers/m79152pc.cpp index 99d8631b703..9cd9cb9acb8 100644 --- a/src/mame/drivers/m79152pc.cpp +++ b/src/mame/drivers/m79152pc.cpp @@ -16,7 +16,7 @@ class m79152pc_state : public driver_device { public: - m79152pc_state(const machine_config &mconfig, device_type type, std::string tag) + m79152pc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_videoram(*this, "p_videoram"), m_p_attributes(*this, "p_attributes"), diff --git a/src/mame/drivers/macs.cpp b/src/mame/drivers/macs.cpp index c98675f0f73..0bcdb63d3ce 100644 --- a/src/mame/drivers/macs.cpp +++ b/src/mame/drivers/macs.cpp @@ -64,7 +64,7 @@ KISEKAE -- info class macs_state : public driver_device { public: - macs_state(const machine_config &mconfig, device_type type, std::string tag) + macs_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram2(*this, "ram2"), m_maincpu(*this,"maincpu") diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp index 4457c7cc3bb..6005f807aac 100644 --- a/src/mame/drivers/magic10.cpp +++ b/src/mame/drivers/magic10.cpp @@ -91,7 +91,7 @@ class magic10_state : public driver_device { public: - magic10_state(const machine_config &mconfig, device_type type, std::string tag) + magic10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_layer0_videoram(*this, "layer0_videoram"), m_layer1_videoram(*this, "layer1_videoram"), diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp index 4ae38fbeb0e..3662ae30d99 100644 --- a/src/mame/drivers/magicard.cpp +++ b/src/mame/drivers/magicard.cpp @@ -174,7 +174,7 @@ class magicard_state : public driver_device { public: - magicard_state(const machine_config &mconfig, device_type type, std::string tag) + magicard_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_magicram(*this, "magicram"), m_magicramb(*this, "magicramb"), diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp index 99168421c71..bb82206dda1 100644 --- a/src/mame/drivers/magicfly.cpp +++ b/src/mame/drivers/magicfly.cpp @@ -448,7 +448,7 @@ class magicfly_state : public driver_device { public: - magicfly_state(const machine_config &mconfig, device_type type, std::string tag) + magicfly_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/magictg.cpp b/src/mame/drivers/magictg.cpp index 979101b9429..63b0df20394 100644 --- a/src/mame/drivers/magictg.cpp +++ b/src/mame/drivers/magictg.cpp @@ -145,7 +145,7 @@ Medium size chip with heat sink on it class magictg_state : public driver_device { public: - magictg_state(const machine_config &mconfig, device_type type, std::string tag) + magictg_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mips(*this, "mips"), m_adsp(*this, "adsp"), diff --git a/src/mame/drivers/magtouch.cpp b/src/mame/drivers/magtouch.cpp index 2c5bb94981e..1e5c06922b0 100644 --- a/src/mame/drivers/magtouch.cpp +++ b/src/mame/drivers/magtouch.cpp @@ -86,7 +86,7 @@ video card class magtouch_state : public pcat_base_state { public: - magtouch_state(const machine_config &mconfig, device_type type, std::string tag) + magtouch_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag), m_uart(*this, "ns16450_0"), m_microtouch(*this, "microtouch"){ } diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp index f10d32d5222..aed787f9459 100644 --- a/src/mame/drivers/majorpkr.cpp +++ b/src/mame/drivers/majorpkr.cpp @@ -462,7 +462,7 @@ class majorpkr_state : public driver_device { public: - majorpkr_state(const machine_config &mconfig, device_type type, std::string tag) + majorpkr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_gfxdecode(*this, "gfxdecode"), m_palette_bank(*this, "palette_bank"), diff --git a/src/mame/drivers/manohman.cpp b/src/mame/drivers/manohman.cpp index cad7e2678ff..430413996a9 100644 --- a/src/mame/drivers/manohman.cpp +++ b/src/mame/drivers/manohman.cpp @@ -142,7 +142,7 @@ class _manohman_state : public driver_device { public: - _manohman_state(const machine_config &mconfig, device_type type, std::string tag) + _manohman_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/marinedt.cpp b/src/mame/drivers/marinedt.cpp index 194180cfbcc..0f8e24b6199 100644 --- a/src/mame/drivers/marinedt.cpp +++ b/src/mame/drivers/marinedt.cpp @@ -157,7 +157,7 @@ p2 ink doesn't always light up in test mode class marinedt_state : public driver_device { public: - marinedt_state(const machine_config &mconfig, device_type type, std::string tag) + marinedt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tx_tileram(*this, "tx_tileram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/marywu.cpp b/src/mame/drivers/marywu.cpp index a15a3e7421a..d3082af2233 100644 --- a/src/mame/drivers/marywu.cpp +++ b/src/mame/drivers/marywu.cpp @@ -23,7 +23,7 @@ class marywu_state : public driver_device { public: - marywu_state(const machine_config &mconfig, device_type type, std::string tag) + marywu_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } }; diff --git a/src/mame/drivers/mastboy.cpp b/src/mame/drivers/mastboy.cpp index da377bf7ff9..5687defd7b2 100644 --- a/src/mame/drivers/mastboy.cpp +++ b/src/mame/drivers/mastboy.cpp @@ -445,7 +445,7 @@ class mastboy_state : public driver_device { public: - mastboy_state(const machine_config &mconfig, device_type type, std::string tag) + mastboy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), diff --git a/src/mame/drivers/maxaflex.cpp b/src/mame/drivers/maxaflex.cpp index 03092cbfce6..fce86aec694 100644 --- a/src/mame/drivers/maxaflex.cpp +++ b/src/mame/drivers/maxaflex.cpp @@ -27,7 +27,7 @@ class maxaflex_state : public atari_common_state { public: - maxaflex_state(const machine_config &mconfig, device_type type, std::string tag) + maxaflex_state(const machine_config &mconfig, device_type type, const char *tag) : atari_common_state(mconfig, type, tag), m_mcu(*this, "mcu"), m_speaker(*this, "speaker"), diff --git a/src/mame/drivers/maygayep.cpp b/src/mame/drivers/maygayep.cpp index 700745f9feb..fa9c5568a3d 100644 --- a/src/mame/drivers/maygayep.cpp +++ b/src/mame/drivers/maygayep.cpp @@ -40,7 +40,7 @@ class maygayep_state : public driver_device { public: - maygayep_state(const machine_config &mconfig, device_type type, std::string tag) + maygayep_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/maygaysw.cpp b/src/mame/drivers/maygaysw.cpp index 4fa6a437017..e095ac2b885 100644 --- a/src/mame/drivers/maygaysw.cpp +++ b/src/mame/drivers/maygaysw.cpp @@ -105,7 +105,7 @@ class maygayew_state : public driver_device { public: - maygayew_state(const machine_config &mconfig, device_type type, std::string tag) + maygayew_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } required_device m_maincpu; diff --git a/src/mame/drivers/maygayv1.cpp b/src/mame/drivers/maygayv1.cpp index 82977c59f45..256af7bbbee 100644 --- a/src/mame/drivers/maygayv1.cpp +++ b/src/mame/drivers/maygayv1.cpp @@ -208,7 +208,7 @@ struct i82716_t class maygayv1_state : public driver_device { public: - maygayv1_state(const machine_config &mconfig, device_type type, std::string tag) + maygayv1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/drivers/mayumi.cpp b/src/mame/drivers/mayumi.cpp index e30a9926d06..06250380cf7 100644 --- a/src/mame/drivers/mayumi.cpp +++ b/src/mame/drivers/mayumi.cpp @@ -20,7 +20,7 @@ class mayumi_state : public driver_device { public: - mayumi_state(const machine_config &mconfig, device_type type, std::string tag) + mayumi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_i8255(*this, "i8255"), diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp index 9cb895e06bd..21b1e6951ed 100644 --- a/src/mame/drivers/mazerbla.cpp +++ b/src/mame/drivers/mazerbla.cpp @@ -134,7 +134,7 @@ video z80 class mazerbla_state : public driver_device { public: - mazerbla_state(const machine_config &mconfig, device_type type, std::string tag) + mazerbla_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp index 73453410c77..edd010e9a07 100644 --- a/src/mame/drivers/mbc200.cpp +++ b/src/mame/drivers/mbc200.cpp @@ -47,7 +47,7 @@ class mbc200_state : public driver_device { public: - mbc200_state(const machine_config &mconfig, device_type type, std::string tag) + mbc200_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_crtc(*this, "crtc") diff --git a/src/mame/drivers/mbdtower.cpp b/src/mame/drivers/mbdtower.cpp index 332ec6c05e7..f20f805fb5f 100644 --- a/src/mame/drivers/mbdtower.cpp +++ b/src/mame/drivers/mbdtower.cpp @@ -28,7 +28,7 @@ class mbdtower_state : public hh_tms1k_state { public: - mbdtower_state(const machine_config &mconfig, device_type type, std::string tag) + mbdtower_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp index b77ea738e4b..5451c6ea12e 100644 --- a/src/mame/drivers/mc10.cpp +++ b/src/mame/drivers/mc10.cpp @@ -34,7 +34,7 @@ enum class mc10_state : public driver_device { public: - mc10_state(const machine_config &mconfig, device_type type, std::string tag) + mc10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mc6847(*this, "mc6847"), diff --git a/src/mame/drivers/mcb216.cpp b/src/mame/drivers/mcb216.cpp index 32a1a7870e3..05aaf8960f8 100644 --- a/src/mame/drivers/mcb216.cpp +++ b/src/mame/drivers/mcb216.cpp @@ -41,7 +41,7 @@ class mcb216_state : public driver_device { public: - mcb216_state(const machine_config &mconfig, device_type type, std::string tag) + mcb216_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/mccpm.cpp b/src/mame/drivers/mccpm.cpp index af1737a8a8a..c52f9d234cd 100644 --- a/src/mame/drivers/mccpm.cpp +++ b/src/mame/drivers/mccpm.cpp @@ -62,7 +62,7 @@ PIO A-Data 0F4h, A-Command 0F5h, B-Data 0F6h, B-Command 0F7h class mccpm_state : public driver_device { public: - mccpm_state(const machine_config &mconfig, device_type type, std::string tag) + mccpm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/meadwttl.cpp b/src/mame/drivers/meadwttl.cpp index 02b3bcf4aaa..0dffab0d0e7 100644 --- a/src/mame/drivers/meadwttl.cpp +++ b/src/mame/drivers/meadwttl.cpp @@ -41,7 +41,7 @@ class meadwttl_state : public driver_device { public: - meadwttl_state(const machine_config &mconfig, device_type type, std::string tag) + meadwttl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp index 7fdf4609fd3..1ad02146050 100644 --- a/src/mame/drivers/mediagx.cpp +++ b/src/mame/drivers/mediagx.cpp @@ -86,7 +86,7 @@ struct speedup_entry class mediagx_state : public pcat_base_state { public: - mediagx_state(const machine_config &mconfig, device_type type, std::string tag) + mediagx_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag), m_ide(*this, "ide"), m_main_ram(*this, "main_ram"), diff --git a/src/mame/drivers/megaphx.cpp b/src/mame/drivers/megaphx.cpp index 3554d672a0f..ce22404a4b6 100644 --- a/src/mame/drivers/megaphx.cpp +++ b/src/mame/drivers/megaphx.cpp @@ -72,7 +72,7 @@ class megaphx_state : public driver_device { public: - megaphx_state(const machine_config &mconfig, device_type type, std::string tag) + megaphx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mainram(*this, "mainram"), diff --git a/src/mame/drivers/megaplay.cpp b/src/mame/drivers/megaplay.cpp index a18c3d198cb..f7533ce8fd1 100644 --- a/src/mame/drivers/megaplay.cpp +++ b/src/mame/drivers/megaplay.cpp @@ -66,7 +66,7 @@ Bugs: class mplay_state : public md_base_state { public: - mplay_state(const machine_config &mconfig, device_type type, std::string tag) + mplay_state(const machine_config &mconfig, device_type type, const char *tag) : md_base_state(mconfig, type, tag), m_ic3_ram(*this, "ic3_ram"), m_vdp1(*this, "vdp1"), diff --git a/src/mame/drivers/megatech.cpp b/src/mame/drivers/megatech.cpp index b2a9b782b61..52cc1bbb3dc 100644 --- a/src/mame/drivers/megatech.cpp +++ b/src/mame/drivers/megatech.cpp @@ -88,7 +88,7 @@ Sonic Hedgehog 2 171-6215A 837-6963-62 610-0239-62 MPR class mtech_state : public md_base_state { public: - mtech_state(const machine_config &mconfig, device_type type, std::string tag) + mtech_state(const machine_config &mconfig, device_type type, const char *tag) : md_base_state(mconfig, type, tag), m_vdp1(*this, "vdp1"), m_cart1(*this, "mt_slot1"), diff --git a/src/mame/drivers/meijinsn.cpp b/src/mame/drivers/meijinsn.cpp index 11f968ded8a..3d7d386b9b5 100644 --- a/src/mame/drivers/meijinsn.cpp +++ b/src/mame/drivers/meijinsn.cpp @@ -69,7 +69,7 @@ SOFT PSG & VOICE BY M.C & S.H class meijinsn_state : public driver_device { public: - meijinsn_state(const machine_config &mconfig, device_type type, std::string tag) + meijinsn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_videoram(*this, "videoram"), diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp index 50263d9e5fb..3e79057964e 100644 --- a/src/mame/drivers/mekd2.cpp +++ b/src/mame/drivers/mekd2.cpp @@ -92,7 +92,7 @@ public: TIMER_TRACE }; - mekd2_state(const machine_config &mconfig, device_type type, std::string tag) + mekd2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pia_s(*this, "pia_s"), diff --git a/src/mame/drivers/mephisto.cpp b/src/mame/drivers/mephisto.cpp index 3b8b60f1b7a..8fedccf4cd6 100644 --- a/src/mame/drivers/mephisto.cpp +++ b/src/mame/drivers/mephisto.cpp @@ -73,7 +73,7 @@ Mephisto 4 Turbo Kit 18mhz - (mm4tk) class mephisto_state : public mboard_state { public: - mephisto_state(const machine_config &mconfig, device_type type, std::string tag) + mephisto_state(const machine_config &mconfig, device_type type, const char *tag) : mboard_state(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_beep(*this, "beeper") diff --git a/src/mame/drivers/mephistp.cpp b/src/mame/drivers/mephistp.cpp index 3802734c25c..d5e44dfc3b5 100644 --- a/src/mame/drivers/mephistp.cpp +++ b/src/mame/drivers/mephistp.cpp @@ -15,7 +15,7 @@ class mephisto_pinball_state : public driver_device { public: - mephisto_pinball_state(const machine_config &mconfig, device_type type, std::string tag) + mephisto_pinball_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp index f013bb01839..9f5ac8f6190 100644 --- a/src/mame/drivers/merit.cpp +++ b/src/mame/drivers/merit.cpp @@ -87,7 +87,7 @@ Merit Riviera Notes - There are several known versions: class merit_state : public driver_device { public: - merit_state(const machine_config &mconfig, device_type type, std::string tag) + merit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram_attr(*this, "raattr"), m_ram_video(*this, "ravideo"), diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp index 105de38a065..fad7bfa2f7f 100644 --- a/src/mame/drivers/meritm.cpp +++ b/src/mame/drivers/meritm.cpp @@ -187,7 +187,7 @@ Not all regional versions are available for each Megatouch series class meritm_state : public driver_device { public: - meritm_state(const machine_config &mconfig, device_type type, std::string tag) + meritm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_z80pio_0(*this, "z80pio_0"), m_z80pio_1(*this, "z80pio_1"), diff --git a/src/mame/drivers/mes.cpp b/src/mame/drivers/mes.cpp index dfb74571e23..00091ddf3a4 100644 --- a/src/mame/drivers/mes.cpp +++ b/src/mame/drivers/mes.cpp @@ -15,7 +15,7 @@ class mes_state : public driver_device { public: - mes_state(const machine_config &mconfig, device_type type, std::string tag) + mes_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_p_videoram(*this, "p_videoram"){ } diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index fd07f2bc55f..f7006122d15 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -1714,7 +1714,7 @@ ADDRESS_MAP_END class puzzlet_io_device : public device_t { public: - puzzlet_io_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + puzzlet_io_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER( ce_w ); DECLARE_WRITE_LINE_MEMBER( clk_w ); @@ -1736,7 +1736,7 @@ private: const device_type PUZZLET_IO = &device_creator; -puzzlet_io_device::puzzlet_io_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +puzzlet_io_device::puzzlet_io_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PUZZLET_IO, "Puzzlet Coin/Start I/O", tag, owner, clock, "puzzlet_io", __FILE__), data_cb(*this), port(*this, ":IN0") diff --git a/src/mame/drivers/meyc8080.cpp b/src/mame/drivers/meyc8080.cpp index bb8aa5fe49d..abd0cb8f070 100644 --- a/src/mame/drivers/meyc8080.cpp +++ b/src/mame/drivers/meyc8080.cpp @@ -68,7 +68,7 @@ class meyc8080_state : public driver_device { public: - meyc8080_state(const machine_config &mconfig, device_type type, std::string tag) + meyc8080_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram_0(*this, "vram0"), m_videoram_1(*this, "vram1"), diff --git a/src/mame/drivers/meyc8088.cpp b/src/mame/drivers/meyc8088.cpp index 5511c6591f8..7e8edcf4169 100644 --- a/src/mame/drivers/meyc8088.cpp +++ b/src/mame/drivers/meyc8088.cpp @@ -38,7 +38,7 @@ class meyc8088_state : public driver_device { public: - meyc8088_state(const machine_config &mconfig, device_type type, std::string tag) + meyc8088_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_vram(*this, "vram"), diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp index 6e32014a937..88e0656cdf2 100644 --- a/src/mame/drivers/mgames.cpp +++ b/src/mame/drivers/mgames.cpp @@ -239,7 +239,7 @@ class mgames_state : public driver_device { public: - mgames_state(const machine_config &mconfig, device_type type, std::string tag) + mgames_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video(*this, "video"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp index 7d9cc277815..27033c0d759 100644 --- a/src/mame/drivers/mgavegas.cpp +++ b/src/mame/drivers/mgavegas.cpp @@ -48,7 +48,7 @@ Ver. 2.2 should exist class mgavegas_state : public driver_device { public: - mgavegas_state(const machine_config &mconfig, device_type type, std::string tag) + mgavegas_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ay(*this, "aysnd"), diff --git a/src/mame/drivers/mgolf.cpp b/src/mame/drivers/mgolf.cpp index ab052eaae37..af8917139df 100644 --- a/src/mame/drivers/mgolf.cpp +++ b/src/mame/drivers/mgolf.cpp @@ -17,7 +17,7 @@ public: TIMER_INTERRUPT }; - mgolf_state(const machine_config &mconfig, device_type type, std::string tag) + mgolf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/mice.cpp b/src/mame/drivers/mice.cpp index ab2ded26c47..35b9d870589 100644 --- a/src/mame/drivers/mice.cpp +++ b/src/mame/drivers/mice.cpp @@ -25,7 +25,7 @@ The connection to the outside world is via RS232 to a terminal. class mice_state : public driver_device { public: - mice_state(const machine_config &mconfig, device_type type, std::string tag) + mice_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp index 43b99e10fe0..0dbbbe51938 100644 --- a/src/mame/drivers/micral.cpp +++ b/src/mame/drivers/micral.cpp @@ -30,7 +30,7 @@ class micral_state : public driver_device { public: - micral_state(const machine_config &mconfig, device_type type, std::string tag) + micral_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_beep(*this, "beeper") diff --git a/src/mame/drivers/microdec.cpp b/src/mame/drivers/microdec.cpp index f73bc34a6e9..c52885336e0 100644 --- a/src/mame/drivers/microdec.cpp +++ b/src/mame/drivers/microdec.cpp @@ -18,7 +18,7 @@ class microdec_state : public driver_device { public: - microdec_state(const machine_config &mconfig, device_type type, std::string tag) + microdec_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_terminal(*this, TERMINAL_TAG), m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/microkit.cpp b/src/mame/drivers/microkit.cpp index d48cca354ad..caf2207a9d2 100644 --- a/src/mame/drivers/microkit.cpp +++ b/src/mame/drivers/microkit.cpp @@ -42,7 +42,7 @@ class microkit_state : public driver_device { public: - microkit_state(const machine_config &mconfig, device_type type, std::string tag) + microkit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_rs232(*this, "rs232") diff --git a/src/mame/drivers/micropin.cpp b/src/mame/drivers/micropin.cpp index bdf802b28e2..7b05d407b3e 100644 --- a/src/mame/drivers/micropin.cpp +++ b/src/mame/drivers/micropin.cpp @@ -31,7 +31,7 @@ ToDo: class micropin_state : public genpin_class { public: - micropin_state(const machine_config &mconfig, device_type type, std::string tag) + micropin_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_v1cpu(*this, "v1cpu") , m_v2cpu(*this, "v2cpu") diff --git a/src/mame/drivers/microvsn.cpp b/src/mame/drivers/microvsn.cpp index 6042f0cbcce..b7ff8fba4c8 100644 --- a/src/mame/drivers/microvsn.cpp +++ b/src/mame/drivers/microvsn.cpp @@ -31,7 +31,7 @@ of the games were clocked at around 500KHz, 550KHz, or 300KHz. class microvision_state : public driver_device { public: - microvision_state(const machine_config &mconfig, device_type type, std::string tag) + microvision_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_dac( *this, "dac" ), m_i8021( *this, "maincpu1" ), diff --git a/src/mame/drivers/midas.cpp b/src/mame/drivers/midas.cpp index ed633373bd7..8fbe0890bef 100644 --- a/src/mame/drivers/midas.cpp +++ b/src/mame/drivers/midas.cpp @@ -61,7 +61,7 @@ class midas_state : public driver_device { public: - midas_state(const machine_config &mconfig, device_type type, std::string tag) + midas_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), diff --git a/src/mame/drivers/midqslvr.cpp b/src/mame/drivers/midqslvr.cpp index 1c61557ac14..35dc9607862 100644 --- a/src/mame/drivers/midqslvr.cpp +++ b/src/mame/drivers/midqslvr.cpp @@ -35,7 +35,7 @@ class midqslvr_state : public pcat_base_state { public: - midqslvr_state(const machine_config &mconfig, device_type type, std::string tag) + midqslvr_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp index bfcc190a369..fa92fd38d6c 100644 --- a/src/mame/drivers/mikrosha.cpp +++ b/src/mame/drivers/mikrosha.cpp @@ -22,7 +22,7 @@ class mikrosha_state : public radio86_state { public: - mikrosha_state(const machine_config &mconfig, device_type type, std::string tag) + mikrosha_state(const machine_config &mconfig, device_type type, const char *tag) : radio86_state(mconfig, type, tag), m_cart(*this, "cartslot") { } diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp index 89dac135155..04aa16514a6 100644 --- a/src/mame/drivers/mil4000.cpp +++ b/src/mame/drivers/mil4000.cpp @@ -123,7 +123,7 @@ class mil4000_state : public driver_device { public: - mil4000_state(const machine_config &mconfig, device_type type, std::string tag) + mil4000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sc0_vram(*this, "sc0_vram"), m_sc1_vram(*this, "sc1_vram"), diff --git a/src/mame/drivers/mini2440.cpp b/src/mame/drivers/mini2440.cpp index ae57ff6866a..9a42f2951ec 100644 --- a/src/mame/drivers/mini2440.cpp +++ b/src/mame/drivers/mini2440.cpp @@ -18,7 +18,7 @@ class mini2440_state : public driver_device { public: - mini2440_state(const machine_config &mconfig, device_type type, std::string tag) + mini2440_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_s3c2440(*this, "s3c2440"), diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp index 99029804300..461af99cb77 100644 --- a/src/mame/drivers/miniboy7.cpp +++ b/src/mame/drivers/miniboy7.cpp @@ -147,7 +147,7 @@ class miniboy7_state : public driver_device { public: - miniboy7_state(const machine_config &mconfig, device_type type, std::string tag) + miniboy7_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram_a(*this, "videoram_a"), m_colorram_a(*this, "colorram_a"), diff --git a/src/mame/drivers/minicom.cpp b/src/mame/drivers/minicom.cpp index 7f2f599a651..56a1ca2d0c9 100644 --- a/src/mame/drivers/minicom.cpp +++ b/src/mame/drivers/minicom.cpp @@ -47,7 +47,7 @@ Segment data is sent to each 14seg digit by first writing half of the data to po class minicom_state : public driver_device { public: - minicom_state(const machine_config &mconfig, device_type type, std::string tag) + minicom_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/minivadr.cpp b/src/mame/drivers/minivadr.cpp index 0ab4dbf5d45..6d847f5468f 100644 --- a/src/mame/drivers/minivadr.cpp +++ b/src/mame/drivers/minivadr.cpp @@ -41,7 +41,7 @@ Notes: (all ICs shown) class minivadr_state : public driver_device { public: - minivadr_state(const machine_config &mconfig, device_type type, std::string tag) + minivadr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp index bcec2f64464..29b275a7965 100644 --- a/src/mame/drivers/mirage.cpp +++ b/src/mame/drivers/mirage.cpp @@ -46,7 +46,7 @@ MR_01-.3A [a0b758aa] class miragemi_state : public driver_device { public: - miragemi_state(const machine_config &mconfig, device_type type, std::string tag) + miragemi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_deco_tilegen1(*this, "tilegen1"), diff --git a/src/mame/drivers/mirax.cpp b/src/mame/drivers/mirax.cpp index 7536a133ae3..ec3bdaf751c 100644 --- a/src/mame/drivers/mirax.cpp +++ b/src/mame/drivers/mirax.cpp @@ -108,7 +108,7 @@ Stephh's notes (based on the games Z80 code and some tests) : class mirax_state : public driver_device { public: - mirax_state(const machine_config &mconfig, device_type type, std::string tag) + mirax_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/missb2.cpp b/src/mame/drivers/missb2.cpp index 2d39b638dbf..85475271f05 100644 --- a/src/mame/drivers/missb2.cpp +++ b/src/mame/drivers/missb2.cpp @@ -27,7 +27,7 @@ OKI M6295 sound ROM dump is bad. class missb2_state : public bublbobl_state { public: - missb2_state(const machine_config &mconfig, device_type type, std::string tag) + missb2_state(const machine_config &mconfig, device_type type, const char *tag) : bublbobl_state(mconfig, type, tag), m_bgvram(*this, "bgvram"), m_bgpalette(*this, "bgpalette") diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp index c4723204bfe..bedc5cecea2 100644 --- a/src/mame/drivers/missile.cpp +++ b/src/mame/drivers/missile.cpp @@ -357,7 +357,7 @@ Super Missile Attack Board Layout class missile_state : public driver_device { public: - missile_state(const machine_config &mconfig, device_type type, std::string tag) + missile_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_videoram(*this, "videoram"), diff --git a/src/mame/drivers/mits680b.cpp b/src/mame/drivers/mits680b.cpp index 1367f7992d4..d42017d240e 100644 --- a/src/mame/drivers/mits680b.cpp +++ b/src/mame/drivers/mits680b.cpp @@ -32,7 +32,7 @@ ToDo: class mits680b_state : public driver_device { public: - mits680b_state(const machine_config &mconfig, device_type type, std::string tag) + mits680b_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/mjsister.cpp b/src/mame/drivers/mjsister.cpp index 4c532fd9146..eb171d95a35 100644 --- a/src/mame/drivers/mjsister.cpp +++ b/src/mame/drivers/mjsister.cpp @@ -24,7 +24,7 @@ public: TIMER_DAC }; - mjsister_state(const machine_config &mconfig, device_type type, std::string tag) + mjsister_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette"), diff --git a/src/mame/drivers/mk1.cpp b/src/mame/drivers/mk1.cpp index a5a78326be5..ef66e66594c 100644 --- a/src/mame/drivers/mk1.cpp +++ b/src/mame/drivers/mk1.cpp @@ -50,7 +50,7 @@ TODO: class mk1_state : public driver_device { public: - mk1_state(const machine_config &mconfig, device_type type, std::string tag) + mk1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp index 4d61f3aca3d..6342689adc6 100644 --- a/src/mame/drivers/mk14.cpp +++ b/src/mame/drivers/mk14.cpp @@ -17,7 +17,7 @@ class mk14_state : public driver_device { public: - mk14_state(const machine_config &mconfig, device_type type, std::string tag) + mk14_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/mk2.cpp b/src/mame/drivers/mk2.cpp index 2e3439c7555..34c504a4d3e 100644 --- a/src/mame/drivers/mk2.cpp +++ b/src/mame/drivers/mk2.cpp @@ -59,7 +59,7 @@ Usage: class mk2_state : public driver_device { public: - mk2_state(const machine_config &mconfig, device_type type, std::string tag) + mk2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/drivers/mk85.cpp b/src/mame/drivers/mk85.cpp index e8193717cc4..5ab8197a55a 100644 --- a/src/mame/drivers/mk85.cpp +++ b/src/mame/drivers/mk85.cpp @@ -26,7 +26,7 @@ Models: class mk85_state : public driver_device { public: - mk85_state(const machine_config &mconfig, device_type type, std::string tag) + mk85_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/mk90.cpp b/src/mame/drivers/mk90.cpp index 146f8b7209c..ce3ffa2abd2 100644 --- a/src/mame/drivers/mk90.cpp +++ b/src/mame/drivers/mk90.cpp @@ -23,7 +23,7 @@ months for an average citizen. class mk90_state : public driver_device { public: - mk90_state(const machine_config &mconfig, device_type type, std::string tag) + mk90_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp index b7d0e0a1a93..b3ebef1b5cd 100644 --- a/src/mame/drivers/mkit09.cpp +++ b/src/mame/drivers/mkit09.cpp @@ -42,7 +42,7 @@ Test Paste: class mkit09_state : public driver_device { public: - mkit09_state(const machine_config &mconfig, device_type type, std::string tag) + mkit09_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_pia(*this, "pia") , m_cass(*this, "cassette") diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp index ae000606d95..a4cb4078ec7 100644 --- a/src/mame/drivers/mlanding.cpp +++ b/src/mame/drivers/mlanding.cpp @@ -71,7 +71,7 @@ public: static const UINT32 c_dma_bank_words = 0x2000; - mlanding_state(const machine_config &mconfig, device_type type, std::string tag) + mlanding_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), diff --git a/src/mame/drivers/mmagic.cpp b/src/mame/drivers/mmagic.cpp index be49b99c8f0..4c21963b0f4 100644 --- a/src/mame/drivers/mmagic.cpp +++ b/src/mame/drivers/mmagic.cpp @@ -65,7 +65,7 @@ class mmagic_state : public driver_device { public: - mmagic_state(const machine_config &mconfig, device_type type, std::string tag) + mmagic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_screen(*this, "screen"), diff --git a/src/mame/drivers/mmd1.cpp b/src/mame/drivers/mmd1.cpp index 86789a9f7ff..690a58e2568 100644 --- a/src/mame/drivers/mmd1.cpp +++ b/src/mame/drivers/mmd1.cpp @@ -154,7 +154,7 @@ ToDo class mmd1_state : public driver_device { public: - mmd1_state(const machine_config &mconfig, device_type type, std::string tag) + mmd1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/mmm.cpp b/src/mame/drivers/mmm.cpp index 9a038e17503..1f567dced93 100644 --- a/src/mame/drivers/mmm.cpp +++ b/src/mame/drivers/mmm.cpp @@ -13,7 +13,7 @@ class mmm_state : public driver_device { public: - mmm_state(const machine_config &mconfig, device_type type, std::string tag) + mmm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp index 7a8651f5cc7..c9042234b6b 100644 --- a/src/mame/drivers/mmodular.cpp +++ b/src/mame/drivers/mmodular.cpp @@ -129,7 +129,7 @@ UINT8 lcd32_char; class polgar_state : public mboard_state { public: - polgar_state(const machine_config &mconfig, device_type type, std::string tag) + polgar_state(const machine_config &mconfig, device_type type, const char *tag) : mboard_state(mconfig, type, tag), m_lcdc(*this, "hd44780"), m_beeper(*this, "beeper") diff --git a/src/mame/drivers/mod8.cpp b/src/mame/drivers/mod8.cpp index 797d524512c..f3f55d7549e 100644 --- a/src/mame/drivers/mod8.cpp +++ b/src/mame/drivers/mod8.cpp @@ -61,7 +61,7 @@ While in 'space' mode, press a letter to increment CLP, or shift-delete class mod8_state : public driver_device { public: - mod8_state(const machine_config &mconfig, device_type type, std::string tag) + mod8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_teleprinter(*this, TELEPRINTER_TAG) , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp index 14348c194f5..23eabd69770 100644 --- a/src/mame/drivers/modellot.cpp +++ b/src/mame/drivers/modellot.cpp @@ -25,7 +25,7 @@ class modellot_state : public driver_device { public: - modellot_state(const machine_config &mconfig, device_type type, std::string tag) + modellot_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_videoram(*this, "videoram"), m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/mogura.cpp b/src/mame/drivers/mogura.cpp index ba4fd973acf..9310a5aee94 100644 --- a/src/mame/drivers/mogura.cpp +++ b/src/mame/drivers/mogura.cpp @@ -10,7 +10,7 @@ class mogura_state : public driver_device { public: - mogura_state(const machine_config &mconfig, device_type type, std::string tag) + mogura_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac1(*this, "dac1"), diff --git a/src/mame/drivers/mole.cpp b/src/mame/drivers/mole.cpp index beb92a05f53..f106a68142e 100644 --- a/src/mame/drivers/mole.cpp +++ b/src/mame/drivers/mole.cpp @@ -57,7 +57,7 @@ class mole_state : public driver_device { public: - mole_state(const machine_config &mconfig, device_type type, std::string tag) + mole_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode") diff --git a/src/mame/drivers/molecular.cpp b/src/mame/drivers/molecular.cpp index 1c063b40a86..8915163ea43 100644 --- a/src/mame/drivers/molecular.cpp +++ b/src/mame/drivers/molecular.cpp @@ -59,7 +59,7 @@ TODO: class molecula_state : public driver_device { public: - molecula_state(const machine_config &mconfig, device_type type, std::string tag) + molecula_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_filecpu(*this, "filecpu") { } diff --git a/src/mame/drivers/monacogp.cpp b/src/mame/drivers/monacogp.cpp index 1b42e71b7b6..d1f920be4b7 100644 --- a/src/mame/drivers/monacogp.cpp +++ b/src/mame/drivers/monacogp.cpp @@ -130,7 +130,7 @@ class monacogp_state : public driver_device { public: - monacogp_state(const machine_config &mconfig, device_type type, std::string tag) + monacogp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/monty.cpp b/src/mame/drivers/monty.cpp index 132b249801d..0167938503b 100644 --- a/src/mame/drivers/monty.cpp +++ b/src/mame/drivers/monty.cpp @@ -37,7 +37,7 @@ class monty_state : public driver_device { public: - monty_state(const machine_config &mconfig, device_type type, std::string tag) + monty_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_speaker(*this, "speaker") diff --git a/src/mame/drivers/monzagp.cpp b/src/mame/drivers/monzagp.cpp index 9f41960f8e5..6f08b216b86 100644 --- a/src/mame/drivers/monzagp.cpp +++ b/src/mame/drivers/monzagp.cpp @@ -39,7 +39,7 @@ Lower board (MGP_01): class monzagp_state : public driver_device { public: - monzagp_state(const machine_config &mconfig, device_type type, std::string tag) + monzagp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/mps1230.cpp b/src/mame/drivers/mps1230.cpp index 192445e7cde..d12a09470cf 100644 --- a/src/mame/drivers/mps1230.cpp +++ b/src/mame/drivers/mps1230.cpp @@ -86,7 +86,7 @@ Notes: (all IC's shown) class mps1230_state : public driver_device { public: - mps1230_state(const machine_config &mconfig, device_type type, std::string tag) + mps1230_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, CPU_TAG) { } diff --git a/src/mame/drivers/mpu12wbk.cpp b/src/mame/drivers/mpu12wbk.cpp index d5195e0699c..685aa88e1e1 100644 --- a/src/mame/drivers/mpu12wbk.cpp +++ b/src/mame/drivers/mpu12wbk.cpp @@ -218,7 +218,7 @@ class mpu12wbk_state : public driver_device { public: - mpu12wbk_state(const machine_config &mconfig, device_type type, std::string tag) + mpu12wbk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/mpu2.cpp b/src/mame/drivers/mpu2.cpp index 5e753fdef1a..1ded190b0b2 100644 --- a/src/mame/drivers/mpu2.cpp +++ b/src/mame/drivers/mpu2.cpp @@ -44,7 +44,7 @@ class mpu2_state : public driver_device { public: - mpu2_state(const machine_config &mconfig, device_type type, std::string tag) + mpu2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp index 48da55a6848..0ebb1827f59 100644 --- a/src/mame/drivers/mpu3.cpp +++ b/src/mame/drivers/mpu3.cpp @@ -131,7 +131,7 @@ struct mpu3_chr_table class mpu3_state : public driver_device { public: - mpu3_state(const machine_config &mconfig, device_type type, std::string tag) + mpu3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_reel0(*this, "reel0"), diff --git a/src/mame/drivers/mpu4dealem.cpp b/src/mame/drivers/mpu4dealem.cpp index 1076221f43c..c9d3dfcdb15 100644 --- a/src/mame/drivers/mpu4dealem.cpp +++ b/src/mame/drivers/mpu4dealem.cpp @@ -22,7 +22,7 @@ the Deal 'Em board design, rather than the one they ultimately used, suggesting class mpu4dealem_state : public mpu4_state { public: - mpu4dealem_state(const machine_config &mconfig, device_type type, std::string tag) + mpu4dealem_state(const machine_config &mconfig, device_type type, const char *tag) : mpu4_state(mconfig, type, tag), m_dealem_videoram(*this, "dealem_videoram"), m_gfxdecode(*this, "gfxdecode") diff --git a/src/mame/drivers/mpu4plasma.cpp b/src/mame/drivers/mpu4plasma.cpp index 5a136c65b3b..d0a87ae6c4a 100644 --- a/src/mame/drivers/mpu4plasma.cpp +++ b/src/mame/drivers/mpu4plasma.cpp @@ -14,7 +14,7 @@ class mpu4plasma_state : public mpu4_state { public: - mpu4plasma_state(const machine_config &mconfig, device_type type, std::string tag) + mpu4plasma_state(const machine_config &mconfig, device_type type, const char *tag) : mpu4_state(mconfig, type, tag), m_plasmaram(*this, "plasmaram") { diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp index 2e3fd2c0151..46cd8bb571c 100644 --- a/src/mame/drivers/mpu4vid.cpp +++ b/src/mame/drivers/mpu4vid.cpp @@ -219,7 +219,7 @@ struct bt471_t class mpu4vid_state : public mpu4_state { public: - mpu4vid_state(const machine_config &mconfig, device_type type, std::string tag) + mpu4vid_state(const machine_config &mconfig, device_type type, const char *tag) : mpu4_state(mconfig, type, tag), m_videocpu(*this, "video"), m_scn2674(*this, "scn2674_vid"), diff --git a/src/mame/drivers/mpu5hw.cpp b/src/mame/drivers/mpu5hw.cpp index 7e1ffec4c63..9062fc43c81 100644 --- a/src/mame/drivers/mpu5hw.cpp +++ b/src/mame/drivers/mpu5hw.cpp @@ -52,7 +52,7 @@ class mpu5_state : public driver_device { public: - mpu5_state(const machine_config &mconfig, device_type type, std::string tag) + mpu5_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/mquake.cpp b/src/mame/drivers/mquake.cpp index 6c0bde2b788..77c38c9db88 100644 --- a/src/mame/drivers/mquake.cpp +++ b/src/mame/drivers/mquake.cpp @@ -45,7 +45,7 @@ class mquake_state : public amiga_state { public: - mquake_state(const machine_config &mconfig, device_type type, std::string tag) + mquake_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_es5503(*this, "es5503"), m_es5503_rom(*this, "es5503") diff --git a/src/mame/drivers/mrgame.cpp b/src/mame/drivers/mrgame.cpp index 7ab79b43dfb..beb0a9e0bca 100644 --- a/src/mame/drivers/mrgame.cpp +++ b/src/mame/drivers/mrgame.cpp @@ -44,7 +44,7 @@ ToDo: class mrgame_state : public driver_device { public: - mrgame_state(const machine_config &mconfig, device_type type, std::string tag) + mrgame_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_p_videoram(*this, "videoram") diff --git a/src/mame/drivers/ms0515.cpp b/src/mame/drivers/ms0515.cpp index ef3eff6ed0c..89e38f4b16f 100644 --- a/src/mame/drivers/ms0515.cpp +++ b/src/mame/drivers/ms0515.cpp @@ -17,7 +17,7 @@ class ms0515_state : public driver_device { public: - ms0515_state(const machine_config &mconfig, device_type type, std::string tag) + ms0515_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/drivers/ms9540.cpp b/src/mame/drivers/ms9540.cpp index f530d6a94dd..2be054eeb5f 100644 --- a/src/mame/drivers/ms9540.cpp +++ b/src/mame/drivers/ms9540.cpp @@ -32,7 +32,7 @@ Chips: class ms9540_state : public driver_device { public: - ms9540_state(const machine_config &mconfig, device_type type, std::string tag) + ms9540_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_base(*this, "rambase"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp index 59c605d53fe..f1aa281aeb2 100644 --- a/src/mame/drivers/mstation.cpp +++ b/src/mame/drivers/mstation.cpp @@ -36,7 +36,7 @@ class mstation_state : public driver_device { public: - mstation_state(const machine_config &mconfig, device_type type, std::string tag) + mstation_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG) diff --git a/src/mame/drivers/mt735.cpp b/src/mame/drivers/mt735.cpp index 45fb5798920..4e642a4fa31 100644 --- a/src/mame/drivers/mt735.cpp +++ b/src/mame/drivers/mt735.cpp @@ -9,7 +9,7 @@ class mt735_state : public driver_device { public: - mt735_state(const machine_config &mconfig, device_type type, std::string tag); + mt735_state(const machine_config &mconfig, device_type type, const char *tag); required_device m_cpu; @@ -20,7 +20,7 @@ public: virtual void machine_reset() override; }; -mt735_state::mt735_state(const machine_config &mconfig, device_type type, std::string tag) : +mt735_state::mt735_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cpu(*this, "maincpu") { diff --git a/src/mame/drivers/multi16.cpp b/src/mame/drivers/multi16.cpp index 7e6f7da3ba0..0852c166970 100644 --- a/src/mame/drivers/multi16.cpp +++ b/src/mame/drivers/multi16.cpp @@ -15,7 +15,7 @@ class multi16_state : public driver_device { public: - multi16_state(const machine_config &mconfig, device_type type, std::string tag) + multi16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pic(*this, "pic8259"), diff --git a/src/mame/drivers/multi8.cpp b/src/mame/drivers/multi8.cpp index d9a46826565..c9509f66e8a 100644 --- a/src/mame/drivers/multi8.cpp +++ b/src/mame/drivers/multi8.cpp @@ -25,7 +25,7 @@ class multi8_state : public driver_device { public: - multi8_state(const machine_config &mconfig, device_type type, std::string tag) + multi8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppi(*this, "ppi8255_0"), diff --git a/src/mame/drivers/multigam.cpp b/src/mame/drivers/multigam.cpp index c2920515c4c..2a1c7772b6c 100644 --- a/src/mame/drivers/multigam.cpp +++ b/src/mame/drivers/multigam.cpp @@ -115,7 +115,7 @@ Eproms are 27512,27010,274001 class multigam_state : public driver_device { public: - multigam_state(const machine_config &mconfig, device_type type, std::string tag) + multigam_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppu(*this, "ppu") { } diff --git a/src/mame/drivers/murogem.cpp b/src/mame/drivers/murogem.cpp index a52618a8ace..3df8476b7d4 100644 --- a/src/mame/drivers/murogem.cpp +++ b/src/mame/drivers/murogem.cpp @@ -115,7 +115,7 @@ val (hex): 27 20 22 04 26 00 20 20 00 07 00 00 80 00 00 00 ns class murogem_state : public driver_device { public: - murogem_state(const machine_config &mconfig, device_type type, std::string tag) + murogem_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), diff --git a/src/mame/drivers/murogmbl.cpp b/src/mame/drivers/murogmbl.cpp index 2862e276962..245f6c3953b 100644 --- a/src/mame/drivers/murogmbl.cpp +++ b/src/mame/drivers/murogmbl.cpp @@ -43,7 +43,7 @@ Dumped: 06/04/2009 f205v class murogmbl_state : public driver_device { public: - murogmbl_state(const machine_config &mconfig, device_type type, std::string tag) + murogmbl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/mvme350.cpp b/src/mame/drivers/mvme350.cpp index a154b5b22db..64f66ee8418 100644 --- a/src/mame/drivers/mvme350.cpp +++ b/src/mame/drivers/mvme350.cpp @@ -148,7 +148,7 @@ class mvme350_state : public driver_device { public: -mvme350_state(const machine_config &mconfig, device_type type, std::string tag) : +mvme350_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device (mconfig, type, tag), m_maincpu (*this, "maincpu"), m_pit(*this, "pit") diff --git a/src/mame/drivers/mw18w.cpp b/src/mame/drivers/mw18w.cpp index 8e258cac5a2..1b49a28f3f6 100644 --- a/src/mame/drivers/mw18w.cpp +++ b/src/mame/drivers/mw18w.cpp @@ -25,7 +25,7 @@ To diagnose game, turn on service mode and: class mw18w_state : public driver_device { public: - mw18w_state(const machine_config &mconfig, device_type type, std::string tag) + mw18w_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/mwarr.cpp b/src/mame/drivers/mwarr.cpp index 726a1963338..2cfd7ca858c 100644 --- a/src/mame/drivers/mwarr.cpp +++ b/src/mame/drivers/mwarr.cpp @@ -51,7 +51,7 @@ Notes: class mwarr_state : public driver_device { public: - mwarr_state(const machine_config &mconfig, device_type type, std::string tag) + mwarr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_videoram(*this, "bg_videoram"), m_mlow_videoram(*this, "mlow_videoram"), diff --git a/src/mame/drivers/mwsub.cpp b/src/mame/drivers/mwsub.cpp index 8505e2e9b6d..348572cda82 100644 --- a/src/mame/drivers/mwsub.cpp +++ b/src/mame/drivers/mwsub.cpp @@ -20,7 +20,7 @@ TODO: class submar_state : public driver_device { public: - submar_state(const machine_config &mconfig, device_type type, std::string tag) + submar_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp index e51199b4ba2..add947cbcdd 100644 --- a/src/mame/drivers/mx2178.cpp +++ b/src/mame/drivers/mx2178.cpp @@ -31,7 +31,7 @@ class mx2178_state : public driver_device { public: - mx2178_state(const machine_config &mconfig, device_type type, std::string tag) : + mx2178_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp index 0f6a262f488..2eb5cba1dc7 100644 --- a/src/mame/drivers/myb3k.cpp +++ b/src/mame/drivers/myb3k.cpp @@ -20,7 +20,7 @@ class myb3k_state : public driver_device { public: - myb3k_state(const machine_config &mconfig, device_type type, std::string tag) + myb3k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_fdc(*this, "fdc"), diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp index 3f097e39d9b..efea8bc5bed 100644 --- a/src/mame/drivers/mycom.cpp +++ b/src/mame/drivers/mycom.cpp @@ -62,7 +62,7 @@ class mycom_state : public driver_device { public: - mycom_state(const machine_config &mconfig, device_type type, std::string tag) + mycom_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_ppi0(*this, "ppi8255_0") diff --git a/src/mame/drivers/myvision.cpp b/src/mame/drivers/myvision.cpp index 9ae3d75773e..e5c32a4c158 100644 --- a/src/mame/drivers/myvision.cpp +++ b/src/mame/drivers/myvision.cpp @@ -34,7 +34,7 @@ class myvision_state : public driver_device { public: - myvision_state(const machine_config &mconfig, device_type type, std::string tag) + myvision_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_cart(*this, "cartslot") diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp index 76cb0c1ec3e..a1fb10dc59f 100644 --- a/src/mame/drivers/mz2000.cpp +++ b/src/mame/drivers/mz2000.cpp @@ -38,7 +38,7 @@ class mz2000_state : public driver_device { public: - mz2000_state(const machine_config &mconfig, device_type type, std::string tag) + mz2000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cass(*this, "cassette"), m_floppy(nullptr), diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp index f0bba0394fa..2f1461c2197 100644 --- a/src/mame/drivers/mz2500.cpp +++ b/src/mame/drivers/mz2500.cpp @@ -64,7 +64,7 @@ class mz2500_state : public driver_device { public: - mz2500_state(const machine_config &mconfig, device_type type, std::string tag) + mz2500_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_rtc(*this, RP5C15_TAG), diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp index 777193a5aa9..3ee4f6a785f 100644 --- a/src/mame/drivers/mz3500.cpp +++ b/src/mame/drivers/mz3500.cpp @@ -41,7 +41,7 @@ class mz3500_state : public driver_device { public: - mz3500_state(const machine_config &mconfig, device_type type, std::string tag) + mz3500_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_master(*this, "master"), m_slave(*this, "slave"), diff --git a/src/mame/drivers/mz6500.cpp b/src/mame/drivers/mz6500.cpp index 13198693213..d513f30a33e 100644 --- a/src/mame/drivers/mz6500.cpp +++ b/src/mame/drivers/mz6500.cpp @@ -16,7 +16,7 @@ class mz6500_state : public driver_device { public: - mz6500_state(const machine_config &mconfig, device_type type, std::string tag) + mz6500_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_hgdc(*this, "upd7220"), m_fdc(*this, "upd765"), diff --git a/src/mame/drivers/mzr8105.cpp b/src/mame/drivers/mzr8105.cpp index b9aefcf580c..ea2049ed8cf 100644 --- a/src/mame/drivers/mzr8105.cpp +++ b/src/mame/drivers/mzr8105.cpp @@ -183,7 +183,7 @@ class mzr8105_state : public driver_device { public: -mzr8105_state(const machine_config &mconfig, device_type type, std::string tag) : +mzr8105_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device (mconfig, type, tag), m_maincpu (*this, "maincpu") ,m_updterm(*this, "upd") diff --git a/src/mame/drivers/n64.cpp b/src/mame/drivers/n64.cpp index 74d23c96b71..1d4e47a4273 100644 --- a/src/mame/drivers/n64.cpp +++ b/src/mame/drivers/n64.cpp @@ -22,7 +22,7 @@ class n64_mess_state : public n64_state { public: - n64_mess_state(const machine_config &mconfig, device_type type, std::string tag) + n64_mess_state(const machine_config &mconfig, device_type type, const char *tag) : n64_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/nakajies.cpp b/src/mame/drivers/nakajies.cpp index 56e6a8940a6..aeb758e17ee 100644 --- a/src/mame/drivers/nakajies.cpp +++ b/src/mame/drivers/nakajies.cpp @@ -284,7 +284,7 @@ disabled). Perhaps power on/off related?? class nakajies_state : public driver_device { public: - nakajies_state(const machine_config &mconfig, device_type type, std::string tag) + nakajies_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "v20hl") {} diff --git a/src/mame/drivers/namcops2.cpp b/src/mame/drivers/namcops2.cpp index ab345faa2fc..a0eec46f766 100644 --- a/src/mame/drivers/namcops2.cpp +++ b/src/mame/drivers/namcops2.cpp @@ -878,7 +878,7 @@ Notes: class namcops2_state : public driver_device { public: - namcops2_state(const machine_config &mconfig, device_type type, std::string tag) + namcops2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/namcos10.cpp b/src/mame/drivers/namcos10.cpp index 7f78bb9aec3..8c39ab42bd8 100644 --- a/src/mame/drivers/namcos10.cpp +++ b/src/mame/drivers/namcos10.cpp @@ -274,7 +274,7 @@ Kono Tako 10021 Ver.A KC034A 8E, 8D class namcos10_state : public driver_device { public: - namcos10_state(const machine_config &mconfig, device_type type, std::string tag) + namcos10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp index 1bd81dc27a5..4942c555e69 100644 --- a/src/mame/drivers/namcos11.cpp +++ b/src/mame/drivers/namcos11.cpp @@ -307,7 +307,7 @@ Pin 22 Solder Side - Gun 2 Trigger class namcos11_state : public driver_device { public: - namcos11_state(const machine_config &mconfig, device_type type, std::string tag) + namcos11_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sharedram(*this,"sharedram"), m_maincpu(*this,"maincpu"), diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp index d26414cab8c..67f164a8835 100644 --- a/src/mame/drivers/namcos12.cpp +++ b/src/mame/drivers/namcos12.cpp @@ -1094,7 +1094,7 @@ The lever must be wired to analog port 0 (pin B22 parts side) of the Namco 48-wa class namcos12_state : public driver_device { public: - namcos12_state(const machine_config &mconfig, device_type type, std::string tag) + namcos12_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, "maincpu:ram"), diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index 4b79b0e29e5..1494bcd520f 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/src/mame/drivers/namcos23.cpp @@ -1396,7 +1396,7 @@ struct render_t class namcos23_state : public driver_device { public: - namcos23_state(const machine_config &mconfig, device_type type, std::string tag) + namcos23_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), @@ -1704,7 +1704,7 @@ void namcos23_state::c435_state_set_projection_matrix_line(const UINT16 *param) for(int i=0; i<8; i++) p += sprintf(p, " %f", f24_to_f32((param[2*i+1] << 16) | param[2*i+2])); p += sprintf(p, "\n"); - logerror("%s\n",buf); + logerror(buf); } void namcos23_state::c435_state_set(UINT16 type, const UINT16 *param) @@ -1719,7 +1719,7 @@ void namcos23_state::c435_state_set(UINT16 type, const UINT16 *param) for(int i=0; i; -subwoofer_device::subwoofer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +subwoofer_device::subwoofer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SUBWOOFER, "Subwoofer", tag, owner, clock), device_sound_interface(mconfig, *this) { diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp index e1574de518d..53b65663cf0 100644 --- a/src/mame/drivers/nmg5.cpp +++ b/src/mame/drivers/nmg5.cpp @@ -231,7 +231,7 @@ Stephh's notes (based on the games M68000 code and some tests) : class nmg5_state : public driver_device { public: - nmg5_state(const machine_config &mconfig, device_type type, std::string tag) + nmg5_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_scroll_ram(*this, "scroll_ram"), diff --git a/src/mame/drivers/nokia_3310.cpp b/src/mame/drivers/nokia_3310.cpp index 61a27502cc6..b6dd7c934c0 100644 --- a/src/mame/drivers/nokia_3310.cpp +++ b/src/mame/drivers/nokia_3310.cpp @@ -26,7 +26,7 @@ class noki3310_state : public driver_device { public: - noki3310_state(const machine_config &mconfig, device_type type, std::string tag) + noki3310_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pcd8544(*this, "pcd8544"), diff --git a/src/mame/drivers/nsm.cpp b/src/mame/drivers/nsm.cpp index 8379d0f9d97..9a20fa20ee4 100644 --- a/src/mame/drivers/nsm.cpp +++ b/src/mame/drivers/nsm.cpp @@ -27,7 +27,7 @@ ToDo: class nsm_state : public driver_device { public: - nsm_state(const machine_config &mconfig, device_type type, std::string tag) + nsm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/nsmpoker.cpp b/src/mame/drivers/nsmpoker.cpp index d07360058d0..823ee38b70e 100644 --- a/src/mame/drivers/nsmpoker.cpp +++ b/src/mame/drivers/nsmpoker.cpp @@ -69,7 +69,7 @@ class nsmpoker_state : public driver_device { public: - nsmpoker_state(const machine_config &mconfig, device_type type, std::string tag) + nsmpoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/nss.cpp b/src/mame/drivers/nss.cpp index 1c08d8a8770..0497f3e01d0 100644 --- a/src/mame/drivers/nss.cpp +++ b/src/mame/drivers/nss.cpp @@ -299,7 +299,7 @@ Contra III CONTRA_III_1 TC574000 CONTRA_III_0 TC574000 GAME1_NSSU class nss_state : public snes_state { public: - nss_state(const machine_config &mconfig, device_type type, std::string tag) + nss_state(const machine_config &mconfig, device_type type, const char *tag) : snes_state(mconfig, type, tag), m_m50458(*this,"m50458"), m_s3520cf(*this, "s3520cf"), diff --git a/src/mame/drivers/nwk-tr.cpp b/src/mame/drivers/nwk-tr.cpp index 41e6edde615..3d4719b95f1 100644 --- a/src/mame/drivers/nwk-tr.cpp +++ b/src/mame/drivers/nwk-tr.cpp @@ -264,7 +264,7 @@ Thrill Drive 713A13 - 713A14 - class nwktr_state : public driver_device { public: - nwktr_state(const machine_config &mconfig, device_type type, std::string tag) + nwktr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_work_ram(*this, "work_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp index 818378329c5..3bd05899748 100644 --- a/src/mame/drivers/nyny.cpp +++ b/src/mame/drivers/nyny.cpp @@ -87,7 +87,7 @@ class nyny_state : public driver_device { public: - nyny_state(const machine_config &mconfig, device_type type, std::string tag) + nyny_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram1(*this, "videoram1"), m_colorram1(*this, "colorram1"), diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index 43212fe4d1d..b219aa52261 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -113,7 +113,7 @@ Its BIOS performs POST and halts as there's no keyboard. class octopus_state : public driver_device { public: - octopus_state(const machine_config &mconfig, device_type type, std::string tag) + octopus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp index e44e2f1871e..22b0404efcc 100644 --- a/src/mame/drivers/odyssey2.cpp +++ b/src/mame/drivers/odyssey2.cpp @@ -23,7 +23,7 @@ class odyssey2_state : public driver_device { public: - odyssey2_state(const machine_config &mconfig, device_type type, std::string tag) + odyssey2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_i8244(*this, "i8244"), @@ -75,7 +75,7 @@ protected: class g7400_state : public odyssey2_state { public: - g7400_state(const machine_config &mconfig, device_type type, std::string tag) + g7400_state(const machine_config &mconfig, device_type type, const char *tag) : odyssey2_state(mconfig, type, tag) , m_i8243(*this, "i8243") , m_ef9340_1(*this, "ef9340_1") diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp index 0aa392e713f..8ad181fe10e 100644 --- a/src/mame/drivers/okean240.cpp +++ b/src/mame/drivers/okean240.cpp @@ -65,7 +65,7 @@ public: TIMER_OKEAN_BOOT }; - okean240_state(const machine_config &mconfig, device_type type, std::string tag) + okean240_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_term_data(0), m_j(0), diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp index 376ee8dbdf2..8e997d897fb 100644 --- a/src/mame/drivers/olibochu.cpp +++ b/src/mame/drivers/olibochu.cpp @@ -60,7 +60,7 @@ $7004 writes, related to $7000 reads class olibochu_state : public driver_device { public: - olibochu_state(const machine_config &mconfig, device_type type, std::string tag) + olibochu_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp index 15a013ae10d..acf7aae26de 100644 --- a/src/mame/drivers/omegrace.cpp +++ b/src/mame/drivers/omegrace.cpp @@ -228,7 +228,7 @@ class omegrace_state : public driver_device { public: - omegrace_state(const machine_config &mconfig, device_type type, std::string tag) + omegrace_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp index 17661043d8e..35b54cbd5b8 100644 --- a/src/mame/drivers/onetwo.cpp +++ b/src/mame/drivers/onetwo.cpp @@ -51,7 +51,7 @@ Note: this is quite clearly a 'Korean bootleg' of Shisensho - Joshiryo-Hen / Mat class onetwo_state : public driver_device { public: - onetwo_state(const machine_config &mconfig, device_type type, std::string tag) + onetwo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_paletteram(*this, "paletteram"), m_paletteram2(*this, "paletteram2"), diff --git a/src/mame/drivers/onyx.cpp b/src/mame/drivers/onyx.cpp index 01ce90ab486..85d02013975 100644 --- a/src/mame/drivers/onyx.cpp +++ b/src/mame/drivers/onyx.cpp @@ -38,7 +38,7 @@ and be connected to a RS422 network. class onyx_state : public driver_device { public: - onyx_state(const machine_config &mconfig, device_type type, std::string tag) + onyx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp index 2ba373f66e3..69dff49397b 100644 --- a/src/mame/drivers/oric.cpp +++ b/src/mame/drivers/oric.cpp @@ -46,7 +46,7 @@ public: LATTR_BLINK = 0x04 }; - oric_state(const machine_config &mconfig, device_type type, std::string tag) + oric_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette"), @@ -114,7 +114,7 @@ protected: class telestrat_state : public oric_state { public: - telestrat_state(const machine_config &mconfig, device_type type, std::string tag) : + telestrat_state(const machine_config &mconfig, device_type type, const char *tag) : oric_state(mconfig, type, tag), m_via2(*this, "via6522_2"), m_fdc(*this, "fdc"), diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp index 9f6fe5ea070..c21143bc676 100644 --- a/src/mame/drivers/osbexec.cpp +++ b/src/mame/drivers/osbexec.cpp @@ -23,7 +23,7 @@ class osbexec_state : public driver_device { public: - osbexec_state(const machine_config &mconfig, device_type type, std::string tag) + osbexec_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu( *this, "maincpu" ), m_mb8877( *this, "mb8877" ), diff --git a/src/mame/drivers/othello.cpp b/src/mame/drivers/othello.cpp index 9d76ae1f8c5..82f8959a507 100644 --- a/src/mame/drivers/othello.cpp +++ b/src/mame/drivers/othello.cpp @@ -52,7 +52,7 @@ Limit for help/undo (matta): class othello_state : public driver_device { public: - othello_state(const machine_config &mconfig, device_type type, std::string tag) + othello_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/p112.cpp b/src/mame/drivers/p112.cpp index 521aa023455..f67599bcdf7 100644 --- a/src/mame/drivers/p112.cpp +++ b/src/mame/drivers/p112.cpp @@ -40,7 +40,7 @@ Some of the parts: class p112_state : public driver_device { public: - p112_state(const machine_config &mconfig, device_type type, std::string tag) + p112_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp index 8e52fb33895..8288f6704e9 100644 --- a/src/mame/drivers/p8k.cpp +++ b/src/mame/drivers/p8k.cpp @@ -64,7 +64,7 @@ class p8k_state : public driver_device { public: - p8k_state(const machine_config &mconfig, device_type type, std::string tag) + p8k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/pachifev.cpp b/src/mame/drivers/pachifev.cpp index fd17924f21f..ceaeaba5b4e 100644 --- a/src/mame/drivers/pachifev.cpp +++ b/src/mame/drivers/pachifev.cpp @@ -91,7 +91,7 @@ Stephh's notes (based on the game TMS9995 code and some tests) : class pachifev_state : public driver_device { public: - pachifev_state(const machine_config &mconfig, device_type type, std::string tag) + pachifev_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/palm.cpp b/src/mame/drivers/palm.cpp index 587e7123c3d..f875f6eefe7 100644 --- a/src/mame/drivers/palm.cpp +++ b/src/mame/drivers/palm.cpp @@ -24,7 +24,7 @@ class palm_state : public driver_device { public: - palm_state(const machine_config &mconfig, device_type type, std::string tag) + palm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_lsi(*this, MC68328_TAG), diff --git a/src/mame/drivers/palmz22.cpp b/src/mame/drivers/palmz22.cpp index 62ebb15bdc1..b4efcdd2efc 100644 --- a/src/mame/drivers/palmz22.cpp +++ b/src/mame/drivers/palmz22.cpp @@ -76,7 +76,7 @@ end class palmz22_state : public driver_device { public: - palmz22_state(const machine_config &mconfig, device_type type, std::string tag) + palmz22_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_s3c2410(*this, "s3c2410") diff --git a/src/mame/drivers/pangofun.cpp b/src/mame/drivers/pangofun.cpp index b4bfe4aaee7..5c676615dca 100644 --- a/src/mame/drivers/pangofun.cpp +++ b/src/mame/drivers/pangofun.cpp @@ -103,7 +103,7 @@ Arcade Version (Coin-Op) by InfoCube (Pisa, Italy) class pangofun_state : public pcat_base_state { public: - pangofun_state(const machine_config &mconfig, device_type type, std::string tag) + pangofun_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag) { } DECLARE_DRIVER_INIT(pangofun); diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp index 81cb470504e..9229541b9ed 100644 --- a/src/mame/drivers/panicr.cpp +++ b/src/mame/drivers/panicr.cpp @@ -69,7 +69,7 @@ D.9B [f99cac4b] / class panicr_state : public driver_device { public: - panicr_state(const machine_config &mconfig, device_type type, std::string tag) + panicr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_t5182(*this, "t5182"), diff --git a/src/mame/drivers/paranoia.cpp b/src/mame/drivers/paranoia.cpp index 0b7d2118025..3e0fe691587 100644 --- a/src/mame/drivers/paranoia.cpp +++ b/src/mame/drivers/paranoia.cpp @@ -48,7 +48,7 @@ HuC6280A (Hudson) class paranoia_state : public pce_common_state { public: - paranoia_state(const machine_config &mconfig, device_type type, std::string tag) + paranoia_state(const machine_config &mconfig, device_type type, const char *tag) : pce_common_state(mconfig, type, tag) { } DECLARE_WRITE8_MEMBER(i8085_d000_w); diff --git a/src/mame/drivers/pasha2.cpp b/src/mame/drivers/pasha2.cpp index f9951379013..a9036920e62 100644 --- a/src/mame/drivers/pasha2.cpp +++ b/src/mame/drivers/pasha2.cpp @@ -81,7 +81,7 @@ Notes: class pasha2_state : public driver_device { public: - pasha2_state(const machine_config &mconfig, device_type type, std::string tag) + pasha2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_wram(*this, "wram"), m_paletteram(*this, "paletteram"), diff --git a/src/mame/drivers/paso1600.cpp b/src/mame/drivers/paso1600.cpp index 33bebf42092..a9f5f025a9a 100644 --- a/src/mame/drivers/paso1600.cpp +++ b/src/mame/drivers/paso1600.cpp @@ -20,7 +20,7 @@ class paso1600_state : public driver_device { public: - paso1600_state(const machine_config &mconfig, device_type type, std::string tag) + paso1600_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pic(*this, "pic8259"), diff --git a/src/mame/drivers/pasogo.cpp b/src/mame/drivers/pasogo.cpp index 6a1d163e98d..d88f121264e 100644 --- a/src/mame/drivers/pasogo.cpp +++ b/src/mame/drivers/pasogo.cpp @@ -117,7 +117,7 @@ TODO: class pasogo_state : public driver_device { public: - pasogo_state(const machine_config &mconfig, device_type type, std::string tag) + pasogo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_cart(*this, "cartslot") diff --git a/src/mame/drivers/pasopia.cpp b/src/mame/drivers/pasopia.cpp index 24f0b2f6e07..aa65d9979b9 100644 --- a/src/mame/drivers/pasopia.cpp +++ b/src/mame/drivers/pasopia.cpp @@ -21,7 +21,7 @@ class pasopia_state : public driver_device { public: - pasopia_state(const machine_config &mconfig, device_type type, std::string tag) + pasopia_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppi0(*this, "ppi8255_0"), diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp index d049b826200..2a9ec18114d 100644 --- a/src/mame/drivers/pasopia7.cpp +++ b/src/mame/drivers/pasopia7.cpp @@ -32,7 +32,7 @@ class pasopia7_state : public driver_device { public: - pasopia7_state(const machine_config &mconfig, device_type type, std::string tag) + pasopia7_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppi0(*this, "ppi8255_0"), diff --git a/src/mame/drivers/patinho_feio.cpp b/src/mame/drivers/patinho_feio.cpp index 25e9088e87f..e40274c884a 100644 --- a/src/mame/drivers/patinho_feio.cpp +++ b/src/mame/drivers/patinho_feio.cpp @@ -10,7 +10,7 @@ class patinho_feio_state : public driver_device { public: - patinho_feio_state(const machine_config &mconfig, device_type type, std::string tag) + patinho_feio_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) //,m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/pb1000.cpp b/src/mame/drivers/pb1000.cpp index a0029593807..88eafd1d1b2 100644 --- a/src/mame/drivers/pb1000.cpp +++ b/src/mame/drivers/pb1000.cpp @@ -33,7 +33,7 @@ class pb1000_state : public driver_device { public: - pb1000_state(const machine_config &mconfig, device_type type, std::string tag) + pb1000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_beeper(*this, "beeper"), diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp index 83c3f0e357c..b6836ab5f3a 100644 --- a/src/mame/drivers/pc.cpp +++ b/src/mame/drivers/pc.cpp @@ -39,7 +39,7 @@ video HW too. class pc_state : public driver_device { public: - pc_state(const machine_config &mconfig, device_type type, std::string tag) : + pc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp index d4413b1eb9f..1f8cff5ce83 100644 --- a/src/mame/drivers/pc100.cpp +++ b/src/mame/drivers/pc100.cpp @@ -66,7 +66,7 @@ class pc100_state : public driver_device { public: - pc100_state(const machine_config &mconfig, device_type type, std::string tag) + pc100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_beeper(*this, "beeper"), diff --git a/src/mame/drivers/pc1500.cpp b/src/mame/drivers/pc1500.cpp index 6c140312166..a916c5658b4 100644 --- a/src/mame/drivers/pc1500.cpp +++ b/src/mame/drivers/pc1500.cpp @@ -22,7 +22,7 @@ class pc1500_state : public driver_device { public: - pc1500_state(const machine_config &mconfig, device_type type, std::string tag) + pc1500_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_rtc(*this, "upd1990a"), diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp index fe9640b114c..6329a750815 100644 --- a/src/mame/drivers/pc2000.cpp +++ b/src/mame/drivers/pc2000.cpp @@ -30,7 +30,7 @@ class pc2000_state : public driver_device { public: - pc2000_state(const machine_config &mconfig, device_type type, std::string tag) + pc2000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_lcdc(*this, "hd44780"), @@ -69,7 +69,7 @@ public: class gl3000s_state : public pc2000_state { public: - gl3000s_state(const machine_config &mconfig, device_type type, std::string tag) + gl3000s_state(const machine_config &mconfig, device_type type, const char *tag) : pc2000_state(mconfig, type, tag), m_lcdc_r(*this, "sed1520_r"), m_lcdc_l(*this, "sed1520_l") @@ -84,7 +84,7 @@ public: class gl4004_state : public pc2000_state { public: - gl4004_state(const machine_config &mconfig, device_type type, std::string tag) + gl4004_state(const machine_config &mconfig, device_type type, const char *tag) : pc2000_state(mconfig, type, tag) { } @@ -94,7 +94,7 @@ public: class pc1000_state : public pc2000_state { public: - pc1000_state(const machine_config &mconfig, device_type type, std::string tag) + pc1000_state(const machine_config &mconfig, device_type type, const char *tag) : pc2000_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp index 56d867cc521..0372eec0460 100644 --- a/src/mame/drivers/pc6001.cpp +++ b/src/mame/drivers/pc6001.cpp @@ -142,7 +142,7 @@ irq vector 0x26: class pc6001_state : public driver_device { public: - pc6001_state(const machine_config &mconfig, device_type type, std::string tag) + pc6001_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ppi(*this, "ppi8255"), m_ram(*this, "ram"), diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp index 3260660a0b4..d9debc10f5d 100644 --- a/src/mame/drivers/pc8801.cpp +++ b/src/mame/drivers/pc8801.cpp @@ -301,7 +301,7 @@ struct mouse_t class pc8801_state : public driver_device { public: - pc8801_state(const machine_config &mconfig, device_type type, std::string tag) + pc8801_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_fdccpu(*this, "fdccpu"), diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp index 10dcb31acf0..a7f2590a698 100644 --- a/src/mame/drivers/pc88va.cpp +++ b/src/mame/drivers/pc88va.cpp @@ -70,7 +70,7 @@ public: TIMER_PC88VA_FDC_MOTOR_START_1 }; - pc88va_state(const machine_config &mconfig, device_type type, std::string tag) + pc88va_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_fdc(*this, "upd765"), diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 9fba2b45abe..420c1cc8fbf 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -439,7 +439,7 @@ Keyboard TX commands: class pc9801_state : public driver_device { public: - pc9801_state(const machine_config &mconfig, device_type type, std::string tag) : + pc9801_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dmac(*this, "i8237"), diff --git a/src/mame/drivers/pcat_dyn.cpp b/src/mame/drivers/pcat_dyn.cpp index e9ebad9e931..25fdff8943e 100644 --- a/src/mame/drivers/pcat_dyn.cpp +++ b/src/mame/drivers/pcat_dyn.cpp @@ -38,7 +38,7 @@ keyboard trick; class pcat_dyn_state : public pcat_base_state { public: - pcat_dyn_state(const machine_config &mconfig, device_type type, std::string tag) + pcat_dyn_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag) { } DECLARE_DRIVER_INIT(pcat_dyn); diff --git a/src/mame/drivers/pcat_nit.cpp b/src/mame/drivers/pcat_nit.cpp index 78c208b54ba..25b02276175 100644 --- a/src/mame/drivers/pcat_nit.cpp +++ b/src/mame/drivers/pcat_nit.cpp @@ -94,7 +94,7 @@ Smitdogg class pcat_nit_state : public pcat_base_state { public: - pcat_nit_state(const machine_config &mconfig, device_type type, std::string tag) + pcat_nit_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag), m_uart(*this, "ns16450_0"), m_microtouch(*this, "microtouch") { } diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp index a63a153457c..cda14e61f76 100644 --- a/src/mame/drivers/pcd.cpp +++ b/src/mame/drivers/pcd.cpp @@ -30,7 +30,7 @@ class pcd_state : public driver_device { public: - pcd_state(const machine_config &mconfig, device_type type, std::string tag) : + pcd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pic1(*this, "pic1"), diff --git a/src/mame/drivers/pce220.cpp b/src/mame/drivers/pce220.cpp index f8a3e3146b9..ba9c8ab650d 100644 --- a/src/mame/drivers/pce220.cpp +++ b/src/mame/drivers/pce220.cpp @@ -40,7 +40,7 @@ class pce220_state : public driver_device { public: - pce220_state(const machine_config &mconfig, device_type type, std::string tag) + pce220_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), @@ -102,7 +102,7 @@ public: class pcg850v_state : public pce220_state { public: - pcg850v_state(const machine_config &mconfig, device_type type, std::string tag) + pcg850v_state(const machine_config &mconfig, device_type type, const char *tag) : pce220_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/pcfx.cpp b/src/mame/drivers/pcfx.cpp index feff094f0cd..a4ecee9b880 100644 --- a/src/mame/drivers/pcfx.cpp +++ b/src/mame/drivers/pcfx.cpp @@ -30,7 +30,7 @@ public: TIMER_PAD_FUNC }; - pcfx_state(const machine_config &mconfig, device_type type, std::string tag) + pcfx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_huc6261(*this, "huc6261") { } diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp index 65fc6dedc83..912256491f9 100644 --- a/src/mame/drivers/pcm.cpp +++ b/src/mame/drivers/pcm.cpp @@ -67,7 +67,7 @@ class pcm_state : public driver_device { public: - pcm_state(const machine_config &mconfig, device_type type, std::string tag) + pcm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pio_s(*this, "z80pio_s"), diff --git a/src/mame/drivers/pcxt.cpp b/src/mame/drivers/pcxt.cpp index 468e0d06bc7..f4497d6c603 100644 --- a/src/mame/drivers/pcxt.cpp +++ b/src/mame/drivers/pcxt.cpp @@ -71,7 +71,7 @@ the main program is 9th October 1990. class pcxt_state : public driver_device { public: - pcxt_state(const machine_config &mconfig, device_type type, std::string tag) + pcxt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_pit8253(*this, "pit8253"), m_pic8259_1(*this, "pic8259_1"), @@ -133,7 +133,7 @@ class isa8_cga_filetto_device : public isa8_cga_device { public: // construction/destruction - isa8_cga_filetto_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_cga_filetto_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; }; @@ -144,7 +144,7 @@ const device_type ISA8_CGA_FILETTO = &device_creator; // isa8_cga_filetto_device - constructor //------------------------------------------------- -isa8_cga_filetto_device::isa8_cga_filetto_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_cga_filetto_device::isa8_cga_filetto_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_cga_device( mconfig, ISA8_CGA_FILETTO, "ISA8_CGA_FILETTO", tag, owner, clock, "filetto_cga", __FILE__) { } @@ -165,7 +165,7 @@ class isa8_cga_tetriskr_device : public isa8_cga_superimpose_device { public: // construction/destruction - isa8_cga_tetriskr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isa8_cga_tetriskr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; virtual void device_start() override; @@ -185,7 +185,7 @@ const device_type ISA8_CGA_TETRISKR = &device_creator; // isa8_cga_tetriskr_device - constructor //------------------------------------------------- -isa8_cga_tetriskr_device::isa8_cga_tetriskr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isa8_cga_tetriskr_device::isa8_cga_tetriskr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_cga_superimpose_device( mconfig, ISA8_CGA_TETRISKR, "ISA8_CGA_TETRISKR", tag, owner, clock, "tetriskr_cga", __FILE__) { } diff --git a/src/mame/drivers/pda600.cpp b/src/mame/drivers/pda600.cpp index b1075227743..c4dd15ab4cd 100644 --- a/src/mame/drivers/pda600.cpp +++ b/src/mame/drivers/pda600.cpp @@ -65,7 +65,7 @@ class pda600_state : public driver_device { public: - pda600_state(const machine_config &mconfig, device_type type, std::string tag) + pda600_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") {} diff --git a/src/mame/drivers/pdp1.cpp b/src/mame/drivers/pdp1.cpp index 28ed3f88e0f..0c74eae9f55 100644 --- a/src/mame/drivers/pdp1.cpp +++ b/src/mame/drivers/pdp1.cpp @@ -667,7 +667,7 @@ class pdp1_readtape_image_device : public device_t, { public: // construction/destruction - pdp1_readtape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pdp1_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_PUNCHTAPE; } @@ -691,7 +691,7 @@ protected: const device_type PDP1_READTAPE = &device_creator; -pdp1_readtape_image_device::pdp1_readtape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pdp1_readtape_image_device::pdp1_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDP1_READTAPE, "PDP1 Tape Reader", tag, owner, clock, "pdp1_readtape_image", __FILE__), device_image_interface(mconfig, *this) { @@ -702,7 +702,7 @@ class pdp1_punchtape_image_device : public device_t, { public: // construction/destruction - pdp1_punchtape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pdp1_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_PUNCHTAPE; } @@ -726,7 +726,7 @@ protected: const device_type PDP1_PUNCHTAPE = &device_creator; -pdp1_punchtape_image_device::pdp1_punchtape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pdp1_punchtape_image_device::pdp1_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDP1_PUNCHTAPE, "PDP1 Tape Puncher", tag, owner, clock, "pdp1_punchtape_image", __FILE__), device_image_interface(mconfig, *this) { @@ -738,7 +738,7 @@ class pdp1_printer_image_device : public device_t, { public: // construction/destruction - pdp1_printer_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pdp1_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_PRINTER; } @@ -762,7 +762,7 @@ protected: const device_type PDP1_PRINTER = &device_creator; -pdp1_printer_image_device::pdp1_printer_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pdp1_printer_image_device::pdp1_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDP1_PRINTER, "PDP1 Typewriter", tag, owner, clock, "pdp1_printer_image", __FILE__), device_image_interface(mconfig, *this) { @@ -773,7 +773,7 @@ class pdp1_cylinder_image_device : public device_t, { public: // construction/destruction - pdp1_cylinder_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pdp1_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_CYLINDER; } @@ -797,7 +797,7 @@ protected: const device_type PDP1_CYLINDER = &device_creator; -pdp1_cylinder_image_device::pdp1_cylinder_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pdp1_cylinder_image_device::pdp1_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PDP1_CYLINDER, "PDP1 Cylinder", tag, owner, clock, "pdp1_cylinder_image", __FILE__), device_image_interface(mconfig, *this) { diff --git a/src/mame/drivers/pdp11.cpp b/src/mame/drivers/pdp11.cpp index 892dc817310..139386dfe37 100644 --- a/src/mame/drivers/pdp11.cpp +++ b/src/mame/drivers/pdp11.cpp @@ -98,7 +98,7 @@ class pdp11_state : public driver_device { public: - pdp11_state(const machine_config &mconfig, device_type type, std::string tag) + pdp11_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp index 09b73d16e87..858c4b8249f 100644 --- a/src/mame/drivers/pegasus.cpp +++ b/src/mame/drivers/pegasus.cpp @@ -50,7 +50,7 @@ class pegasus_state : public driver_device { public: - pegasus_state(const machine_config &mconfig, device_type type, std::string tag) + pegasus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_cass(*this, "cassette") diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp index ff08104dabd..85cb0a884b2 100644 --- a/src/mame/drivers/pencil2.cpp +++ b/src/mame/drivers/pencil2.cpp @@ -94,7 +94,7 @@ ToDo: class pencil2_state : public driver_device { public: - pencil2_state(const machine_config &mconfig, device_type type, std::string tag) + pencil2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_centronics(*this, "centronics") diff --git a/src/mame/drivers/pengadvb.cpp b/src/mame/drivers/pengadvb.cpp index 6c181ecf11a..c831c2253ea 100644 --- a/src/mame/drivers/pengadvb.cpp +++ b/src/mame/drivers/pengadvb.cpp @@ -35,7 +35,7 @@ NOTE! switches 1, 3 & 5 must be ON or the game will not boot. class pengadvb_state : public driver_device { public: - pengadvb_state(const machine_config &mconfig, device_type type, std::string tag) + pengadvb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/pengo.cpp b/src/mame/drivers/pengo.cpp index 390d4b39f60..c47fb18f97f 100644 --- a/src/mame/drivers/pengo.cpp +++ b/src/mame/drivers/pengo.cpp @@ -72,7 +72,7 @@ class pengo_state : public pacman_state { public: - pengo_state(const machine_config &mconfig, device_type type, std::string tag) + pengo_state(const machine_config &mconfig, device_type type, const char *tag) : pacman_state(mconfig, type, tag), m_decrypted_opcodes(*this, "decrypted_opcodes") { } DECLARE_WRITE8_MEMBER(pengo_coin_counter_w); DECLARE_WRITE8_MEMBER(irq_mask_w); diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp index 1b6d0f27869..ea2150c2fed 100644 --- a/src/mame/drivers/pentagon.cpp +++ b/src/mame/drivers/pentagon.cpp @@ -19,7 +19,7 @@ public: TIMER_IRQ_ON, TIMER_IRQ_OFF }; - pentagon_state(const machine_config &mconfig, device_type type, std::string tag) + pentagon_state(const machine_config &mconfig, device_type type, const char *tag) : spectrum_state(mconfig, type, tag) , m_bank1(*this, "bank1") , m_bank2(*this, "bank2") diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index e59716fb2ae..ca391820999 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -16,7 +16,7 @@ class peoplepc_state : public driver_device { public: - peoplepc_state(const machine_config &mconfig, device_type type, std::string tag) : + peoplepc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette"), diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp index 17c9ebf4960..216996c1464 100644 --- a/src/mame/drivers/peplus.cpp +++ b/src/mame/drivers/peplus.cpp @@ -219,7 +219,7 @@ public: TIMER_ASSERT_LP }; - peplus_state(const machine_config &mconfig, device_type type, std::string tag) + peplus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_crtc(*this, "crtc"), diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp index 729d8d4e66f..742112a6816 100644 --- a/src/mame/drivers/peyper.cpp +++ b/src/mame/drivers/peyper.cpp @@ -41,7 +41,7 @@ ToDo: class peyper_state : public genpin_class { public: - peyper_state(const machine_config &mconfig, device_type type, std::string tag) + peyper_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_switch(*this, "SWITCH") diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp index a494e8685c3..eef0fd51995 100644 --- a/src/mame/drivers/pgm2.cpp +++ b/src/mame/drivers/pgm2.cpp @@ -64,7 +64,7 @@ class pgm2_state : public driver_device { public: - pgm2_state(const machine_config &mconfig, device_type type, std::string tag) + pgm2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/photon.cpp b/src/mame/drivers/photon.cpp index 315dfeff6b9..339986851b4 100644 --- a/src/mame/drivers/photon.cpp +++ b/src/mame/drivers/photon.cpp @@ -27,7 +27,7 @@ class photon_state : public pk8000_base_state { public: - photon_state(const machine_config &mconfig, device_type type, std::string tag) + photon_state(const machine_config &mconfig, device_type type, const char *tag) : pk8000_base_state(mconfig, type, tag), m_speaker(*this, "speaker") { } diff --git a/src/mame/drivers/photon2.cpp b/src/mame/drivers/photon2.cpp index 194a6d29554..f0683c72413 100644 --- a/src/mame/drivers/photon2.cpp +++ b/src/mame/drivers/photon2.cpp @@ -18,7 +18,7 @@ class photon2_state : public driver_device { public: - photon2_state(const machine_config &mconfig, device_type type, std::string tag) + photon2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/drivers/photoply.cpp b/src/mame/drivers/photoply.cpp index f0731dd0e6a..bd4c1ff5e1f 100644 --- a/src/mame/drivers/photoply.cpp +++ b/src/mame/drivers/photoply.cpp @@ -22,7 +22,7 @@ TODO: class photoply_state : public pcat_base_state { public: - photoply_state(const machine_config &mconfig, device_type type, std::string tag) + photoply_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp index e4392a99fea..b701d7d468e 100644 --- a/src/mame/drivers/phunsy.cpp +++ b/src/mame/drivers/phunsy.cpp @@ -42,7 +42,7 @@ class phunsy_state : public driver_device { public: - phunsy_state(const machine_config &mconfig, device_type type, std::string tag) + phunsy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/drivers/piggypas.cpp b/src/mame/drivers/piggypas.cpp index 2d0b8dc6881..413f84c0bd4 100644 --- a/src/mame/drivers/piggypas.cpp +++ b/src/mame/drivers/piggypas.cpp @@ -20,7 +20,7 @@ game details unknown class piggypas_state : public driver_device { public: - piggypas_state(const machine_config &mconfig, device_type type, std::string tag) + piggypas_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ticket(*this, "ticket") diff --git a/src/mame/drivers/pimps.cpp b/src/mame/drivers/pimps.cpp index 7a37691cbf9..331880384aa 100644 --- a/src/mame/drivers/pimps.cpp +++ b/src/mame/drivers/pimps.cpp @@ -31,7 +31,7 @@ V Virtual Memory class pimps_state : public driver_device { public: - pimps_state(const machine_config &mconfig, device_type type, std::string tag) + pimps_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_terminal(*this, TERMINAL_TAG), m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/pinball2k.cpp b/src/mame/drivers/pinball2k.cpp index acbf580c159..9dd759a082d 100644 --- a/src/mame/drivers/pinball2k.cpp +++ b/src/mame/drivers/pinball2k.cpp @@ -29,7 +29,7 @@ class pinball2k_state : public pcat_base_state { public: - pinball2k_state(const machine_config &mconfig, device_type type, std::string tag) + pinball2k_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag), m_main_ram(*this, "main_ram"), m_cga_ram(*this, "cga_ram"), diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp index 89de5dadbe1..2045c1fd6d8 100644 --- a/src/mame/drivers/pinkiri8.cpp +++ b/src/mame/drivers/pinkiri8.cpp @@ -46,7 +46,7 @@ Dumped by Chackn class pinkiri8_state : public driver_device { public: - pinkiri8_state(const machine_config &mconfig, device_type type, std::string tag) + pinkiri8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_janshi_back_vram(*this, "janshivdp:back_vram"), m_janshi_vram1(*this, "janshivdp:vram1"), @@ -103,7 +103,7 @@ class janshi_vdp_device : public device_t, public device_memory_interface { public: - janshi_vdp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + janshi_vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_ADDRESS_MAP(map, 8); protected: virtual void device_config_complete() override; @@ -133,7 +133,7 @@ ADDRESS_MAP_END const device_type JANSHIVDP = &device_creator; -janshi_vdp_device::janshi_vdp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +janshi_vdp_device::janshi_vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, JANSHIVDP, "Janshi VDP", tag, owner, clock, "janshi_vdp", __FILE__), device_memory_interface(mconfig, *this), m_space_config("janshi_vdp", ENDIANNESS_LITTLE, 8,24, 0, address_map_delegate(FUNC(janshi_vdp_device::map), this)) diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp index d265c4fdd38..c6050fb81cf 100644 --- a/src/mame/drivers/pipbug.cpp +++ b/src/mame/drivers/pipbug.cpp @@ -46,7 +46,7 @@ class pipbug_state : public driver_device { public: - pipbug_state(const machine_config &mconfig, device_type type, std::string tag) + pipbug_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_rs232(*this, "rs232"), m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/pipedrm.cpp b/src/mame/drivers/pipedrm.cpp index 25111b72f65..0151f62c79c 100644 --- a/src/mame/drivers/pipedrm.cpp +++ b/src/mame/drivers/pipedrm.cpp @@ -172,7 +172,7 @@ Added Multiple Coin Feature: class pipedrm_state : public fromance_state { public: - pipedrm_state(const machine_config &mconfig, device_type type, std::string tag) + pipedrm_state(const machine_config &mconfig, device_type type, const char *tag) : fromance_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp index d29cf0d42d4..0757fd1ae32 100644 --- a/src/mame/drivers/pipeline.cpp +++ b/src/mame/drivers/pipeline.cpp @@ -77,7 +77,7 @@ Stephh's notes (based on the games Z80 code and some tests) : class pipeline_state : public driver_device { public: - pipeline_state(const machine_config &mconfig, device_type type, std::string tag) + pipeline_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/pitagjr.cpp b/src/mame/drivers/pitagjr.cpp index 70364c109fa..4049583fe15 100644 --- a/src/mame/drivers/pitagjr.cpp +++ b/src/mame/drivers/pitagjr.cpp @@ -157,7 +157,7 @@ class pitagjr_state : public driver_device { public: - pitagjr_state(const machine_config &mconfig, device_type type, std::string tag) + pitagjr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_rombank(*this, "rombank") diff --git a/src/mame/drivers/pk8000.cpp b/src/mame/drivers/pk8000.cpp index 8c71346700c..5afeecdfe21 100644 --- a/src/mame/drivers/pk8000.cpp +++ b/src/mame/drivers/pk8000.cpp @@ -23,7 +23,7 @@ class pk8000_state : public pk8000_base_state { public: - pk8000_state(const machine_config &mconfig, device_type type, std::string tag) + pk8000_state(const machine_config &mconfig, device_type type, const char *tag) : pk8000_base_state(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_cassette(*this, "cassette") diff --git a/src/mame/drivers/pkscram.cpp b/src/mame/drivers/pkscram.cpp index 2d4bee21737..f7a32364b5e 100644 --- a/src/mame/drivers/pkscram.cpp +++ b/src/mame/drivers/pkscram.cpp @@ -22,7 +22,7 @@ driver by David Haywood and few bits by Pierpaolo Prazzoli class pkscram_state : public driver_device { public: - pkscram_state(const machine_config &mconfig, device_type type, std::string tag) + pkscram_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_pkscramble_fgtilemap_ram(*this, "fgtilemap_ram"), m_pkscramble_mdtilemap_ram(*this, "mdtilemap_ram"), diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp index c197e9bd177..f621c73d92b 100644 --- a/src/mame/drivers/plan80.cpp +++ b/src/mame/drivers/plan80.cpp @@ -35,7 +35,7 @@ public: TIMER_BOOT }; - plan80_state(const machine_config &mconfig, device_type type, std::string tag) + plan80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_p_videoram(*this, "p_videoram") diff --git a/src/mame/drivers/play_1.cpp b/src/mame/drivers/play_1.cpp index c2bc1b9e4c8..1f4b934c249 100644 --- a/src/mame/drivers/play_1.cpp +++ b/src/mame/drivers/play_1.cpp @@ -14,7 +14,7 @@ class play_1_state : public driver_device { public: - play_1_state(const machine_config &mconfig, device_type type, std::string tag) + play_1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/play_2.cpp b/src/mame/drivers/play_2.cpp index f846b176890..d9130b783ac 100644 --- a/src/mame/drivers/play_2.cpp +++ b/src/mame/drivers/play_2.cpp @@ -11,7 +11,7 @@ class play_2_state : public driver_device { public: - play_2_state(const machine_config &mconfig, device_type type, std::string tag) + play_2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/play_3.cpp b/src/mame/drivers/play_3.cpp index c4338453c2a..ac95103507e 100644 --- a/src/mame/drivers/play_3.cpp +++ b/src/mame/drivers/play_3.cpp @@ -14,7 +14,7 @@ class play_3_state : public driver_device { public: - play_3_state(const machine_config &mconfig, device_type type, std::string tag) + play_3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/play_5.cpp b/src/mame/drivers/play_5.cpp index c836212a3dc..09edd089fe3 100644 --- a/src/mame/drivers/play_5.cpp +++ b/src/mame/drivers/play_5.cpp @@ -11,7 +11,7 @@ class play_5_state : public driver_device { public: - play_5_state(const machine_config &mconfig, device_type type, std::string tag) + play_5_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/pluto5.cpp b/src/mame/drivers/pluto5.cpp index 7641e88bfcb..f231c634f8e 100644 --- a/src/mame/drivers/pluto5.cpp +++ b/src/mame/drivers/pluto5.cpp @@ -183,7 +183,7 @@ class pluto5_state : public driver_device { public: - pluto5_state(const machine_config &mconfig, device_type type, std::string tag) + pluto5_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/pm68k.cpp b/src/mame/drivers/pm68k.cpp index 17113c2f037..d35fa742d8d 100644 --- a/src/mame/drivers/pm68k.cpp +++ b/src/mame/drivers/pm68k.cpp @@ -19,7 +19,7 @@ Status: Boots into monitor, some commands work, some freeze. class pm68k_state : public driver_device { public: - pm68k_state(const machine_config &mconfig, device_type type, std::string tag) + pm68k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_base(*this, "rambase"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/pmi80.cpp b/src/mame/drivers/pmi80.cpp index dbdcbcd9dbc..d58f538892a 100644 --- a/src/mame/drivers/pmi80.cpp +++ b/src/mame/drivers/pmi80.cpp @@ -40,7 +40,7 @@ Notes: class pmi80_state : public driver_device { public: - pmi80_state(const machine_config &mconfig, device_type type, std::string tag) + pmi80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_ledready(0) , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/pntnpuzl.cpp b/src/mame/drivers/pntnpuzl.cpp index 654e3ec9914..32f1f571fe2 100644 --- a/src/mame/drivers/pntnpuzl.cpp +++ b/src/mame/drivers/pntnpuzl.cpp @@ -131,7 +131,7 @@ CN1 standard DB15 VGA connector (15KHz) class pntnpuzl_state : public driver_device { public: - pntnpuzl_state(const machine_config &mconfig, device_type type, std::string tag) + pntnpuzl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_eeprom(*this, "eeprom") diff --git a/src/mame/drivers/pockstat.cpp b/src/mame/drivers/pockstat.cpp index 19a8d53df2f..0662ab59f5b 100644 --- a/src/mame/drivers/pockstat.cpp +++ b/src/mame/drivers/pockstat.cpp @@ -104,7 +104,7 @@ struct ps_rtc_regs_t class pockstat_state : public driver_device { public: - pockstat_state(const machine_config &mconfig, device_type type, std::string tag) + pockstat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_lcd_buffer(*this, "lcd_buffer"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/pokemini.cpp b/src/mame/drivers/pokemini.cpp index 690e8ca0b41..09299dc79d5 100644 --- a/src/mame/drivers/pokemini.cpp +++ b/src/mame/drivers/pokemini.cpp @@ -51,7 +51,7 @@ struct TIMERS class pokemini_state : public driver_device { public: - pokemini_state(const machine_config &mconfig, device_type type, std::string tag) + pokemini_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_p_ram(*this, "p_ram"), diff --git a/src/mame/drivers/poker72.cpp b/src/mame/drivers/poker72.cpp index 8fcb16f2dae..4867465e902 100644 --- a/src/mame/drivers/poker72.cpp +++ b/src/mame/drivers/poker72.cpp @@ -20,7 +20,7 @@ class poker72_state : public driver_device { public: - poker72_state(const machine_config &mconfig, device_type type, std::string tag) + poker72_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_pal(*this, "pal"), diff --git a/src/mame/drivers/poly.cpp b/src/mame/drivers/poly.cpp index ffcb90b2ccc..4dbf5502166 100644 --- a/src/mame/drivers/poly.cpp +++ b/src/mame/drivers/poly.cpp @@ -46,7 +46,7 @@ class poly_state : public driver_device { public: - poly_state(const machine_config &mconfig, device_type type, std::string tag) + poly_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pia0(*this, "pia0"), diff --git a/src/mame/drivers/pong.cpp b/src/mame/drivers/pong.cpp index 7aade29ed15..358b7cb35ea 100644 --- a/src/mame/drivers/pong.cpp +++ b/src/mame/drivers/pong.cpp @@ -125,7 +125,7 @@ NETLIST_EXTERNAL(breakout) class ttl_mono_state : public driver_device { public: - ttl_mono_state(const machine_config &mconfig, device_type type, std::string tag) + ttl_mono_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq"), @@ -158,7 +158,7 @@ private: class pong_state : public ttl_mono_state { public: - pong_state(const machine_config &mconfig, device_type type, std::string tag) + pong_state(const machine_config &mconfig, device_type type, const char *tag) : ttl_mono_state(mconfig, type, tag), m_sw1a(*this, "maincpu:sw1a"), m_sw1b(*this, "maincpu:sw1b") @@ -185,7 +185,7 @@ private: class breakout_state : public ttl_mono_state { public: - breakout_state(const machine_config &mconfig, device_type type, std::string tag) + breakout_state(const machine_config &mconfig, device_type type, const char *tag) : ttl_mono_state(mconfig, type, tag), m_led_serve(*this, "maincpu:led_serve"), m_lamp_credit1(*this, "maincpu:lamp_credit1"), diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp index 3f6e31aae70..c6d1f2fed6c 100644 --- a/src/mame/drivers/popobear.cpp +++ b/src/mame/drivers/popobear.cpp @@ -85,7 +85,7 @@ Component Side A B Solder Side class popobear_state : public driver_device { public: - popobear_state(const machine_config &mconfig, device_type type, std::string tag) + popobear_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/potgoldu.cpp b/src/mame/drivers/potgoldu.cpp index cdf94342bb1..3e5c5a6613a 100644 --- a/src/mame/drivers/potgoldu.cpp +++ b/src/mame/drivers/potgoldu.cpp @@ -26,7 +26,7 @@ class potgold_state : public driver_device { public: - potgold_state(const machine_config &mconfig, device_type type, std::string tag) + potgold_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp index 60d504db0ae..8c92483c44c 100644 --- a/src/mame/drivers/powerbal.cpp +++ b/src/mame/drivers/powerbal.cpp @@ -24,7 +24,7 @@ Magic Sticks: class powerbal_state : public playmark_state { public: - powerbal_state(const machine_config &mconfig, device_type type, std::string tag) + powerbal_state(const machine_config &mconfig, device_type type, const char *tag) : playmark_state(mconfig, type, tag), m_eeprom(*this, "eeprom") { } diff --git a/src/mame/drivers/ppmast93.cpp b/src/mame/drivers/ppmast93.cpp index f4f9d2bd3f1..b3d2bc556fb 100644 --- a/src/mame/drivers/ppmast93.cpp +++ b/src/mame/drivers/ppmast93.cpp @@ -140,7 +140,7 @@ Dip locations added based on the notes above. class ppmast93_state : public driver_device { public: - ppmast93_state(const machine_config &mconfig, device_type type, std::string tag) + ppmast93_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), diff --git a/src/mame/drivers/prestige.cpp b/src/mame/drivers/prestige.cpp index bf9243e0af6..5259abb3ca5 100644 --- a/src/mame/drivers/prestige.cpp +++ b/src/mame/drivers/prestige.cpp @@ -89,7 +89,7 @@ Notes: class prestige_state : public driver_device { public: - prestige_state(const machine_config &mconfig, device_type type, std::string tag) + prestige_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/drivers/pro80.cpp b/src/mame/drivers/pro80.cpp index e1c951f3cd9..54b519cfb0f 100644 --- a/src/mame/drivers/pro80.cpp +++ b/src/mame/drivers/pro80.cpp @@ -28,7 +28,7 @@ The cassette used 2 bits for input, plus a D flipflop and a 74LS221 oneshot. class pro80_state : public driver_device { public: - pro80_state(const machine_config &mconfig, device_type type, std::string tag) + pro80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cass(*this, "cassette") diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp index aeb01e61881..4f74c8bdf20 100644 --- a/src/mame/drivers/proconn.cpp +++ b/src/mame/drivers/proconn.cpp @@ -39,7 +39,7 @@ class proconn_state : public driver_device { public: - proconn_state(const machine_config &mconfig, device_type type, std::string tag) + proconn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vfd(*this, "vfd"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/progolf.cpp b/src/mame/drivers/progolf.cpp index abae6a65766..213be37d7aa 100644 --- a/src/mame/drivers/progolf.cpp +++ b/src/mame/drivers/progolf.cpp @@ -62,7 +62,7 @@ Twenty four 8116 rams. class progolf_state : public driver_device { public: - progolf_state(const machine_config &mconfig, device_type type, std::string tag) + progolf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/prophet600.cpp b/src/mame/drivers/prophet600.cpp index dcaa1d7b698..c191d31d846 100644 --- a/src/mame/drivers/prophet600.cpp +++ b/src/mame/drivers/prophet600.cpp @@ -75,7 +75,7 @@ enum class prophet600_state : public driver_device { public: - prophet600_state(const machine_config &mconfig, device_type type, std::string tag) + prophet600_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, MAINCPU_TAG), m_acia(*this, UART_TAG), diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp index 7c2f18a5406..573b8772d52 100644 --- a/src/mame/drivers/proteus3.cpp +++ b/src/mame/drivers/proteus3.cpp @@ -58,7 +58,7 @@ class proteus3_state : public driver_device { public: - proteus3_state(const machine_config &mconfig, device_type type, std::string tag) + proteus3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_pia(*this, "pia") diff --git a/src/mame/drivers/pse.cpp b/src/mame/drivers/pse.cpp index 793cb680e43..298da05319a 100644 --- a/src/mame/drivers/pse.cpp +++ b/src/mame/drivers/pse.cpp @@ -47,7 +47,7 @@ class pse_state : public driver_device { public: - pse_state(const machine_config &mconfig, device_type type, std::string tag) + pse_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/psx.cpp b/src/mame/drivers/psx.cpp index edd41974963..ab768f2c431 100644 --- a/src/mame/drivers/psx.cpp +++ b/src/mame/drivers/psx.cpp @@ -26,7 +26,7 @@ class psx1_state : public driver_device { public: - psx1_state(const machine_config &mconfig, device_type type, std::string tag) + psx1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_ram(*this, "maincpu:ram") diff --git a/src/mame/drivers/pt68k4.cpp b/src/mame/drivers/pt68k4.cpp index 6632625ff9b..d76d8af7766 100644 --- a/src/mame/drivers/pt68k4.cpp +++ b/src/mame/drivers/pt68k4.cpp @@ -79,7 +79,7 @@ TODO: 68230 device class pt68k4_state : public driver_device { public: - pt68k4_state(const machine_config &mconfig, device_type type, std::string tag) + pt68k4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_p_base(*this, "rambase") , m_maincpu(*this, M68K_TAG) diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp index 846e361f8d6..72384632812 100644 --- a/src/mame/drivers/ptcsol.cpp +++ b/src/mame/drivers/ptcsol.cpp @@ -133,7 +133,7 @@ public: TIMER_SOL20_BOOT }; - sol20_state(const machine_config &mconfig, device_type type, std::string tag) + sol20_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_cass1(*this, "cassette") diff --git a/src/mame/drivers/pturn.cpp b/src/mame/drivers/pturn.cpp index f2d6849df2c..82d6fd2d033 100644 --- a/src/mame/drivers/pturn.cpp +++ b/src/mame/drivers/pturn.cpp @@ -84,7 +84,7 @@ ROMS: All ROM labels say only "PROM" and a number. class pturn_state : public driver_device { public: - pturn_state(const machine_config &mconfig, device_type type, std::string tag) + pturn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp index 103bbc4ab51..48030adce83 100644 --- a/src/mame/drivers/pulsar.cpp +++ b/src/mame/drivers/pulsar.cpp @@ -48,7 +48,7 @@ X - Test off-board memory banks class pulsar_state : public driver_device { public: - pulsar_state(const machine_config &mconfig, device_type type, std::string tag) : + pulsar_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dart(*this, "z80dart"), diff --git a/src/mame/drivers/pv1000.cpp b/src/mame/drivers/pv1000.cpp index ed05f66d153..ca6f85d7c50 100644 --- a/src/mame/drivers/pv1000.cpp +++ b/src/mame/drivers/pv1000.cpp @@ -17,7 +17,7 @@ class pv1000_sound_device : public device_t, public device_sound_interface { public: - pv1000_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pv1000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER(voice_w); @@ -46,7 +46,7 @@ extern const device_type PV1000; const device_type PV1000 = &device_creator; -pv1000_sound_device::pv1000_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pv1000_sound_device::pv1000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PV1000, "NEC D65010G031", tag, owner, clock, "pv1000_sound", __FILE__), device_sound_interface(mconfig, *this) { @@ -142,7 +142,7 @@ void pv1000_sound_device::sound_stream_update(sound_stream &stream, stream_sampl class pv1000_state : public driver_device { public: - pv1000_state(const machine_config &mconfig, device_type type, std::string tag) + pv1000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_sound(*this, "pv1000_sound"), diff --git a/src/mame/drivers/pv2000.cpp b/src/mame/drivers/pv2000.cpp index 4fb4dbd0324..080e6f707e8 100644 --- a/src/mame/drivers/pv2000.cpp +++ b/src/mame/drivers/pv2000.cpp @@ -42,7 +42,7 @@ For BIOS CRC confirmation class pv2000_state : public driver_device { public: - pv2000_state(const machine_config &mconfig, device_type type, std::string tag) + pv2000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cass(*this, "cassette"), diff --git a/src/mame/drivers/pv9234.cpp b/src/mame/drivers/pv9234.cpp index cbcdca78f3a..101dd0151cc 100644 --- a/src/mame/drivers/pv9234.cpp +++ b/src/mame/drivers/pv9234.cpp @@ -27,7 +27,7 @@ be found! class pv9234_state : public driver_device { public: - pv9234_state(const machine_config &mconfig, device_type type, std::string tag) + pv9234_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_ram(*this, "p_ram"), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/pve500.cpp b/src/mame/drivers/pve500.cpp index 2288ad32381..2f1274dbb1f 100644 --- a/src/mame/drivers/pve500.cpp +++ b/src/mame/drivers/pve500.cpp @@ -62,7 +62,7 @@ class pve500_state : public driver_device { public: - pve500_state(const machine_config &mconfig, device_type type, std::string tag) + pve500_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_subcpu(*this, "subcpu") diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp index 684581423a1..36925ab03b5 100644 --- a/src/mame/drivers/px4.cpp +++ b/src/mame/drivers/px4.cpp @@ -48,7 +48,7 @@ class px4_state : public driver_device, public device_serial_interface { public: - px4_state(const machine_config &mconfig, device_type type, std::string tag) : + px4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), device_serial_interface(mconfig, *this), m_z80(*this, "maincpu"), @@ -244,7 +244,7 @@ private: class px4p_state : public px4_state { public: - px4p_state(const machine_config &mconfig, device_type type, std::string tag) : + px4p_state(const machine_config &mconfig, device_type type, const char *tag) : px4_state(mconfig, type, tag), m_rdnvram(*this, "rdnvram"), m_rdsocket(*this, "ramdisk_socket"), @@ -959,7 +959,7 @@ WRITE8_MEMBER( px4_state::artmr_w ) stop_bits_t stop_bits = BIT(data, 7) ? STOP_BITS_2 : STOP_BITS_1; if (VERBOSE) - logerror("%s: serial frame setup: %d-%s-%d\n", tag().c_str(), data_bit_count, device_serial_interface::parity_tostring(parity), stop_bits); + logerror("%s: serial frame setup: %d-%s-%d\n", tag(), data_bit_count, device_serial_interface::parity_tostring(parity), stop_bits); set_data_frame(1, data_bit_count, parity, stop_bits); } diff --git a/src/mame/drivers/pyl601.cpp b/src/mame/drivers/pyl601.cpp index 157ad2f5164..8da7b17d6ed 100644 --- a/src/mame/drivers/pyl601.cpp +++ b/src/mame/drivers/pyl601.cpp @@ -46,7 +46,7 @@ class pyl601_state : public driver_device { public: - pyl601_state(const machine_config &mconfig, device_type type, std::string tag) + pyl601_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_speaker(*this, "speaker"), m_fdc(*this, "upd765"), diff --git a/src/mame/drivers/pyson.cpp b/src/mame/drivers/pyson.cpp index 8b365c5e52d..97dddf6b07b 100644 --- a/src/mame/drivers/pyson.cpp +++ b/src/mame/drivers/pyson.cpp @@ -158,7 +158,7 @@ Notes: class pyson_state : public driver_device { public: - pyson_state(const machine_config &mconfig, device_type type, std::string tag) + pyson_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/pzletime.cpp b/src/mame/drivers/pzletime.cpp index a1af4ff67e0..c56a225e141 100644 --- a/src/mame/drivers/pzletime.cpp +++ b/src/mame/drivers/pzletime.cpp @@ -24,7 +24,7 @@ class pzletime_state : public driver_device { public: - pzletime_state(const machine_config &mconfig, device_type type, std::string tag) + pzletime_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_regs(*this, "video_regs"), m_tilemap_regs(*this, "tilemap_regs"), diff --git a/src/mame/drivers/qtsbc.cpp b/src/mame/drivers/qtsbc.cpp index 321b5cca8fa..aa14373aad9 100644 --- a/src/mame/drivers/qtsbc.cpp +++ b/src/mame/drivers/qtsbc.cpp @@ -19,7 +19,7 @@ class qtsbc_state : public driver_device { public: - qtsbc_state(const machine_config &mconfig, device_type type, std::string tag) + qtsbc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/quakeat.cpp b/src/mame/drivers/quakeat.cpp index 4cd2532aa8b..49c8ea6ab42 100644 --- a/src/mame/drivers/quakeat.cpp +++ b/src/mame/drivers/quakeat.cpp @@ -68,7 +68,7 @@ TODO: class quakeat_state : public pcat_base_state { public: - quakeat_state(const machine_config &mconfig, device_type type, std::string tag) + quakeat_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/quantum.cpp b/src/mame/drivers/quantum.cpp index 86d227cb7fe..256607a3ddc 100644 --- a/src/mame/drivers/quantum.cpp +++ b/src/mame/drivers/quantum.cpp @@ -60,7 +60,7 @@ NOTE: The Atari 136002-125 PROM in the sets below wasn't dumped from an actual class quantum_state : public driver_device { public: - quantum_state(const machine_config &mconfig, device_type type, std::string tag) + quantum_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_avg(*this, "avg") { } diff --git a/src/mame/drivers/queen.cpp b/src/mame/drivers/queen.cpp index d9b24ddbf4c..21b69043b7a 100644 --- a/src/mame/drivers/queen.cpp +++ b/src/mame/drivers/queen.cpp @@ -38,7 +38,7 @@ processor speed is 533MHz <- likely to be a Celeron or a Pentium III class CPU - class queen_state : public pcat_base_state { public: - queen_state(const machine_config &mconfig, device_type type, std::string tag) + queen_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/quizo.cpp b/src/mame/drivers/quizo.cpp index 7ffdc9df8c6..6279c372cc2 100644 --- a/src/mame/drivers/quizo.cpp +++ b/src/mame/drivers/quizo.cpp @@ -33,7 +33,7 @@ Xtals 8MHz, 21.47727MHz class quizo_state : public driver_device { public: - quizo_state(const machine_config &mconfig, device_type type, std::string tag) + quizo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp index 93cbe2c7e0a..91743602a1d 100644 --- a/src/mame/drivers/quizpun2.cpp +++ b/src/mame/drivers/quizpun2.cpp @@ -93,7 +93,7 @@ struct prot_t { class quizpun2_state : public driver_device { public: - quizpun2_state(const machine_config &mconfig, device_type type, std::string tag) + quizpun2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_ram(*this, "fg_ram"), m_bg_ram(*this, "bg_ram"), diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp index b865d4f03cc..deda44515e0 100644 --- a/src/mame/drivers/quizshow.cpp +++ b/src/mame/drivers/quizshow.cpp @@ -36,7 +36,7 @@ TODO: class quizshow_state : public driver_device { public: - quizshow_state(const machine_config &mconfig, device_type type, std::string tag) + quizshow_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp index c445fd444d5..467e7fb2527 100644 --- a/src/mame/drivers/qx10.cpp +++ b/src/mame/drivers/qx10.cpp @@ -56,7 +56,7 @@ class qx10_state : public driver_device { public: - qx10_state(const machine_config &mconfig, device_type type, std::string tag) + qx10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_pit_1(*this, "pit8253_1"), m_pit_2(*this, "pit8253_2"), diff --git a/src/mame/drivers/r2dtank.cpp b/src/mame/drivers/r2dtank.cpp index 16cb34b7376..e40fdcbe377 100644 --- a/src/mame/drivers/r2dtank.cpp +++ b/src/mame/drivers/r2dtank.cpp @@ -52,7 +52,7 @@ RAM = 4116 (x11) class r2dtank_state : public driver_device { public: - r2dtank_state(const machine_config &mconfig, device_type type, std::string tag) + r2dtank_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp index f7478dbbe3f..1b6ae4510ec 100644 --- a/src/mame/drivers/r2dx_v33.cpp +++ b/src/mame/drivers/r2dx_v33.cpp @@ -72,7 +72,7 @@ Then it puts settings at 0x9e08 and 0x9e0a (bp 91acb) class r2dx_v33_state : public raiden2_state { public: - r2dx_v33_state(const machine_config &mconfig, device_type type, std::string tag) + r2dx_v33_state(const machine_config &mconfig, device_type type, const char *tag) : raiden2_state(mconfig, type, tag), m_eeprom(*this, "eeprom"), m_math(*this, "math"), diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp index d5243ff8e60..5ca1d8d153a 100644 --- a/src/mame/drivers/r9751.cpp +++ b/src/mame/drivers/r9751.cpp @@ -55,7 +55,7 @@ class r9751_state : public driver_device { public: - r9751_state(const machine_config &mconfig, device_type type, std::string tag) + r9751_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pdc(*this, "pdc"), diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp index 14b51986eac..82e8889a079 100644 --- a/src/mame/drivers/rabbit.cpp +++ b/src/mame/drivers/rabbit.cpp @@ -95,7 +95,7 @@ public: TIMER_BLIT_DONE }; - rabbit_state(const machine_config &mconfig, device_type type, std::string tag) + rabbit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index 644b8e6073b..d6f58b231ee 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -258,7 +258,7 @@ W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND). class rainbow_state : public driver_device { public: - rainbow_state(const machine_config &mconfig, device_type type, std::string tag) : + rainbow_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), #ifdef KEYBOARD_WORKAROUND diff --git a/src/mame/drivers/rambo.cpp b/src/mame/drivers/rambo.cpp index 580d2404a03..afe528c6b49 100644 --- a/src/mame/drivers/rambo.cpp +++ b/src/mame/drivers/rambo.cpp @@ -31,7 +31,7 @@ class rambo_state : public driver_device { public: - rambo_state(const machine_config &mconfig, device_type type, std::string tag) + rambo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { diff --git a/src/mame/drivers/ramtek.cpp b/src/mame/drivers/ramtek.cpp index 1d3ccdd0b2c..7fc1c8fc736 100644 --- a/src/mame/drivers/ramtek.cpp +++ b/src/mame/drivers/ramtek.cpp @@ -61,7 +61,7 @@ class ramtek_state : public driver_device { public: - ramtek_state(const machine_config &mconfig, device_type type, std::string tag) + ramtek_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp index 30dc040704e..8176fb3f749 100644 --- a/src/mame/drivers/rastersp.cpp +++ b/src/mame/drivers/rastersp.cpp @@ -47,7 +47,7 @@ class rastersp_state : public driver_device { public: - rastersp_state(const machine_config &mconfig, device_type type, std::string tag) + rastersp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dsp(*this, "dsp"), diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp index 8b7bc08f7a3..f9957ca5bc2 100644 --- a/src/mame/drivers/ravens.cpp +++ b/src/mame/drivers/ravens.cpp @@ -82,7 +82,7 @@ ToDo: class ravens_state : public driver_device { public: - ravens_state(const machine_config &mconfig, device_type type, std::string tag) + ravens_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/rbmk.cpp b/src/mame/drivers/rbmk.cpp index 8354607133c..de71f98e760 100644 --- a/src/mame/drivers/rbmk.cpp +++ b/src/mame/drivers/rbmk.cpp @@ -62,7 +62,7 @@ Notes: class rbmk_state : public driver_device { public: - rbmk_state(const machine_config &mconfig, device_type type, std::string tag) + rbmk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_gms_vidram2(*this, "gms_vidram2"), m_gms_vidram(*this, "gms_vidram"), diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp index 216bfb4156f..ca5d4b09745 100644 --- a/src/mame/drivers/rc759.cpp +++ b/src/mame/drivers/rc759.cpp @@ -32,7 +32,7 @@ class rc759_state : public driver_device { public: - rc759_state(const machine_config &mconfig, device_type type, std::string tag) : + rc759_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pic(*this, "pic"), diff --git a/src/mame/drivers/rcorsair.cpp b/src/mame/drivers/rcorsair.cpp index 7911f8d04b7..e015ce6ce3a 100644 --- a/src/mame/drivers/rcorsair.cpp +++ b/src/mame/drivers/rcorsair.cpp @@ -62,7 +62,7 @@ Notes added 2014-09-10: class rcorsair_state : public driver_device { public: - rcorsair_state(const machine_config &mconfig, device_type type, std::string tag) + rcorsair_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/rd100.cpp b/src/mame/drivers/rd100.cpp index 616be636456..46c20ff62ce 100644 --- a/src/mame/drivers/rd100.cpp +++ b/src/mame/drivers/rd100.cpp @@ -19,7 +19,7 @@ class rd100_state : public driver_device { public: - rd100_state(const machine_config &mconfig, device_type type, std::string tag) + rd100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/rd110.cpp b/src/mame/drivers/rd110.cpp index cd24b0183ce..02da5ac1f4f 100644 --- a/src/mame/drivers/rd110.cpp +++ b/src/mame/drivers/rd110.cpp @@ -56,7 +56,7 @@ public: required_device lcd; required_device midi_timer; - d110_state(const machine_config &mconfig, device_type type, std::string tag); + d110_state(const machine_config &mconfig, device_type type, const char *tag); virtual void machine_start() override; virtual void machine_reset() override; @@ -85,7 +85,7 @@ private: required_device m_maincpu; }; -d110_state::d110_state(const machine_config &mconfig, device_type type, std::string tag) : +d110_state::d110_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), cpu(*this, "maincpu"), ram(*this, "ram"), diff --git a/src/mame/drivers/re900.cpp b/src/mame/drivers/re900.cpp index 9d8c191c9ad..5adaa88084f 100644 --- a/src/mame/drivers/re900.cpp +++ b/src/mame/drivers/re900.cpp @@ -87,7 +87,7 @@ class re900_state : public driver_device { public: - re900_state(const machine_config &mconfig, device_type type, std::string tag) + re900_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_rom(*this, "rom") { } diff --git a/src/mame/drivers/replicator.cpp b/src/mame/drivers/replicator.cpp index fc969de2ba3..b219db5fde8 100644 --- a/src/mame/drivers/replicator.cpp +++ b/src/mame/drivers/replicator.cpp @@ -151,7 +151,7 @@ class replicator_state : public driver_device { public: - replicator_state(const machine_config &mconfig, device_type type, std::string tag) + replicator_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_lcdc(*this, "hd44780"), diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp index 3522ab82e8c..6407eddba62 100644 --- a/src/mame/drivers/rex6000.cpp +++ b/src/mame/drivers/rex6000.cpp @@ -59,7 +59,7 @@ class rex6000_state : public driver_device { public: - rex6000_state(const machine_config &mconfig, device_type type, std::string tag) + rex6000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/drivers/rgum.cpp b/src/mame/drivers/rgum.cpp index f0aacbbe575..2f6ef0e5894 100644 --- a/src/mame/drivers/rgum.cpp +++ b/src/mame/drivers/rgum.cpp @@ -24,7 +24,7 @@ The ppi at 3000-3003 seems to be a dual port communication thing with the z80. class rgum_state : public driver_device { public: - rgum_state(const machine_config &mconfig, device_type type, std::string tag) + rgum_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_cram(*this, "cram"), diff --git a/src/mame/drivers/riscpc.cpp b/src/mame/drivers/riscpc.cpp index 99b497a2829..faa14e36e0f 100644 --- a/src/mame/drivers/riscpc.cpp +++ b/src/mame/drivers/riscpc.cpp @@ -24,7 +24,7 @@ class riscpc_state : public driver_device { public: - riscpc_state(const machine_config &mconfig, device_type type, std::string tag) + riscpc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette") diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp index 7ae7ea4397b..e5ce3256085 100644 --- a/src/mame/drivers/rmhaihai.cpp +++ b/src/mame/drivers/rmhaihai.cpp @@ -39,7 +39,7 @@ TODO: class rmhaihai_state : public driver_device { public: - rmhaihai_state(const machine_config &mconfig, device_type type, std::string tag) + rmhaihai_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), diff --git a/src/mame/drivers/rmt32.cpp b/src/mame/drivers/rmt32.cpp index 5d3a5a482b8..60116d4324e 100644 --- a/src/mame/drivers/rmt32.cpp +++ b/src/mame/drivers/rmt32.cpp @@ -194,7 +194,7 @@ public: optional_device lcd; required_device midi_timer; - mt32_state(const machine_config &mconfig, device_type type, std::string tag); + mt32_state(const machine_config &mconfig, device_type type, const char *tag); virtual void machine_start() override; virtual void machine_reset() override; @@ -223,7 +223,7 @@ private: required_device m_maincpu; }; -mt32_state::mt32_state(const machine_config &mconfig, device_type type, std::string tag) : +mt32_state::mt32_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), cpu(*this, "maincpu"), ram(*this, "ram"), diff --git a/src/mame/drivers/rollext.cpp b/src/mame/drivers/rollext.cpp index 4404da0c196..0a01fc4e26e 100644 --- a/src/mame/drivers/rollext.cpp +++ b/src/mame/drivers/rollext.cpp @@ -279,7 +279,7 @@ void rollext_renderer::display(bitmap_rgb32 *bitmap, const rectangle &cliprect) class rollext_state : public driver_device { public: - rollext_state(const machine_config &mconfig, device_type type, std::string tag) + rollext_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette_ram(*this, "palette_ram"), diff --git a/src/mame/drivers/rotaryf.cpp b/src/mame/drivers/rotaryf.cpp index e903b59e4ad..98dcdd7810f 100644 --- a/src/mame/drivers/rotaryf.cpp +++ b/src/mame/drivers/rotaryf.cpp @@ -22,7 +22,7 @@ driver by Barry Rodewald class rotaryf_state : public driver_device { public: - rotaryf_state(const machine_config &mconfig, device_type type, std::string tag) + rotaryf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_samples(*this, "samples"), diff --git a/src/mame/drivers/roul.cpp b/src/mame/drivers/roul.cpp index 7f6c37668ee..e6634a6aa41 100644 --- a/src/mame/drivers/roul.cpp +++ b/src/mame/drivers/roul.cpp @@ -72,7 +72,7 @@ Stephh's notes (based on the game Z80 code and some tests) : class roul_state : public driver_device { public: - roul_state(const machine_config &mconfig, device_type type, std::string tag) + roul_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu") { } diff --git a/src/mame/drivers/route16.cpp b/src/mame/drivers/route16.cpp index 69c1e17e9c9..b2510b66d56 100644 --- a/src/mame/drivers/route16.cpp +++ b/src/mame/drivers/route16.cpp @@ -946,7 +946,7 @@ READ8_MEMBER(route16_state::routex_prot_read) { if (space.device().safe_pc() == 0x2f) return 0xfb; - logerror ("cpu '%s' (PC=%08X): unmapped prot read\n", space.device().tag().c_str(), space.device().safe_pc()); + logerror ("cpu '%s' (PC=%08X): unmapped prot read\n", space.device().tag(), space.device().safe_pc()); return 0x00; } diff --git a/src/mame/drivers/rowamet.cpp b/src/mame/drivers/rowamet.cpp index de27f010f07..5a724c75623 100644 --- a/src/mame/drivers/rowamet.cpp +++ b/src/mame/drivers/rowamet.cpp @@ -30,7 +30,7 @@ ToDO: class rowamet_state : public driver_device { public: - rowamet_state(const machine_config &mconfig, device_type type, std::string tag) + rowamet_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_cpu2(*this, "cpu2") diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp index b9b23403de0..5a37bae7207 100644 --- a/src/mame/drivers/royalmah.cpp +++ b/src/mame/drivers/royalmah.cpp @@ -104,7 +104,7 @@ Stephh's notes (based on the games Z80 code and some tests) : class royalmah_state : public driver_device { public: - royalmah_state(const machine_config &mconfig, device_type type, std::string tag) + royalmah_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_videoram(*this, "videoram"), diff --git a/src/mame/drivers/rsc55.cpp b/src/mame/drivers/rsc55.cpp index 14e2f7c4765..90779f52be5 100644 --- a/src/mame/drivers/rsc55.cpp +++ b/src/mame/drivers/rsc55.cpp @@ -48,10 +48,10 @@ class sc55_state : public driver_device public: required_device m_maincpu; - sc55_state(const machine_config &mconfig, device_type type, std::string tag); + sc55_state(const machine_config &mconfig, device_type type, const char *tag); }; -sc55_state::sc55_state(const machine_config &mconfig, device_type type, std::string tag) : +sc55_state::sc55_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp index 46063c8267c..4e8e259192a 100644 --- a/src/mame/drivers/rt1715.cpp +++ b/src/mame/drivers/rt1715.cpp @@ -27,7 +27,7 @@ class rt1715_state : public driver_device { public: - rt1715_state(const machine_config &mconfig, device_type type, std::string tag) + rt1715_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG) { } diff --git a/src/mame/drivers/rvoice.cpp b/src/mame/drivers/rvoice.cpp index 3115e508bbb..5fc455da10e 100644 --- a/src/mame/drivers/rvoice.cpp +++ b/src/mame/drivers/rvoice.cpp @@ -76,7 +76,7 @@ struct rvoicepc_t class rvoice_state : public driver_device { public: - rvoice_state(const machine_config &mconfig, device_type type, std::string tag) + rvoice_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp index b09177a3181..3f7818c3e30 100644 --- a/src/mame/drivers/rx78.cpp +++ b/src/mame/drivers/rx78.cpp @@ -53,7 +53,7 @@ class rx78_state : public driver_device { public: - rx78_state(const machine_config &mconfig, device_type type, std::string tag) + rx78_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cass(*this, "cassette"), diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp index 87ab22f4391..9d6167b9eae 100644 --- a/src/mame/drivers/s3.cpp +++ b/src/mame/drivers/s3.cpp @@ -48,7 +48,7 @@ ToDo: class s3_state : public genpin_class { public: - s3_state(const machine_config &mconfig, device_type type, std::string tag) + s3_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp index 0fb44e80667..52aca8c0ce1 100644 --- a/src/mame/drivers/s4.cpp +++ b/src/mame/drivers/s4.cpp @@ -41,7 +41,7 @@ ToDo: class s4_state : public genpin_class { public: - s4_state(const machine_config &mconfig, device_type type, std::string tag) + s4_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp index 84513f70e67..876c855ef8e 100644 --- a/src/mame/drivers/s6.cpp +++ b/src/mame/drivers/s6.cpp @@ -58,7 +58,7 @@ ToDo: class s6_state : public genpin_class { public: - s6_state(const machine_config &mconfig, device_type type, std::string tag) + s6_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp index 6376d7d257d..e1c5567b1e4 100644 --- a/src/mame/drivers/s6a.cpp +++ b/src/mame/drivers/s6a.cpp @@ -51,7 +51,7 @@ ToDo: class s6a_state : public genpin_class { public: - s6a_state(const machine_config &mconfig, device_type type, std::string tag) + s6a_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp index 5f0f357bd6a..af8704e7320 100644 --- a/src/mame/drivers/s7.cpp +++ b/src/mame/drivers/s7.cpp @@ -68,7 +68,7 @@ ToDo: class s7_state : public genpin_class { public: - s7_state(const machine_config &mconfig, device_type type, std::string tag) + s7_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp index b38ac43b9b9..5c2f2c83284 100644 --- a/src/mame/drivers/s8.cpp +++ b/src/mame/drivers/s8.cpp @@ -55,7 +55,7 @@ ToDo: class s8_state : public genpin_class { public: - s8_state(const machine_config &mconfig, device_type type, std::string tag) + s8_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp index 490b62a12e5..444505d8538 100644 --- a/src/mame/drivers/s8a.cpp +++ b/src/mame/drivers/s8a.cpp @@ -31,7 +31,7 @@ ToDo: class s8a_state : public genpin_class { public: - s8a_state(const machine_config &mconfig, device_type type, std::string tag) + s8a_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp index 54e7bcc3735..f72606db6f5 100644 --- a/src/mame/drivers/s9.cpp +++ b/src/mame/drivers/s9.cpp @@ -43,7 +43,7 @@ ToDo: class s9_state : public genpin_class { public: - s9_state(const machine_config &mconfig, device_type type, std::string tag) + s9_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/sacstate.cpp b/src/mame/drivers/sacstate.cpp index 45e2d11fb65..d7891cfe4e3 100644 --- a/src/mame/drivers/sacstate.cpp +++ b/src/mame/drivers/sacstate.cpp @@ -43,7 +43,7 @@ Other input will either result in '!' message, or halt. class sacstate_state : public driver_device { public: - sacstate_state(const machine_config &mconfig, device_type type, std::string tag) + sacstate_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp index 2890c2dc41b..44e064e5188 100644 --- a/src/mame/drivers/safarir.cpp +++ b/src/mame/drivers/safarir.cpp @@ -56,7 +56,7 @@ modified by Hau class safarir_state : public driver_device { public: - safarir_state(const machine_config &mconfig, device_type type, std::string tag) + safarir_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), diff --git a/src/mame/drivers/sam.cpp b/src/mame/drivers/sam.cpp index 8dc59b81da8..7053c7b955a 100644 --- a/src/mame/drivers/sam.cpp +++ b/src/mame/drivers/sam.cpp @@ -7,7 +7,7 @@ class sam_state : public driver_device { public: - sam_state(const machine_config &mconfig, device_type type, std::string tag) + sam_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } }; diff --git a/src/mame/drivers/sandscrp.cpp b/src/mame/drivers/sandscrp.cpp index 824d0ddf96b..50937085c9b 100644 --- a/src/mame/drivers/sandscrp.cpp +++ b/src/mame/drivers/sandscrp.cpp @@ -86,7 +86,7 @@ Is there another alt program rom set labeled 9 & 10? class sandscrp_state : public driver_device { public: - sandscrp_state(const machine_config &mconfig, device_type type, std::string tag) + sandscrp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/sangho.cpp b/src/mame/drivers/sangho.cpp index ad78a406c5a..4f401081ef3 100644 --- a/src/mame/drivers/sangho.cpp +++ b/src/mame/drivers/sangho.cpp @@ -54,7 +54,7 @@ TODO: class sangho_state : public driver_device { public: - sangho_state(const machine_config &mconfig, device_type type, std::string tag) + sangho_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_v9958(*this, "v9958") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/sanremmg.cpp b/src/mame/drivers/sanremmg.cpp index 0124113c06a..baa88cbd757 100644 --- a/src/mame/drivers/sanremmg.cpp +++ b/src/mame/drivers/sanremmg.cpp @@ -15,7 +15,7 @@ class sanremmg_state : public driver_device { public: - sanremmg_state(const machine_config &mconfig, device_type type, std::string tag) + sanremmg_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp index 7ec876c68c0..64ade62d1c0 100644 --- a/src/mame/drivers/sanremo.cpp +++ b/src/mame/drivers/sanremo.cpp @@ -108,7 +108,7 @@ class sanremo_state : public driver_device { public: - sanremo_state(const machine_config &mconfig, device_type type, std::string tag) + sanremo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/sansa_fuze.cpp b/src/mame/drivers/sansa_fuze.cpp index 13430bcd486..2ee426af50c 100644 --- a/src/mame/drivers/sansa_fuze.cpp +++ b/src/mame/drivers/sansa_fuze.cpp @@ -13,7 +13,7 @@ class sansa_fuze_state : public driver_device { public: - sansa_fuze_state(const machine_config &mconfig, device_type type, std::string tag) + sansa_fuze_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp index bdb59484ef7..732baca6c3e 100644 --- a/src/mame/drivers/sapi1.cpp +++ b/src/mame/drivers/sapi1.cpp @@ -44,7 +44,7 @@ Unable to proceed due to no info available (& in English). class sapi1_state : public driver_device { public: - sapi1_state(const machine_config &mconfig, device_type type, std::string tag) + sapi1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_videoram(*this, "videoram"), m_bank1(*this, "bank1"), diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp index 6504828a467..13dec46c418 100644 --- a/src/mame/drivers/saturn.cpp +++ b/src/mame/drivers/saturn.cpp @@ -444,7 +444,7 @@ test1f diagnostic hacks: class sat_console_state : public saturn_state { public: - sat_console_state(const machine_config &mconfig, device_type type, std::string tag) + sat_console_state(const machine_config &mconfig, device_type type, const char *tag) : saturn_state(mconfig, type, tag) , m_exp(*this, "exp") , m_nvram(*this, "nvram") diff --git a/src/mame/drivers/savia84.cpp b/src/mame/drivers/savia84.cpp index 25199eaded2..b094410cd95 100644 --- a/src/mame/drivers/savia84.cpp +++ b/src/mame/drivers/savia84.cpp @@ -37,7 +37,7 @@ class savia84_state : public driver_device { public: - savia84_state(const machine_config &mconfig, device_type type, std::string tag) + savia84_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppi8255(*this, "ppi8255") diff --git a/src/mame/drivers/savquest.cpp b/src/mame/drivers/savquest.cpp index 7ebcd382dbb..784278096fa 100644 --- a/src/mame/drivers/savquest.cpp +++ b/src/mame/drivers/savquest.cpp @@ -57,7 +57,7 @@ class savquest_state : public pcat_base_state { public: - savquest_state(const machine_config &mconfig, device_type type, std::string tag) + savquest_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag), m_vga(*this, "vga"), m_voodoo(*this, "voodoo") diff --git a/src/mame/drivers/sbc6510.cpp b/src/mame/drivers/sbc6510.cpp index 0a1899443a4..9d78fe0ed0d 100644 --- a/src/mame/drivers/sbc6510.cpp +++ b/src/mame/drivers/sbc6510.cpp @@ -62,7 +62,7 @@ ToDo: class sbc6510_state : public driver_device { public: - sbc6510_state(const machine_config &mconfig, device_type type, std::string tag) + sbc6510_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_videocpu(*this, "videocpu"), diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp index 3026eafe625..b4869187e49 100644 --- a/src/mame/drivers/sbowling.cpp +++ b/src/mame/drivers/sbowling.cpp @@ -49,7 +49,7 @@ PROMs : NEC B406 (1kx4) x2 class sbowling_state : public driver_device { public: - sbowling_state(const machine_config &mconfig, device_type type, std::string tag) + sbowling_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_videoram(*this, "videoram"), diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp index b0feb4c9dd4..84439358b81 100644 --- a/src/mame/drivers/sbrain.cpp +++ b/src/mame/drivers/sbrain.cpp @@ -47,7 +47,7 @@ To Do: class sbrain_state : public driver_device { public: - sbrain_state(const machine_config &mconfig, device_type type, std::string tag) : + sbrain_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp index 2359c45a738..54bbf6c4e6e 100644 --- a/src/mame/drivers/sbrkout.cpp +++ b/src/mame/drivers/sbrkout.cpp @@ -44,7 +44,7 @@ class sbrkout_state : public driver_device { public: - sbrkout_state(const machine_config &mconfig, device_type type, std::string tag) + sbrkout_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/sc1.cpp b/src/mame/drivers/sc1.cpp index da6b5519c15..5c8107ea77b 100644 --- a/src/mame/drivers/sc1.cpp +++ b/src/mame/drivers/sc1.cpp @@ -46,7 +46,7 @@ Port 82 in - upper byte = 0 thru 7 class sc1_state : public driver_device { public: - sc1_state(const machine_config &mconfig, device_type type, std::string tag) + sc1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker") diff --git a/src/mame/drivers/sc2.cpp b/src/mame/drivers/sc2.cpp index 6effde1d993..5be373bb484 100644 --- a/src/mame/drivers/sc2.cpp +++ b/src/mame/drivers/sc2.cpp @@ -20,7 +20,7 @@ class sc2_state : public driver_device { public: - sc2_state(const machine_config &mconfig, device_type type, std::string tag) + sc2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_beep(*this, "beeper") , diff --git a/src/mame/drivers/scm_500.cpp b/src/mame/drivers/scm_500.cpp index e8d4f2423d5..1e5eac486ae 100644 --- a/src/mame/drivers/scm_500.cpp +++ b/src/mame/drivers/scm_500.cpp @@ -15,7 +15,7 @@ http://www.standardchange.com/frequently-asked-questions class scm_500_state : public driver_device { public: - scm_500_state(const machine_config &mconfig, device_type type, std::string tag) + scm_500_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) // ,m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp index b67ecc07250..08c51b55cef 100644 --- a/src/mame/drivers/scobra.cpp +++ b/src/mame/drivers/scobra.cpp @@ -45,7 +45,7 @@ Notes/Tidbits: class scobra_state : public scramble_state { public: - scobra_state(const machine_config &mconfig, device_type type, std::string tag) + scobra_state(const machine_config &mconfig, device_type type, const char *tag) : scramble_state(mconfig, type, tag), m_soundram(*this, "soundram") { } diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp index 9a59168ac84..8f8dc435c68 100644 --- a/src/mame/drivers/scorpion.cpp +++ b/src/mame/drivers/scorpion.cpp @@ -14,7 +14,7 @@ class scorpion_state : public spectrum_state { public: - scorpion_state(const machine_config &mconfig, device_type type, std::string tag) + scorpion_state(const machine_config &mconfig, device_type type, const char *tag) : spectrum_state(mconfig, type, tag) , m_bank1(*this, "bank1") , m_bank2(*this, "bank2") diff --git a/src/mame/drivers/scregg.cpp b/src/mame/drivers/scregg.cpp index 3687309b118..652ebcbfacc 100644 --- a/src/mame/drivers/scregg.cpp +++ b/src/mame/drivers/scregg.cpp @@ -59,7 +59,7 @@ it as ASCII text. class scregg_state : public btime_state { public: - scregg_state(const machine_config &mconfig, device_type type, std::string tag) + scregg_state(const machine_config &mconfig, device_type type, const char *tag) : btime_state(mconfig, type, tag) { } DECLARE_WRITE8_MEMBER(scregg_irqack_w); diff --git a/src/mame/drivers/scv.cpp b/src/mame/drivers/scv.cpp index d903c201086..e1852162caf 100644 --- a/src/mame/drivers/scv.cpp +++ b/src/mame/drivers/scv.cpp @@ -17,7 +17,7 @@ class scv_state : public driver_device { public: - scv_state(const machine_config &mconfig, device_type type, std::string tag) + scv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this,"videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/sdk80.cpp b/src/mame/drivers/sdk80.cpp index 2a64a1876a1..954bf30afeb 100644 --- a/src/mame/drivers/sdk80.cpp +++ b/src/mame/drivers/sdk80.cpp @@ -41,7 +41,7 @@ No known manual or schematic of the video board. class sdk80_state : public driver_device { public: - sdk80_state(const machine_config &mconfig, device_type type, std::string tag) + sdk80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_usart(*this, I8251A_TAG) diff --git a/src/mame/drivers/sdk85.cpp b/src/mame/drivers/sdk85.cpp index e6f24bcb536..424a921a1ae 100644 --- a/src/mame/drivers/sdk85.cpp +++ b/src/mame/drivers/sdk85.cpp @@ -31,7 +31,7 @@ ToDo: class sdk85_state : public driver_device { public: - sdk85_state(const machine_config &mconfig, device_type type, std::string tag) + sdk85_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/sdk86.cpp b/src/mame/drivers/sdk86.cpp index 162a208784b..dd341654595 100644 --- a/src/mame/drivers/sdk86.cpp +++ b/src/mame/drivers/sdk86.cpp @@ -40,7 +40,7 @@ ToDo: class sdk86_state : public driver_device { public: - sdk86_state(const machine_config &mconfig, device_type type, std::string tag) : + sdk86_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_usart(*this, I8251_TAG) diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp index 5cc956e4af1..b3f35e41ad8 100644 --- a/src/mame/drivers/seabattl.cpp +++ b/src/mame/drivers/seabattl.cpp @@ -41,7 +41,7 @@ the sound board should be fully discrete. class seabattl_state : public driver_device { public: - seabattl_state(const machine_config &mconfig, device_type type, std::string tag) + seabattl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_videoram(*this, "videoram"), diff --git a/src/mame/drivers/sealy.cpp b/src/mame/drivers/sealy.cpp index 045dd891428..0dedecb8feb 100644 --- a/src/mame/drivers/sealy.cpp +++ b/src/mame/drivers/sealy.cpp @@ -37,7 +37,7 @@ Notes: class sealy_state : public driver_device { public: - sealy_state(const machine_config &mconfig, device_type type, std::string tag) + sealy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette") diff --git a/src/mame/drivers/seattle.cpp b/src/mame/drivers/seattle.cpp index ac973567438..8cb68506d8c 100644 --- a/src/mame/drivers/seattle.cpp +++ b/src/mame/drivers/seattle.cpp @@ -423,7 +423,7 @@ struct widget_data class seattle_state : public driver_device { public: - seattle_state(const machine_config &mconfig, device_type type, std::string tag) + seattle_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_nvram(*this, "nvram") , m_rambase(*this, "rambase"), diff --git a/src/mame/drivers/seattlecmp.cpp b/src/mame/drivers/seattlecmp.cpp index 90dd3fadfb2..b6b06914492 100644 --- a/src/mame/drivers/seattlecmp.cpp +++ b/src/mame/drivers/seattlecmp.cpp @@ -38,7 +38,7 @@ There is a 4MHz crystal connected to the 9513. class seattle_comp_state : public driver_device { public: - seattle_comp_state(const machine_config &mconfig, device_type type, std::string tag) + seattle_comp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/sega_sawatte.cpp b/src/mame/drivers/sega_sawatte.cpp index b6ad4a8adac..9ef349c81e4 100644 --- a/src/mame/drivers/sega_sawatte.cpp +++ b/src/mame/drivers/sega_sawatte.cpp @@ -31,7 +31,7 @@ http://mamedev.emulab.it/haze/reference/sawatte/cartridge_example.jpg class sawatte_state : public driver_device { public: - sawatte_state(const machine_config &mconfig, device_type type, std::string tag) + sawatte_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp index 01a8e67343d..d96fd2cef69 100644 --- a/src/mame/drivers/segac2.cpp +++ b/src/mame/drivers/segac2.cpp @@ -97,7 +97,7 @@ typedef device_delegate segac2_prot_delegate; class segac2_state : public md_base_state { public: - segac2_state(const machine_config &mconfig, device_type type, std::string tag) + segac2_state(const machine_config &mconfig, device_type type, const char *tag) : md_base_state(mconfig, type, tag), m_paletteram(*this, "paletteram"), m_upd7759(*this, "upd"), diff --git a/src/mame/drivers/segacoin.cpp b/src/mame/drivers/segacoin.cpp index 5f0bc6830ab..aac1d5a2969 100644 --- a/src/mame/drivers/segacoin.cpp +++ b/src/mame/drivers/segacoin.cpp @@ -25,7 +25,7 @@ TODO: class segacoin_state : public driver_device { public: - segacoin_state(const machine_config &mconfig, device_type type, std::string tag) + segacoin_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/segae.cpp b/src/mame/drivers/segae.cpp index 3b159a1561c..77874a36fe5 100644 --- a/src/mame/drivers/segae.cpp +++ b/src/mame/drivers/segae.cpp @@ -307,7 +307,7 @@ protected: virtual void machine_start() override; public: - systeme_state(const machine_config &mconfig, device_type type, std::string tag) + systeme_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_vdp1(*this, "vdp1"), diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp index a72f5b74306..1bd6490ebe4 100644 --- a/src/mame/drivers/segajw.cpp +++ b/src/mame/drivers/segajw.cpp @@ -40,7 +40,7 @@ Also seem to be running on the same/similar hardware: class segajw_state : public driver_device { public: - segajw_state(const machine_config &mconfig, device_type type, std::string tag) + segajw_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/segald.cpp b/src/mame/drivers/segald.cpp index 0cf39492735..08ab3f8ae9d 100644 --- a/src/mame/drivers/segald.cpp +++ b/src/mame/drivers/segald.cpp @@ -28,7 +28,7 @@ Todo: class segald_state : public driver_device { public: - segald_state(const machine_config &mconfig, device_type type, std::string tag) + segald_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc") , m_obj_ram(*this, "obj_ram"), diff --git a/src/mame/drivers/segam1.cpp b/src/mame/drivers/segam1.cpp index a6284a586be..b31dbbf56fb 100644 --- a/src/mame/drivers/segam1.cpp +++ b/src/mame/drivers/segam1.cpp @@ -40,7 +40,7 @@ uses s24 style tilemaps (ram based?) class segam1_state : public driver_device { public: - segam1_state(const machine_config &mconfig, device_type type, std::string tag) + segam1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/segapico.cpp b/src/mame/drivers/segapico.cpp index 601c62e41b4..5efbeb7ceef 100644 --- a/src/mame/drivers/segapico.cpp +++ b/src/mame/drivers/segapico.cpp @@ -129,7 +129,7 @@ C = MB3514 / 9325 M36 class pico_base_state : public md_cons_state { public: - pico_base_state(const machine_config &mconfig, device_type type, std::string tag) + pico_base_state(const machine_config &mconfig, device_type type, const char *tag) : md_cons_state(mconfig, type, tag), m_sega_315_5641_pcm(*this, "315_5641"), m_io_page(*this, "PAGE"), @@ -160,7 +160,7 @@ public: class pico_state : public pico_base_state { public: - pico_state(const machine_config &mconfig, device_type type, std::string tag) + pico_state(const machine_config &mconfig, device_type type, const char *tag) : pico_base_state(mconfig, type, tag), m_picocart(*this, "picoslot") { } @@ -554,7 +554,7 @@ S-AUDIO <-| | +-----------+ +-------+ class copera_state : public pico_base_state { public: - copera_state(const machine_config &mconfig, device_type type, std::string tag) + copera_state(const machine_config &mconfig, device_type type, const char *tag) : pico_base_state(mconfig, type, tag), m_picocart(*this, "coperaslot") { } diff --git a/src/mame/drivers/segapm.cpp b/src/mame/drivers/segapm.cpp index 5c4511ef90a..9ebc711ca4e 100644 --- a/src/mame/drivers/segapm.cpp +++ b/src/mame/drivers/segapm.cpp @@ -12,7 +12,7 @@ class segapm_state : public driver_device { public: - segapm_state(const machine_config &mconfig, device_type type, std::string tag) + segapm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/segas24.cpp b/src/mame/drivers/segas24.cpp index a5677013c68..729fee2197e 100644 --- a/src/mame/drivers/segas24.cpp +++ b/src/mame/drivers/segas24.cpp @@ -785,7 +785,7 @@ WRITE16_MEMBER( segas24_state::mlatch_w ) int i; UINT8 mxor = 0; if(!mlatch_table) { - logerror("Protection: magic latch accessed but no table loaded (%s:%x)\n", space.device().tag().c_str(), space.device().safe_pc()); + logerror("Protection: magic latch accessed but no table loaded (%s:%x)\n", space.device().tag(), space.device().safe_pc()); return; } @@ -796,9 +796,9 @@ WRITE16_MEMBER( segas24_state::mlatch_w ) if(mlatch & (1<*io_w)(offset, data); @@ -1073,7 +1073,7 @@ WRITE16_MEMBER( segas24_state::sys16_io_w ) io_dir = data; break; default: - logerror("IO control write %02x, %02x (%s:%x)\n", offset, data & 0xff, space.device().tag().c_str(), space.device().safe_pc()); + logerror("IO control write %02x, %02x (%s:%x)\n", offset, data & 0xff, space.device().tag(), space.device().safe_pc()); } } } diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp index 0a9d4a13484..db1fb7a3d24 100644 --- a/src/mame/drivers/segas32.cpp +++ b/src/mame/drivers/segas32.cpp @@ -537,7 +537,7 @@ orunners: Interleaved with the dj and << >> buttons is the data the drives the const device_type SEGA_S32_PCB = &device_creator; -segas32_state::segas32_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segas32_state::segas32_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA_S32_PCB, "Sega System 32 PCB", tag, owner, clock, "segas32_pcb", __FILE__), m_z80_shared_ram(*this,"z80_shared_ram"), m_ga2_dpram(*this,"ga2_dpram"), @@ -2521,7 +2521,7 @@ MACHINE_CONFIG_END const device_type SEGA_S32_REGULAR_DEVICE = &device_creator; -segas32_regular_state::segas32_regular_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segas32_regular_state::segas32_regular_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segas32_state(mconfig, tag, owner, clock) { } @@ -2545,7 +2545,7 @@ MACHINE_CONFIG_END const device_type SEGA_S32_V25_DEVICE = &device_creator; -segas32_v25_state::segas32_v25_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segas32_v25_state::segas32_v25_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segas32_state(mconfig, tag, owner, clock) { } @@ -2608,7 +2608,7 @@ MACHINE_CONFIG_END const device_type SEGA_MULTI32_DEVICE = &device_creator; -sega_multi32_state::sega_multi32_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega_multi32_state::sega_multi32_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segas32_state(mconfig, tag, owner, clock) { } @@ -2622,7 +2622,7 @@ machine_config_constructor sega_multi32_state::device_mconfig_additions() const class segas32_new_state : public driver_device { public: - segas32_new_state(const machine_config &mconfig, device_type type, std::string tag) + segas32_new_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mainpcb(*this, "mainpcb"), m_slavepcb(*this, "slavepcb") diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp index ee74ee9aabd..1263d6daafb 100644 --- a/src/mame/drivers/segaufo.cpp +++ b/src/mame/drivers/segaufo.cpp @@ -73,7 +73,7 @@ class ufo_state : public driver_device { public: - ufo_state(const machine_config &mconfig, device_type type, std::string tag) + ufo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_io1(*this, "io1"), diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index 924366868ed..8366d3b10b2 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -272,7 +272,7 @@ ROMs: const device_type SEGA_XBD_PCB = &device_creator; -segaxbd_state::segaxbd_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segaxbd_state::segaxbd_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA_XBD_PCB, "Sega X-Board PCB", tag, owner, clock, "segaxbd_pcb", __FILE__), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), @@ -343,7 +343,7 @@ void segaxbd_state::device_reset() class segaxbd_new_state : public driver_device { public: - segaxbd_new_state(const machine_config &mconfig, device_type type, std::string tag) + segaxbd_new_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mainpcb(*this, "mainpcb") { @@ -365,7 +365,7 @@ public: class segaxbd_new_state_double : public segaxbd_new_state { public: - segaxbd_new_state_double(const machine_config &mconfig, device_type type, std::string tag) + segaxbd_new_state_double(const machine_config &mconfig, device_type type, const char *tag) : segaxbd_new_state(mconfig, type, tag), m_subpcb(*this, "subpcb") { @@ -1867,7 +1867,7 @@ MACHINE_CONFIG_END const device_type SEGA_XBD_REGULAR_DEVICE = &device_creator; -segaxbd_regular_state::segaxbd_regular_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segaxbd_regular_state::segaxbd_regular_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segaxbd_state(mconfig, tag, owner, clock) { } @@ -1893,7 +1893,7 @@ MACHINE_CONFIG_END const device_type SEGA_XBD_FD1094_DEVICE = &device_creator; -segaxbd_fd1094_state::segaxbd_fd1094_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segaxbd_fd1094_state::segaxbd_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segaxbd_state(mconfig, tag, owner, clock) { } @@ -1935,7 +1935,7 @@ MACHINE_CONFIG_END const device_type SEGA_XBD_LASTSURV_FD1094_DEVICE = &device_creator; -segaxbd_lastsurv_fd1094_state::segaxbd_lastsurv_fd1094_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segaxbd_lastsurv_fd1094_state::segaxbd_lastsurv_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segaxbd_state(mconfig, tag, owner, clock) { } @@ -1965,7 +1965,7 @@ MACHINE_CONFIG_END const device_type SEGA_XBD_LASTSURV_DEVICE = &device_creator; -segaxbd_lastsurv_state::segaxbd_lastsurv_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segaxbd_lastsurv_state::segaxbd_lastsurv_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segaxbd_state(mconfig, tag, owner, clock) { } @@ -2008,7 +2008,7 @@ MACHINE_CONFIG_END const device_type SEGA_XBD_SMGP_FD1094_DEVICE = &device_creator; -segaxbd_smgp_fd1094_state::segaxbd_smgp_fd1094_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segaxbd_smgp_fd1094_state::segaxbd_smgp_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segaxbd_state(mconfig, tag, owner, clock) { } @@ -2051,7 +2051,7 @@ MACHINE_CONFIG_END const device_type SEGA_XBD_SMGP_DEVICE = &device_creator; -segaxbd_smgp_state::segaxbd_smgp_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segaxbd_smgp_state::segaxbd_smgp_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segaxbd_state(mconfig, tag, owner, clock) { } @@ -2077,7 +2077,7 @@ MACHINE_CONFIG_END const device_type SEGA_XBD_RASCOT_DEVICE = &device_creator; -segaxbd_rascot_state::segaxbd_rascot_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segaxbd_rascot_state::segaxbd_rascot_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : segaxbd_state(mconfig, tag, owner, clock) { } diff --git a/src/mame/drivers/selz80.cpp b/src/mame/drivers/selz80.cpp index c4e6d21b1a0..2666bf7d59c 100644 --- a/src/mame/drivers/selz80.cpp +++ b/src/mame/drivers/selz80.cpp @@ -37,7 +37,7 @@ ToDo: class selz80_state : public driver_device { public: - selz80_state(const machine_config &mconfig, device_type type, std::string tag) + selz80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_p_ram(*this, "ram") diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp index 523cd4bf5a9..3a95d926d9e 100644 --- a/src/mame/drivers/sengokmj.cpp +++ b/src/mame/drivers/sengokmj.cpp @@ -64,7 +64,7 @@ RSSENGO2.72 chr. class sengokmj_state : public driver_device { public: - sengokmj_state(const machine_config &mconfig, device_type type, std::string tag) + sengokmj_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp index 866207b49a7..15ddc8f6622 100644 --- a/src/mame/drivers/seta2.cpp +++ b/src/mame/drivers/seta2.cpp @@ -527,7 +527,7 @@ class funcube_touchscreen_device : public device_t, public device_serial_interface { public: - funcube_touchscreen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + funcube_touchscreen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; template static devcb_base &set_tx_cb(device_t &device, _Object object) { return downcast(device).m_tx_cb.set_callback(object); } @@ -564,7 +564,7 @@ static INPUT_PORTS_START( funcube_touchscreen ) PORT_BIT( 0xff, 0x00, IPT_LIGHTGUN_Y ) PORT_MINMAX(0,0x46+1) PORT_CROSSHAIR(Y, -(0xf0-8.0)/0xf0*0x047/0x46, -1.0/0x46, 0) PORT_SENSITIVITY(45) PORT_KEYDELTA(5) PORT_REVERSE INPUT_PORTS_END -funcube_touchscreen_device::funcube_touchscreen_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +funcube_touchscreen_device::funcube_touchscreen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, FUNCUBE_TOUCHSCREEN, "Funcube Touchscreen", tag, owner, clock, "funcube_touchscrene", __FILE__), device_serial_interface(mconfig, *this), m_tx_cb(*this), diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp index 23ec46a9780..46843e34271 100644 --- a/src/mame/drivers/sfbonus.cpp +++ b/src/mame/drivers/sfbonus.cpp @@ -283,7 +283,7 @@ MH86171 Color Palette RAMDAC class sfbonus_state : public driver_device { public: - sfbonus_state(const machine_config &mconfig, device_type type, std::string tag) + sfbonus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/sfcbox.cpp b/src/mame/drivers/sfcbox.cpp index 944c74b706a..d8c8534e5ae 100644 --- a/src/mame/drivers/sfcbox.cpp +++ b/src/mame/drivers/sfcbox.cpp @@ -127,7 +127,7 @@ How does the Super Famicom Box operates class sfcbox_state : public snes_state { public: - sfcbox_state(const machine_config &mconfig, device_type type, std::string tag) + sfcbox_state(const machine_config &mconfig, device_type type, const char *tag) : snes_state(mconfig, type, tag), m_bios(*this, "bios"), m_mb90082(*this,"mb90082"), diff --git a/src/mame/drivers/sfkick.cpp b/src/mame/drivers/sfkick.cpp index 9c00afe6e5a..e94210e21fb 100644 --- a/src/mame/drivers/sfkick.cpp +++ b/src/mame/drivers/sfkick.cpp @@ -162,7 +162,7 @@ DIPSW-2 class sfkick_state : public driver_device { public: - sfkick_state(const machine_config &mconfig, device_type type, std::string tag) + sfkick_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_v9938(*this, "v9938"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/sg1000a.cpp b/src/mame/drivers/sg1000a.cpp index 0fe2f55055f..509146b18b9 100644 --- a/src/mame/drivers/sg1000a.cpp +++ b/src/mame/drivers/sg1000a.cpp @@ -124,7 +124,7 @@ CN4 CN5 class sg1000a_state : public driver_device { public: - sg1000a_state(const machine_config &mconfig, device_type type, std::string tag) + sg1000a_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_decrypted_opcodes(*this, "decrypted_opcodes") { } diff --git a/src/mame/drivers/sh4robot.cpp b/src/mame/drivers/sh4robot.cpp index ff829c87105..5ebe20f7530 100644 --- a/src/mame/drivers/sh4robot.cpp +++ b/src/mame/drivers/sh4robot.cpp @@ -33,7 +33,7 @@ class sh4robot_state : public driver_device { public: - sh4robot_state(const machine_config &mconfig, device_type type, std::string tag) + sh4robot_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/shanghai.cpp b/src/mame/drivers/shanghai.cpp index 68f37121809..1aeb26c541f 100644 --- a/src/mame/drivers/shanghai.cpp +++ b/src/mame/drivers/shanghai.cpp @@ -30,7 +30,7 @@ displayed. class shanghai_state : public driver_device { public: - shanghai_state(const machine_config &mconfig, device_type type, std::string tag) + shanghai_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_hd63484(*this, "hd63484") { } diff --git a/src/mame/drivers/shougi.cpp b/src/mame/drivers/shougi.cpp index c2d04c30d64..3d8a4a56374 100644 --- a/src/mame/drivers/shougi.cpp +++ b/src/mame/drivers/shougi.cpp @@ -87,7 +87,7 @@ PROM : Type MB7051 class shougi_state : public driver_device { public: - shougi_state(const machine_config &mconfig, device_type type, std::string tag) + shougi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/drivers/shtzone.cpp b/src/mame/drivers/shtzone.cpp index 32e51a0e847..59307b24c42 100644 --- a/src/mame/drivers/shtzone.cpp +++ b/src/mame/drivers/shtzone.cpp @@ -55,7 +55,7 @@ Notes: class shtzone_state : public driver_device { public: - shtzone_state(const machine_config &mconfig, device_type type, std::string tag) + shtzone_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp index c43e1498578..75299bfd274 100644 --- a/src/mame/drivers/sigmab52.cpp +++ b/src/mame/drivers/sigmab52.cpp @@ -139,7 +139,7 @@ class sigmab52_state : public driver_device { public: - sigmab52_state(const machine_config &mconfig, device_type type, std::string tag) + sigmab52_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp index bcf3b037f80..e0cdabeedaf 100644 --- a/src/mame/drivers/sigmab98.cpp +++ b/src/mame/drivers/sigmab98.cpp @@ -121,7 +121,7 @@ Notes: class sigmab98_state : public driver_device { public: - sigmab98_state(const machine_config &mconfig, device_type type, std::string tag) + sigmab98_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_buffered_spriteram(*this, "spriteram"), diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp index 2d796c98ac3..bff90fc7b16 100644 --- a/src/mame/drivers/silvmil.cpp +++ b/src/mame/drivers/silvmil.cpp @@ -34,7 +34,7 @@ Very likely to be 'whatever crystals we had on hand which were close enough for class silvmil_state : public driver_device { public: - silvmil_state(const machine_config &mconfig, device_type type, std::string tag) + silvmil_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/sitcom.cpp b/src/mame/drivers/sitcom.cpp index 4c7bcff671c..d257bd69076 100644 --- a/src/mame/drivers/sitcom.cpp +++ b/src/mame/drivers/sitcom.cpp @@ -40,7 +40,7 @@ class sitcom_state : public driver_device { public: - sitcom_state(const machine_config &mconfig, device_type type, std::string tag) + sitcom_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ds0(*this, "ds0"), diff --git a/src/mame/drivers/skeetsht.cpp b/src/mame/drivers/skeetsht.cpp index 59d935c0f05..cb1b7a054c5 100644 --- a/src/mame/drivers/skeetsht.cpp +++ b/src/mame/drivers/skeetsht.cpp @@ -28,7 +28,7 @@ class skeetsht_state : public driver_device { public: - skeetsht_state(const machine_config &mconfig, device_type type, std::string tag) + skeetsht_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tlc34076(*this, "tlc34076"), m_tms_vram(*this, "tms_vram"), diff --git a/src/mame/drivers/skimaxx.cpp b/src/mame/drivers/skimaxx.cpp index 7a1bb30c449..439f0cc874a 100644 --- a/src/mame/drivers/skimaxx.cpp +++ b/src/mame/drivers/skimaxx.cpp @@ -45,7 +45,7 @@ class skimaxx_state : public driver_device { public: - skimaxx_state(const machine_config &mconfig, device_type type, std::string tag) + skimaxx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), diff --git a/src/mame/drivers/skyarmy.cpp b/src/mame/drivers/skyarmy.cpp index 2cb6292cdf0..525b33ff8cb 100644 --- a/src/mame/drivers/skyarmy.cpp +++ b/src/mame/drivers/skyarmy.cpp @@ -34,7 +34,7 @@ class skyarmy_state : public driver_device { public: - skyarmy_state(const machine_config &mconfig, device_type type, std::string tag) + skyarmy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp index 76ec91b18a7..514df8d8100 100644 --- a/src/mame/drivers/skylncr.cpp +++ b/src/mame/drivers/skylncr.cpp @@ -99,7 +99,7 @@ class skylncr_state : public driver_device { public: - skylncr_state(const machine_config &mconfig, device_type type, std::string tag) + skylncr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/slc1.cpp b/src/mame/drivers/slc1.cpp index f92bea1cda0..f367e3b1705 100644 --- a/src/mame/drivers/slc1.cpp +++ b/src/mame/drivers/slc1.cpp @@ -57,7 +57,7 @@ Pasting doesn't work, but if it did... class slc1_state : public driver_device { public: - slc1_state(const machine_config &mconfig, device_type type, std::string tag) + slc1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker") diff --git a/src/mame/drivers/sleic.cpp b/src/mame/drivers/sleic.cpp index bb5db385349..a78e6b1e604 100644 --- a/src/mame/drivers/sleic.cpp +++ b/src/mame/drivers/sleic.cpp @@ -32,7 +32,7 @@ class sleic_state : public driver_device { public: - sleic_state(const machine_config &mconfig, device_type type, std::string tag) + sleic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/slicer.cpp b/src/mame/drivers/slicer.cpp index e4720c8fe55..ce294cfcea4 100644 --- a/src/mame/drivers/slicer.cpp +++ b/src/mame/drivers/slicer.cpp @@ -16,7 +16,7 @@ class slicer_state : public driver_device { public: - slicer_state(const machine_config &mconfig, device_type type, std::string tag) : + slicer_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fdc(*this, "fdc"), m_sasi(*this, "sasi") diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp index 8a94a2074f3..db675b6ab99 100644 --- a/src/mame/drivers/sliver.cpp +++ b/src/mame/drivers/sliver.cpp @@ -81,7 +81,7 @@ Notes: class sliver_state : public driver_device { public: - sliver_state(const machine_config &mconfig, device_type type, std::string tag) + sliver_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/slotcarn.cpp b/src/mame/drivers/slotcarn.cpp index a736bedfb83..643f696b7fe 100644 --- a/src/mame/drivers/slotcarn.cpp +++ b/src/mame/drivers/slotcarn.cpp @@ -35,7 +35,7 @@ class slotcarn_state : public driver_device { public: - slotcarn_state(const machine_config &mconfig, device_type type, std::string tag) + slotcarn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_backup_ram(*this, "backup_ram"), m_ram_attr(*this, "raattr"), diff --git a/src/mame/drivers/sm1800.cpp b/src/mame/drivers/sm1800.cpp index 63d80ce4664..f4baab35368 100644 --- a/src/mame/drivers/sm1800.cpp +++ b/src/mame/drivers/sm1800.cpp @@ -25,7 +25,7 @@ class sm1800_state : public driver_device { public: - sm1800_state(const machine_config &mconfig, device_type type, std::string tag) + sm1800_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_uart(*this, "i8251"), diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp index aea71a4b232..c4d6902b299 100644 --- a/src/mame/drivers/smc777.cpp +++ b/src/mame/drivers/smc777.cpp @@ -50,7 +50,7 @@ class smc777_state : public driver_device { public: - smc777_state(const machine_config &mconfig, device_type type, std::string tag) + smc777_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_crtc(*this, "crtc"), diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp index 8c3d428ea17..50f15e55cc1 100644 --- a/src/mame/drivers/smsmcorp.cpp +++ b/src/mame/drivers/smsmcorp.cpp @@ -225,7 +225,7 @@ U145 1Brown PAL14H4CN class smsmfg_state : public driver_device { public: - smsmfg_state(const machine_config &mconfig, device_type type, std::string tag) + smsmfg_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_screen(*this, "screen") { } diff --git a/src/mame/drivers/snes.cpp b/src/mame/drivers/snes.cpp index 0fb9bb97b59..55f81e89d75 100644 --- a/src/mame/drivers/snes.cpp +++ b/src/mame/drivers/snes.cpp @@ -40,7 +40,7 @@ class snes_console_state : public snes_state { public: - snes_console_state(const machine_config &mconfig, device_type type, std::string tag) + snes_console_state(const machine_config &mconfig, device_type type, const char *tag) : snes_state(mconfig, type, tag) , m_ctrl1(*this, "ctrl1") , m_ctrl2(*this, "ctrl2") diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp index 4ba27b621b9..e5980a70314 100644 --- a/src/mame/drivers/snesb.cpp +++ b/src/mame/drivers/snesb.cpp @@ -152,7 +152,7 @@ Iron PCB (same as Final Fight 2?) class snesb_state : public snes_state { public: - snesb_state(const machine_config &mconfig, device_type type, std::string tag) + snesb_state(const machine_config &mconfig, device_type type, const char *tag) : snes_state(mconfig, type, tag) { } std::unique_ptr m_shared_ram; diff --git a/src/mame/drivers/socrates.cpp b/src/mame/drivers/socrates.cpp index 966f7e5a999..ca422bc5d8b 100644 --- a/src/mame/drivers/socrates.cpp +++ b/src/mame/drivers/socrates.cpp @@ -98,7 +98,7 @@ public: TIMER_CLEAR_IRQ }; - socrates_state(const machine_config &mconfig, device_type type, std::string tag) + socrates_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_sound(*this, "soc_snd"), @@ -171,7 +171,7 @@ protected: class iqunlim_state : public socrates_state { public: - iqunlim_state(const machine_config &mconfig, device_type type, std::string tag) + iqunlim_state(const machine_config &mconfig, device_type type, const char *tag) : socrates_state(mconfig, type, tag), m_bank1(*this, "bank1"), m_bank2(*this, "bank2"), diff --git a/src/mame/drivers/sothello.cpp b/src/mame/drivers/sothello.cpp index 6016c86a669..c72767f767b 100644 --- a/src/mame/drivers/sothello.cpp +++ b/src/mame/drivers/sothello.cpp @@ -47,7 +47,7 @@ OSC : 8.0000MHz(X1) 21.477 MHz(X2) 384kHz(X3) class sothello_state : public driver_device { public: - sothello_state(const machine_config &mconfig, device_type type, std::string tag) + sothello_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_v9938(*this, "v9938") , m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/spaceg.cpp b/src/mame/drivers/spaceg.cpp index 80678652642..e7b81a0ac7b 100644 --- a/src/mame/drivers/spaceg.cpp +++ b/src/mame/drivers/spaceg.cpp @@ -178,7 +178,7 @@ Notes: class spaceg_state : public driver_device { public: - spaceg_state(const machine_config &mconfig, device_type type, std::string tag) + spaceg_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp index 447ffe44af5..c64a9effff6 100644 --- a/src/mame/drivers/spc1000.cpp +++ b/src/mame/drivers/spc1000.cpp @@ -147,7 +147,7 @@ NOTE: 2014-09-13: added code from someone's modified MESS driver for floppy class spc1000_state : public driver_device { public: - spc1000_state(const machine_config &mconfig, device_type type, std::string tag) + spc1000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_vdg(*this, "mc6847") diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp index c56b41661d9..2017c27f3e7 100644 --- a/src/mame/drivers/spc1500.cpp +++ b/src/mame/drivers/spc1500.cpp @@ -237,7 +237,7 @@ TODO: class spc1500_state : public driver_device { public: - spc1500_state(const machine_config &mconfig, device_type type, std::string tag) + spc1500_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_vdg(*this, "mc6845") diff --git a/src/mame/drivers/spectra.cpp b/src/mame/drivers/spectra.cpp index f09e607ead9..3bcc3054252 100644 --- a/src/mame/drivers/spectra.cpp +++ b/src/mame/drivers/spectra.cpp @@ -46,7 +46,7 @@ ToDo: class spectra_state : public genpin_class { public: - spectra_state(const machine_config &mconfig, device_type type, std::string tag) + spectra_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_snsnd(*this, "snsnd") diff --git a/src/mame/drivers/speglsht.cpp b/src/mame/drivers/speglsht.cpp index 3a326b79473..74aee52aee1 100644 --- a/src/mame/drivers/speglsht.cpp +++ b/src/mame/drivers/speglsht.cpp @@ -113,7 +113,7 @@ Notes: class speglsht_state : public driver_device { public: - speglsht_state(const machine_config &mconfig, device_type type, std::string tag) + speglsht_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_shared(*this, "shared"), m_framebuffer(*this, "framebuffer"), diff --git a/src/mame/drivers/spinb.cpp b/src/mame/drivers/spinb.cpp index ff63a3f702f..77c995501b3 100644 --- a/src/mame/drivers/spinb.cpp +++ b/src/mame/drivers/spinb.cpp @@ -40,7 +40,7 @@ ToDo: class spinb_state : public genpin_class { public: - spinb_state(const machine_config &mconfig, device_type type, std::string tag) + spinb_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_audiocpu(*this, "audiocpu") diff --git a/src/mame/drivers/splus.cpp b/src/mame/drivers/splus.cpp index e16eed9b257..195303ac413 100644 --- a/src/mame/drivers/splus.cpp +++ b/src/mame/drivers/splus.cpp @@ -33,7 +33,7 @@ class splus_state : public driver_device { public: - splus_state(const machine_config &mconfig, device_type type, std::string tag) + splus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cmosl_ram(*this, "cmosl"), m_cmosh_ram(*this, "cmosh"), diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp index a2a01911c7d..6c7b74529e9 100644 --- a/src/mame/drivers/spoker.cpp +++ b/src/mame/drivers/spoker.cpp @@ -27,7 +27,7 @@ TODO: class spoker_state : public driver_device { public: - spoker_state(const machine_config &mconfig, device_type type, std::string tag) + spoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/spool99.cpp b/src/mame/drivers/spool99.cpp index 26f449aaa55..7b331e14ccd 100644 --- a/src/mame/drivers/spool99.cpp +++ b/src/mame/drivers/spool99.cpp @@ -99,7 +99,7 @@ Note class spool99_state : public driver_device { public: - spool99_state(const machine_config &mconfig, device_type type, std::string tag) + spool99_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp index 39b85285bd2..81f215526b4 100644 --- a/src/mame/drivers/squale.cpp +++ b/src/mame/drivers/squale.cpp @@ -73,7 +73,7 @@ class squale_state : public driver_device { public: - squale_state(const machine_config &mconfig, device_type type, std::string tag) + squale_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_acia(*this, "ef6850") , m_ay8910(*this, "ay8910") diff --git a/src/mame/drivers/srmp5.cpp b/src/mame/drivers/srmp5.cpp index ef6b4c23cc0..1ecfd8a1f0a 100644 --- a/src/mame/drivers/srmp5.cpp +++ b/src/mame/drivers/srmp5.cpp @@ -66,7 +66,7 @@ This is not a bug (real machine behaves the same). class srmp5_state : public driver_device { public: - srmp5_state(const machine_config &mconfig, device_type type, std::string tag) + srmp5_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), diff --git a/src/mame/drivers/srmp6.cpp b/src/mame/drivers/srmp6.cpp index 91a1dac4a96..d6a1eb8af64 100644 --- a/src/mame/drivers/srmp6.cpp +++ b/src/mame/drivers/srmp6.cpp @@ -75,7 +75,7 @@ Dumped 06/15/2000 class srmp6_state : public driver_device { public: - srmp6_state(const machine_config &mconfig, device_type type, std::string tag) + srmp6_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sprram(*this, "sprram"), m_chrram(*this, "chrram"), diff --git a/src/mame/drivers/ssem.cpp b/src/mame/drivers/ssem.cpp index 6d726f8ce3b..56090713130 100644 --- a/src/mame/drivers/ssem.cpp +++ b/src/mame/drivers/ssem.cpp @@ -14,7 +14,7 @@ class ssem_state : public driver_device { public: - ssem_state(const machine_config &mconfig, device_type type, std::string tag) + ssem_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_store(*this, "store"), diff --git a/src/mame/drivers/ssfindo.cpp b/src/mame/drivers/ssfindo.cpp index 8137f6c5f14..ae392906118 100644 --- a/src/mame/drivers/ssfindo.cpp +++ b/src/mame/drivers/ssfindo.cpp @@ -217,7 +217,7 @@ enum class ssfindo_state : public driver_device { public: - ssfindo_state(const machine_config &mconfig, device_type type, std::string tag) + ssfindo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette"), diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp index 174722abdfc..97075424ff0 100644 --- a/src/mame/drivers/sshot.cpp +++ b/src/mame/drivers/sshot.cpp @@ -171,7 +171,7 @@ Given CS numbers this is released after the other GunChamp class supershot_state : public driver_device { public: - supershot_state(const machine_config &mconfig, device_type type, std::string tag) + supershot_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/ssingles.cpp b/src/mame/drivers/ssingles.cpp index 5da182aa15e..fddf894e050 100644 --- a/src/mame/drivers/ssingles.cpp +++ b/src/mame/drivers/ssingles.cpp @@ -157,7 +157,7 @@ Dumped by Chack'n class ssingles_state : public driver_device { public: - ssingles_state(const machine_config &mconfig, device_type type, std::string tag) + ssingles_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/sstrangr.cpp b/src/mame/drivers/sstrangr.cpp index fdd53ae7b3c..c0d114c0abf 100644 --- a/src/mame/drivers/sstrangr.cpp +++ b/src/mame/drivers/sstrangr.cpp @@ -16,7 +16,7 @@ class sstrangr_state : public driver_device { public: - sstrangr_state(const machine_config &mconfig, device_type type, std::string tag) + sstrangr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette"), diff --git a/src/mame/drivers/st17xx.cpp b/src/mame/drivers/st17xx.cpp index c2dba467366..f3ba9428aea 100644 --- a/src/mame/drivers/st17xx.cpp +++ b/src/mame/drivers/st17xx.cpp @@ -45,7 +45,7 @@ class st17xx_state : public driver_device { public: - st17xx_state(const machine_config &mconfig, device_type type, std::string tag) + st17xx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } virtual void machine_start() override; diff --git a/src/mame/drivers/st_mp100.cpp b/src/mame/drivers/st_mp100.cpp index 2927e008b81..7319daffee8 100644 --- a/src/mame/drivers/st_mp100.cpp +++ b/src/mame/drivers/st_mp100.cpp @@ -24,7 +24,7 @@ ToDo: class st_mp100_state : public genpin_class { public: - st_mp100_state(const machine_config &mconfig, device_type type, std::string tag) + st_mp100_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_pia_u10(*this, "pia_u10") diff --git a/src/mame/drivers/st_mp200.cpp b/src/mame/drivers/st_mp200.cpp index 175ce486d1e..1a15b5dc249 100644 --- a/src/mame/drivers/st_mp200.cpp +++ b/src/mame/drivers/st_mp200.cpp @@ -27,7 +27,7 @@ ToDo: class st_mp200_state : public genpin_class { public: - st_mp200_state(const machine_config &mconfig, device_type type, std::string tag) + st_mp200_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_s14001a(*this, "speech") diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp index 2d57cece8e8..6546425f10c 100644 --- a/src/mame/drivers/statriv2.cpp +++ b/src/mame/drivers/statriv2.cpp @@ -81,7 +81,7 @@ quaquiz2 - no inputs, needs NVRAM class statriv2_state : public driver_device { public: - statriv2_state(const machine_config &mconfig, device_type type, std::string tag) + statriv2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tms(*this, "tms"), diff --git a/src/mame/drivers/stellafr.cpp b/src/mame/drivers/stellafr.cpp index fcecf713e22..af12d541c47 100644 --- a/src/mame/drivers/stellafr.cpp +++ b/src/mame/drivers/stellafr.cpp @@ -17,7 +17,7 @@ Possibly related to ADP hardware? class stellafr_state : public driver_device { public: - stellafr_state(const machine_config &mconfig, device_type type, std::string tag) + stellafr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/stratos.cpp b/src/mame/drivers/stratos.cpp index a27df35718f..62de51b640c 100644 --- a/src/mame/drivers/stratos.cpp +++ b/src/mame/drivers/stratos.cpp @@ -13,7 +13,7 @@ class stratos_state : public driver_device { public: - stratos_state(const machine_config &mconfig, device_type type, std::string tag) + stratos_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), maincpu(*this, "maincpu"), nvram(*this, "nvram"), diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp index 590ca454ccb..99b8cf5738b 100644 --- a/src/mame/drivers/studio2.cpp +++ b/src/mame/drivers/studio2.cpp @@ -203,7 +203,7 @@ class studio2_state : public driver_device { public: - studio2_state(const machine_config &mconfig, device_type type, std::string tag) + studio2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, CDP1802_TAG), m_beeper(*this, "beeper"), @@ -248,7 +248,7 @@ public: class visicom_state : public studio2_state { public: - visicom_state(const machine_config &mconfig, device_type type, std::string tag) + visicom_state(const machine_config &mconfig, device_type type, const char *tag) : studio2_state(mconfig, type, tag), m_color0_ram(*this, "color0_ram"), m_color1_ram(*this, "color1_ram") @@ -265,7 +265,7 @@ public: class mpt02_state : public studio2_state { public: - mpt02_state(const machine_config &mconfig, device_type type, std::string tag) + mpt02_state(const machine_config &mconfig, device_type type, const char *tag) : studio2_state(mconfig, type, tag), m_cti(*this, CDP1864_TAG), m_color_ram(*this, "color_ram") diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp index f5019cdfc3b..749416a13c5 100644 --- a/src/mame/drivers/stuntair.cpp +++ b/src/mame/drivers/stuntair.cpp @@ -86,7 +86,7 @@ Bprom dump by f205v class stuntair_state : public driver_device { public: - stuntair_state(const machine_config &mconfig, device_type type, std::string tag) + stuntair_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/su2000.cpp b/src/mame/drivers/su2000.cpp index 273a88a0f7e..2beaf6623ca 100644 --- a/src/mame/drivers/su2000.cpp +++ b/src/mame/drivers/su2000.cpp @@ -63,7 +63,7 @@ class su2000_state : public pcat_base_state { public: - su2000_state(const machine_config &mconfig, device_type type, std::string tag) + su2000_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag){ } std::unique_ptr m_pc_ram; diff --git a/src/mame/drivers/sub.cpp b/src/mame/drivers/sub.cpp index 0c5658b684d..9b2487ce495 100644 --- a/src/mame/drivers/sub.cpp +++ b/src/mame/drivers/sub.cpp @@ -117,7 +117,7 @@ PCB2 (Top board, CPU board) class sub_state : public driver_device { public: - sub_state(const machine_config &mconfig, device_type type, std::string tag) + sub_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/drivers/subhuntr.cpp b/src/mame/drivers/subhuntr.cpp index 5335497355d..aaa95c647d5 100644 --- a/src/mame/drivers/subhuntr.cpp +++ b/src/mame/drivers/subhuntr.cpp @@ -26,7 +26,7 @@ QTY Type position class subhuntr_state : public driver_device { public: - subhuntr_state(const machine_config &mconfig, device_type type, std::string tag) + subhuntr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp index 5b884f68e6d..716d1955f2c 100644 --- a/src/mame/drivers/subsino.cpp +++ b/src/mame/drivers/subsino.cpp @@ -237,7 +237,7 @@ To Do: class subsino_state : public driver_device { public: - subsino_state(const machine_config &mconfig, device_type type, std::string tag) + subsino_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp index ec0aed454b7..62a727e4b8f 100644 --- a/src/mame/drivers/subsino2.cpp +++ b/src/mame/drivers/subsino2.cpp @@ -78,7 +78,7 @@ struct layer_t class subsino2_state : public driver_device { public: - subsino2_state(const machine_config &mconfig, device_type type, std::string tag) + subsino2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_outputs16(*this, "outputs16"), m_outputs(*this, "outputs"), diff --git a/src/mame/drivers/summit.cpp b/src/mame/drivers/summit.cpp index 9622d4652d1..9058af8401e 100644 --- a/src/mame/drivers/summit.cpp +++ b/src/mame/drivers/summit.cpp @@ -24,7 +24,7 @@ needs inputs, prom decode, sound, artwork (lamps), probably some irq masking and class summit_state : public driver_device { public: - summit_state(const machine_config &mconfig, device_type type, std::string tag) + summit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_attr(*this, "attr"), m_vram(*this, "vram"), diff --git a/src/mame/drivers/sumt8035.cpp b/src/mame/drivers/sumt8035.cpp index 4aac950f85e..9de2d25a847 100644 --- a/src/mame/drivers/sumt8035.cpp +++ b/src/mame/drivers/sumt8035.cpp @@ -19,7 +19,7 @@ hardware. We don't have the ROMs for that though. class sumt8035_state : public driver_device { public: - sumt8035_state(const machine_config &mconfig, device_type type, std::string tag) + sumt8035_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/sun1.cpp b/src/mame/drivers/sun1.cpp index 8a9f492eb06..7f8b109f207 100644 --- a/src/mame/drivers/sun1.cpp +++ b/src/mame/drivers/sun1.cpp @@ -59,7 +59,7 @@ class sun1_state : public driver_device { public: - sun1_state(const machine_config &mconfig, device_type type, std::string tag) + sun1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/sun2.cpp b/src/mame/drivers/sun2.cpp index 7b7ca221219..80862bcf5ec 100644 --- a/src/mame/drivers/sun2.cpp +++ b/src/mame/drivers/sun2.cpp @@ -78,7 +78,7 @@ class sun2_state : public driver_device { public: - sun2_state(const machine_config &mconfig, device_type type, std::string tag) + sun2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") , diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp index 7e41e2954d4..00126ba93a9 100644 --- a/src/mame/drivers/sun3.cpp +++ b/src/mame/drivers/sun3.cpp @@ -304,7 +304,7 @@ class sun3_state : public driver_device { public: - sun3_state(const machine_config &mconfig, device_type type, std::string tag) + sun3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_scc1(*this, SCC1_TAG), diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp index 5e117a73a84..91c0edf530f 100644 --- a/src/mame/drivers/sun4.cpp +++ b/src/mame/drivers/sun4.cpp @@ -392,7 +392,7 @@ class sun4_state : public driver_device { public: - sun4_state(const machine_config &mconfig, device_type type, std::string tag) + sun4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/supdrapo.cpp b/src/mame/drivers/supdrapo.cpp index 9fcf5d579aa..447e0736208 100644 --- a/src/mame/drivers/supdrapo.cpp +++ b/src/mame/drivers/supdrapo.cpp @@ -70,7 +70,7 @@ class supdrapo_state : public driver_device { public: - supdrapo_state(const machine_config &mconfig, device_type type, std::string tag) + supdrapo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp index a0f0f7c9bd7..1c297de8966 100644 --- a/src/mame/drivers/supduck.cpp +++ b/src/mame/drivers/supduck.cpp @@ -31,7 +31,7 @@ All clock timing comes from crystal 1 class supduck_state : public driver_device { public: - supduck_state(const machine_config &mconfig, device_type type, std::string tag) + supduck_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/supercon.cpp b/src/mame/drivers/supercon.cpp index 97e8ef20821..be2198189f1 100644 --- a/src/mame/drivers/supercon.cpp +++ b/src/mame/drivers/supercon.cpp @@ -27,7 +27,7 @@ class supercon_state : public driver_device { public: - supercon_state(const machine_config &mconfig, device_type type, std::string tag) + supercon_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_beep(*this, "beeper"), diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp index 1aa7b9cc67a..d76082e7266 100644 --- a/src/mame/drivers/supercrd.cpp +++ b/src/mame/drivers/supercrd.cpp @@ -174,7 +174,7 @@ class supercrd_state : public driver_device { public: - supercrd_state(const machine_config &mconfig, device_type type, std::string tag) + supercrd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp index c5dd0bb2801..800684765ee 100644 --- a/src/mame/drivers/superdq.cpp +++ b/src/mame/drivers/superdq.cpp @@ -31,7 +31,7 @@ class superdq_state : public driver_device { public: - superdq_state(const machine_config &mconfig, device_type type, std::string tag) + superdq_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc") , m_videoram(*this, "videoram"), diff --git a/src/mame/drivers/supertnk.cpp b/src/mame/drivers/supertnk.cpp index 633d00f5085..938ab46a2fc 100644 --- a/src/mame/drivers/supertnk.cpp +++ b/src/mame/drivers/supertnk.cpp @@ -110,7 +110,7 @@ CRU lines: class supertnk_state : public driver_device { public: - supertnk_state(const machine_config &mconfig, device_type type, std::string tag) + supertnk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp index f4bd6b7c623..cf599bd80dd 100644 --- a/src/mame/drivers/superwng.cpp +++ b/src/mame/drivers/superwng.cpp @@ -41,7 +41,7 @@ TODO: class superwng_state : public driver_device { public: - superwng_state(const machine_config &mconfig, device_type type, std::string tag) + superwng_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp index 872ef866cc3..b342c846295 100644 --- a/src/mame/drivers/supracan.cpp +++ b/src/mame/drivers/supracan.cpp @@ -116,7 +116,7 @@ struct acan_sprdma_regs_t class supracan_state : public driver_device { public: - supracan_state(const machine_config &mconfig, device_type type, std::string tag) + supracan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), @@ -222,7 +222,7 @@ public: TIMER_CALLBACK_MEMBER(supracan_line_off_callback); TIMER_CALLBACK_MEMBER(supracan_video_callback); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(supracan_cart); - inline void verboselog(std::string tag, int n_level, const char *s_fmt, ...) ATTR_PRINTF(4,5); + inline void verboselog(const char *tag, int n_level, const char *s_fmt, ...) ATTR_PRINTF(4,5); int supracan_tilemap_get_region(int layer); void supracan_tilemap_get_info_common(int layer, tile_data &tileinfo, int count); void supracan_tilemap_get_info_roz(int layer, tile_data &tileinfo, int count); @@ -236,7 +236,7 @@ public: -inline void supracan_state::verboselog(std::string tag, int n_level, const char *s_fmt, ...) +inline void supracan_state::verboselog(const char *tag, int n_level, const char *s_fmt, ...) { #if ENABLE_VERBOSE_LOG if( VERBOSE_LEVEL >= n_level ) @@ -246,7 +246,7 @@ inline void supracan_state::verboselog(std::string tag, int n_level, const char va_start( v, s_fmt ); vsprintf( buf, s_fmt, v ); va_end( v ); - logerror( "%06x: %s: %s", machine().device(tag)->safe_pc(), tag.c_str(), buf ); + logerror( "%06x: %s: %s", machine().device(tag)->safe_pc(), tag, buf ); } #endif } diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp index 4e6b3770e8c..c83dbb32a0c 100644 --- a/src/mame/drivers/suprgolf.cpp +++ b/src/mame/drivers/suprgolf.cpp @@ -31,7 +31,7 @@ class suprgolf_state : public driver_device { public: - suprgolf_state(const machine_config &mconfig, device_type type, std::string tag) + suprgolf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp index e89caa7259c..95d08b082c5 100644 --- a/src/mame/drivers/suprnova.cpp +++ b/src/mame/drivers/suprnova.cpp @@ -456,7 +456,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(skns_state::skns_irq) CUSTOM_INPUT_MEMBER(skns_state::paddle_r) { - std::string tag = (const char *)param; + const char *tag = (const char *)param; return ioport(tag)->read(); } diff --git a/src/mame/drivers/sv8000.cpp b/src/mame/drivers/sv8000.cpp index 8c61fc1d78e..dcb9db8cec5 100644 --- a/src/mame/drivers/sv8000.cpp +++ b/src/mame/drivers/sv8000.cpp @@ -37,7 +37,7 @@ Looking at the code of the cartridges it seems there is: class sv8000_state : public driver_device { public: - sv8000_state(const machine_config &mconfig, device_type type, std::string tag) + sv8000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_s68047p(*this, "s68047p") diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp index 74000caa19f..da2ff7e3765 100644 --- a/src/mame/drivers/svmu.cpp +++ b/src/mame/drivers/svmu.cpp @@ -26,7 +26,7 @@ class svmu_state : public driver_device { public: - svmu_state(const machine_config &mconfig, device_type type, std::string tag) + svmu_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_flash(*this, "flash"), diff --git a/src/mame/drivers/swtpc.cpp b/src/mame/drivers/swtpc.cpp index 382bd7af65c..f36476d6a62 100644 --- a/src/mame/drivers/swtpc.cpp +++ b/src/mame/drivers/swtpc.cpp @@ -49,7 +49,7 @@ Z Goto Prom (0xC000) class swtpc_state : public driver_device { public: - swtpc_state(const machine_config &mconfig, device_type type, std::string tag) + swtpc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp index 2383362d21e..27827228b3b 100644 --- a/src/mame/drivers/swyft.cpp +++ b/src/mame/drivers/swyft.cpp @@ -296,7 +296,7 @@ ToDo: class swyft_state : public driver_device { public: - swyft_state(const machine_config &mconfig, device_type type, std::string tag) + swyft_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ctx(*this, "ctx"), diff --git a/src/mame/drivers/sym1.cpp b/src/mame/drivers/sym1.cpp index 3587635b4aa..231703d1df1 100644 --- a/src/mame/drivers/sym1.cpp +++ b/src/mame/drivers/sym1.cpp @@ -33,7 +33,7 @@ class sym1_state : public driver_device { public: - sym1_state(const machine_config &mconfig, device_type type, std::string tag) + sym1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram_1k(*this, "ram_1k"), m_ram_2k(*this, "ram_2k"), diff --git a/src/mame/drivers/sys2900.cpp b/src/mame/drivers/sys2900.cpp index 9934419f601..848ec90ff58 100644 --- a/src/mame/drivers/sys2900.cpp +++ b/src/mame/drivers/sys2900.cpp @@ -47,7 +47,7 @@ public: TIMER_BOOT }; - sys2900_state(const machine_config &mconfig, device_type type, std::string tag) + sys2900_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/systec.cpp b/src/mame/drivers/systec.cpp index d87257355cd..de504cfa90e 100644 --- a/src/mame/drivers/systec.cpp +++ b/src/mame/drivers/systec.cpp @@ -42,7 +42,7 @@ class systec_state : public driver_device { public: - systec_state(const machine_config &mconfig, device_type type, std::string tag) + systec_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp index 774498c3e02..74ed96d8703 100644 --- a/src/mame/drivers/taito.cpp +++ b/src/mame/drivers/taito.cpp @@ -53,7 +53,7 @@ ToDO: class taito_state : public genpin_class { public: - taito_state(const machine_config &mconfig, device_type type, std::string tag) + taito_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_cpu2(*this, "audiocpu") diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp index 084b752f707..16fbc1beb8c 100644 --- a/src/mame/drivers/taito_z.cpp +++ b/src/mame/drivers/taito_z.cpp @@ -1104,7 +1104,7 @@ WRITE16_MEMBER(taitoz_state::spacegun_output_bypass_w) CUSTOM_INPUT_MEMBER(taitoz_state::taitoz_pedal_r) { static const UINT8 retval[8] = { 0,1,3,2,6,7,5,4 }; - std::string tag = (const char *)param; + const char *tag = (const char *)param; return retval[read_safe(ioport(tag), 0) & 7]; } diff --git a/src/mame/drivers/taitogn.cpp b/src/mame/drivers/taitogn.cpp index e7701789710..1077996e020 100644 --- a/src/mame/drivers/taitogn.cpp +++ b/src/mame/drivers/taitogn.cpp @@ -346,7 +346,7 @@ Type 3 (PCMCIA Compact Flash Adaptor + Compact Flash card, sealed together with class taitogn_state : public driver_device { public: - taitogn_state(const machine_config &mconfig, device_type type, std::string tag) : + taitogn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sio0(*this, "maincpu:sio0"), m_cat702_1(*this, "cat702_1"), diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp index dcb6434add3..c9e6807add9 100644 --- a/src/mame/drivers/taitopjc.cpp +++ b/src/mame/drivers/taitopjc.cpp @@ -98,7 +98,7 @@ class taitopjc_state : public driver_device { public: - taitopjc_state(const machine_config &mconfig, device_type type, std::string tag) + taitopjc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_iocpu(*this, "iocpu"), diff --git a/src/mame/drivers/taitottl.cpp b/src/mame/drivers/taitottl.cpp index 8d66b5ece4f..c8dda24ca9f 100644 --- a/src/mame/drivers/taitottl.cpp +++ b/src/mame/drivers/taitottl.cpp @@ -88,7 +88,7 @@ class taitottl_state : public driver_device { public: - taitottl_state(const machine_config &mconfig, device_type type, std::string tag) + taitottl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_video(*this, "fixfreq") diff --git a/src/mame/drivers/taitotx.cpp b/src/mame/drivers/taitotx.cpp index d56aa687645..1e45b8e9422 100644 --- a/src/mame/drivers/taitotx.cpp +++ b/src/mame/drivers/taitotx.cpp @@ -122,7 +122,7 @@ class taito_type_x_state : public driver_device { public: - taito_type_x_state(const machine_config &mconfig, device_type type, std::string tag) + taito_type_x_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/taitotz.cpp b/src/mame/drivers/taitotz.cpp index 6e11d26665c..6e047292565 100644 --- a/src/mame/drivers/taitotz.cpp +++ b/src/mame/drivers/taitotz.cpp @@ -538,7 +538,7 @@ class taitotz_renderer; class taitotz_state : public driver_device { public: - taitotz_state(const machine_config &mconfig, device_type type, std::string tag) + taitotz_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_iocpu(*this, "iocpu"), diff --git a/src/mame/drivers/taitowlf.cpp b/src/mame/drivers/taitowlf.cpp index ff7c842fbf8..eba6d93fed2 100644 --- a/src/mame/drivers/taitowlf.cpp +++ b/src/mame/drivers/taitowlf.cpp @@ -39,7 +39,7 @@ clocks 50MHz (near 3DFX) and 14.31818MHz (near RAMDAC) class taitowlf_state : public pcat_base_state { public: - taitowlf_state(const machine_config &mconfig, device_type type, std::string tag) + taitowlf_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag), m_bootscreen_rom(*this, "bootscreen"), m_bank1(*this, "bank1"), diff --git a/src/mame/drivers/tamag1.cpp b/src/mame/drivers/tamag1.cpp index d260ba91f34..1275d33f0c7 100644 --- a/src/mame/drivers/tamag1.cpp +++ b/src/mame/drivers/tamag1.cpp @@ -18,7 +18,7 @@ class tamag1_state : public driver_device { public: - tamag1_state(const machine_config &mconfig, device_type type, std::string tag) + tamag1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker") diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index 4da19fbfc2e..3ba893c7610 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -47,7 +47,7 @@ Tandy 1000 (80386) variations: class tandy1000_state : public driver_device { public: - tandy1000_state(const machine_config &mconfig, device_type type, std::string tag) + tandy1000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_romcs0(*this, "romcs0") diff --git a/src/mame/drivers/tapatune.cpp b/src/mame/drivers/tapatune.cpp index 8d4da5a660d..e02844b555f 100644 --- a/src/mame/drivers/tapatune.cpp +++ b/src/mame/drivers/tapatune.cpp @@ -52,7 +52,7 @@ class tapatune_state : public driver_device { public: - tapatune_state(const machine_config &mconfig, device_type type, std::string tag) + tapatune_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_videocpu(*this, "videocpu"), diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp index ccec37f5450..a9c65694c9b 100644 --- a/src/mame/drivers/tasman.cpp +++ b/src/mame/drivers/tasman.cpp @@ -31,7 +31,7 @@ class kongambl_state : public konamigx_state // with everything devicified there's probably not much point in inheriting the GX state. { public: - kongambl_state(const machine_config &mconfig, device_type type, std::string tag) + kongambl_state(const machine_config &mconfig, device_type type, const char *tag) : konamigx_state(mconfig, type, tag), m_vram(*this, "vram") { } diff --git a/src/mame/drivers/tattack.cpp b/src/mame/drivers/tattack.cpp index d652c617423..71c2b5fba29 100644 --- a/src/mame/drivers/tattack.cpp +++ b/src/mame/drivers/tattack.cpp @@ -27,7 +27,7 @@ class tattack_state : public driver_device { public: - tattack_state(const machine_config &mconfig, device_type type, std::string tag) + tattack_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp index 7414675058e..4733eacb843 100644 --- a/src/mame/drivers/tavernie.cpp +++ b/src/mame/drivers/tavernie.cpp @@ -67,7 +67,7 @@ Z - more scan lines per row (cursor is bigger) class tavernie_state : public driver_device { public: - tavernie_state(const machine_config &mconfig, device_type type, std::string tag) : + tavernie_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_videoram(*this, "videoram"), m_cass(*this, "cassette"), diff --git a/src/mame/drivers/tb303.cpp b/src/mame/drivers/tb303.cpp index 82431a736a7..6788bb1257d 100644 --- a/src/mame/drivers/tb303.cpp +++ b/src/mame/drivers/tb303.cpp @@ -22,7 +22,7 @@ class tb303_state : public hh_ucom4_state { public: - tb303_state(const machine_config &mconfig, device_type type, std::string tag) + tb303_state(const machine_config &mconfig, device_type type, const char *tag) : hh_ucom4_state(mconfig, type, tag), m_t3_off_timer(*this, "t3_off") { } diff --git a/src/mame/drivers/tcl.cpp b/src/mame/drivers/tcl.cpp index b92747ae63f..cf5fe80f93a 100644 --- a/src/mame/drivers/tcl.cpp +++ b/src/mame/drivers/tcl.cpp @@ -51,7 +51,7 @@ Notes: class tcl_state : public driver_device { public: - tcl_state(const machine_config &mconfig, device_type type, std::string tag) + tcl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/tec1.cpp b/src/mame/drivers/tec1.cpp index 9dbcaaf376e..99714f7e97a 100644 --- a/src/mame/drivers/tec1.cpp +++ b/src/mame/drivers/tec1.cpp @@ -82,7 +82,7 @@ JMON ToDo: class tec1_state : public driver_device { public: - tec1_state(const machine_config &mconfig, device_type type, std::string tag) + tec1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/drivers/techno.cpp b/src/mame/drivers/techno.cpp index e7926eeb245..7448583160b 100644 --- a/src/mame/drivers/techno.cpp +++ b/src/mame/drivers/techno.cpp @@ -22,7 +22,7 @@ ToDo: class techno_state : public driver_device { public: - techno_state(const machine_config &mconfig, device_type type, std::string tag) + techno_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_switch(*this, "SWITCH") diff --git a/src/mame/drivers/tecnbras.cpp b/src/mame/drivers/tecnbras.cpp index 12cb87e492d..0d566901141 100644 --- a/src/mame/drivers/tecnbras.cpp +++ b/src/mame/drivers/tecnbras.cpp @@ -26,7 +26,7 @@ class tecnbras_state : public driver_device { public: - tecnbras_state(const machine_config &mconfig, device_type type, std::string tag) + tecnbras_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/tek410x.cpp b/src/mame/drivers/tek410x.cpp index 0bee49b90ef..b4677554dff 100644 --- a/src/mame/drivers/tek410x.cpp +++ b/src/mame/drivers/tek410x.cpp @@ -26,7 +26,7 @@ class tek4107a_state : public driver_device { public: - tek4107a_state(const machine_config &mconfig, device_type type, std::string tag) + tek4107a_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } virtual void machine_start() override; diff --git a/src/mame/drivers/tekxp33x.cpp b/src/mame/drivers/tekxp33x.cpp index 24f61d03b37..5e90c391c22 100644 --- a/src/mame/drivers/tekxp33x.cpp +++ b/src/mame/drivers/tekxp33x.cpp @@ -44,7 +44,7 @@ class tekxp330_state : public driver_device { public: - tekxp330_state(const machine_config &mconfig, device_type type, std::string tag) + tekxp330_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } virtual void machine_start() override; diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp index 994d27b5865..514f705cdbf 100644 --- a/src/mame/drivers/tempest.cpp +++ b/src/mame/drivers/tempest.cpp @@ -295,7 +295,7 @@ Note: Roms for Tempest Analog Vector-Generator PCB Assembly A037383-03 or A03738 class tempest_state : public driver_device { public: - tempest_state(const machine_config &mconfig, device_type type, std::string tag) + tempest_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mathbox(*this, "mathbox"), diff --git a/src/mame/drivers/terak.cpp b/src/mame/drivers/terak.cpp index f192ed613cc..714a2d3fcfb 100644 --- a/src/mame/drivers/terak.cpp +++ b/src/mame/drivers/terak.cpp @@ -14,7 +14,7 @@ class terak_state : public driver_device { public: - terak_state(const machine_config &mconfig, device_type type, std::string tag) + terak_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/test_t400.cpp b/src/mame/drivers/test_t400.cpp index c3e5afdfdd7..b577d3c77a4 100644 --- a/src/mame/drivers/test_t400.cpp +++ b/src/mame/drivers/test_t400.cpp @@ -14,7 +14,7 @@ class t400_test_suite_state : public driver_device { public: - t400_test_suite_state(const machine_config &mconfig, device_type type, std::string tag) + t400_test_suite_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/tgtpanic.cpp b/src/mame/drivers/tgtpanic.cpp index f67d4834df4..da033c37e05 100644 --- a/src/mame/drivers/tgtpanic.cpp +++ b/src/mame/drivers/tgtpanic.cpp @@ -18,7 +18,7 @@ class tgtpanic_state : public driver_device { public: - tgtpanic_state(const machine_config &mconfig, device_type type, std::string tag) + tgtpanic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_screen(*this, "screen"), diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp index b8d864601d5..88db79b9569 100644 --- a/src/mame/drivers/thayers.cpp +++ b/src/mame/drivers/thayers.cpp @@ -42,7 +42,7 @@ public: TIMER_SSI263_PHONEME_TICK }; - thayers_state(const machine_config &mconfig, device_type type, std::string tag) + thayers_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_pr7820(*this, "laserdisc"), m_ldv1000(*this, "ldv1000"), diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp index 2c86fadfed1..d6e9698474a 100644 --- a/src/mame/drivers/thedealr.cpp +++ b/src/mame/drivers/thedealr.cpp @@ -37,7 +37,7 @@ class thedealr_state : public driver_device { public: - thedealr_state(const machine_config &mconfig, device_type type, std::string tag) + thedealr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), diff --git a/src/mame/drivers/ti630.cpp b/src/mame/drivers/ti630.cpp index 4b09e2e6ded..910fecc3aae 100644 --- a/src/mame/drivers/ti630.cpp +++ b/src/mame/drivers/ti630.cpp @@ -42,7 +42,7 @@ It means we probably would have to emulate a modem device for it to treat commun class ti630_state : public driver_device { public: - ti630_state(const machine_config &mconfig, device_type type, std::string tag) + ti630_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_lcdc(*this, "hd44780") diff --git a/src/mame/drivers/ti74.cpp b/src/mame/drivers/ti74.cpp index 96502dfc9e0..9c01b6ceea2 100644 --- a/src/mame/drivers/ti74.cpp +++ b/src/mame/drivers/ti74.cpp @@ -84,7 +84,7 @@ class ti74_state : public driver_device { public: - ti74_state(const machine_config &mconfig, device_type type, std::string tag) + ti74_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cart(*this, "cartslot"), diff --git a/src/mame/drivers/ti990_10.cpp b/src/mame/drivers/ti990_10.cpp index 0ec7684f6a8..58264bae51f 100644 --- a/src/mame/drivers/ti990_10.cpp +++ b/src/mame/drivers/ti990_10.cpp @@ -81,7 +81,7 @@ TODO : class ti990_10_state : public driver_device { public: - ti990_10_state(const machine_config &mconfig, device_type type, std::string tag) + ti990_10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_intlines(0), diff --git a/src/mame/drivers/ti990_4.cpp b/src/mame/drivers/ti990_4.cpp index 5fbde711493..c922b662394 100644 --- a/src/mame/drivers/ti990_4.cpp +++ b/src/mame/drivers/ti990_4.cpp @@ -50,7 +50,7 @@ TODO: class ti990_4_state : public driver_device { public: - ti990_4_state(const machine_config &mconfig, device_type type, std::string tag) + ti990_4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_fd800(*this, "fd800") { } diff --git a/src/mame/drivers/ti99_2.cpp b/src/mame/drivers/ti99_2.cpp index 3ee254090f3..2eaf0250d68 100644 --- a/src/mame/drivers/ti99_2.cpp +++ b/src/mame/drivers/ti99_2.cpp @@ -86,7 +86,7 @@ would just have taken three extra tracks on the main board and a OR gate in an A class ti99_2_state : public driver_device { public: - ti99_2_state(const machine_config &mconfig, device_type type, std::string tag) + ti99_2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp index 2459d674177..f934677565e 100644 --- a/src/mame/drivers/ti99_4p.cpp +++ b/src/mame/drivers/ti99_4p.cpp @@ -59,7 +59,7 @@ class ti99_4p_state : public driver_device { public: - ti99_4p_state(const machine_config &mconfig, device_type type, std::string tag) + ti99_4p_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cpu(*this, "maincpu"), m_tms9901(*this, TMS9901_TAG), diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp index 98c45d1fdda..2d9e11f4dc2 100644 --- a/src/mame/drivers/ti99_4x.cpp +++ b/src/mame/drivers/ti99_4x.cpp @@ -66,7 +66,7 @@ class ti99_4x_state : public driver_device { public: - ti99_4x_state(const machine_config &mconfig, device_type type, std::string tag) + ti99_4x_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cpu(*this, "maincpu"), m_tms9901(*this, TMS9901_TAG), diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp index 755f8e3c798..02d94b6614a 100644 --- a/src/mame/drivers/ti99_8.cpp +++ b/src/mame/drivers/ti99_8.cpp @@ -234,7 +234,7 @@ enum class ti99_8_state : public driver_device { public: - ti99_8_state(const machine_config &mconfig, device_type type, std::string tag) + ti99_8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cpu(*this, "maincpu"), m_tms9901(*this, TMS9901_TAG), diff --git a/src/mame/drivers/ticalc1x.cpp b/src/mame/drivers/ticalc1x.cpp index 714aa09b967..cbc16d3d7b2 100644 --- a/src/mame/drivers/ticalc1x.cpp +++ b/src/mame/drivers/ticalc1x.cpp @@ -32,7 +32,7 @@ class ticalc1x_state : public hh_tms1k_state { public: - ticalc1x_state(const machine_config &mconfig, device_type type, std::string tag) + ticalc1x_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag) { } @@ -70,7 +70,7 @@ void ticalc1x_state::machine_start() class tisr16_state : public ticalc1x_state { public: - tisr16_state(const machine_config &mconfig, device_type type, std::string tag) + tisr16_state(const machine_config &mconfig, device_type type, const char *tag) : ticalc1x_state(mconfig, type, tag) { } @@ -302,7 +302,7 @@ MACHINE_CONFIG_END class ti1250_state : public ticalc1x_state { public: - ti1250_state(const machine_config &mconfig, device_type type, std::string tag) + ti1250_state(const machine_config &mconfig, device_type type, const char *tag) : ticalc1x_state(mconfig, type, tag) { } @@ -438,7 +438,7 @@ MACHINE_CONFIG_END class ti1000_state : public ticalc1x_state { public: - ti1000_state(const machine_config &mconfig, device_type type, std::string tag) + ti1000_state(const machine_config &mconfig, device_type type, const char *tag) : ticalc1x_state(mconfig, type, tag) { } @@ -535,7 +535,7 @@ MACHINE_CONFIG_END class wizatron_state : public ticalc1x_state { public: - wizatron_state(const machine_config &mconfig, device_type type, std::string tag) + wizatron_state(const machine_config &mconfig, device_type type, const char *tag) : ticalc1x_state(mconfig, type, tag) { } @@ -637,7 +637,7 @@ MACHINE_CONFIG_END class lilprof_state : public wizatron_state { public: - lilprof_state(const machine_config &mconfig, device_type type, std::string tag) + lilprof_state(const machine_config &mconfig, device_type type, const char *tag) : wizatron_state(mconfig, type, tag) { } @@ -711,7 +711,7 @@ MACHINE_CONFIG_END class lilprof78_state : public ticalc1x_state { public: - lilprof78_state(const machine_config &mconfig, device_type type, std::string tag) + lilprof78_state(const machine_config &mconfig, device_type type, const char *tag) : ticalc1x_state(mconfig, type, tag) { } @@ -821,7 +821,7 @@ MACHINE_CONFIG_END class dataman_state : public ticalc1x_state { public: - dataman_state(const machine_config &mconfig, device_type type, std::string tag) + dataman_state(const machine_config &mconfig, device_type type, const char *tag) : ticalc1x_state(mconfig, type, tag) { } @@ -946,7 +946,7 @@ MACHINE_CONFIG_END class ti30_state : public ticalc1x_state { public: - ti30_state(const machine_config &mconfig, device_type type, std::string tag) + ti30_state(const machine_config &mconfig, device_type type, const char *tag) : ticalc1x_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp index ad49e9050c4..3d1f78faa9d 100644 --- a/src/mame/drivers/tickee.cpp +++ b/src/mame/drivers/tickee.cpp @@ -40,7 +40,7 @@ public: TIMER_SETUP_GUN_INTERRUPTS }; - tickee_state(const machine_config &mconfig, device_type type, std::string tag) + tickee_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), diff --git a/src/mame/drivers/tim011.cpp b/src/mame/drivers/tim011.cpp index 42f0a887f6a..42e644bba84 100644 --- a/src/mame/drivers/tim011.cpp +++ b/src/mame/drivers/tim011.cpp @@ -17,7 +17,7 @@ class tim011_state : public driver_device { public: - tim011_state(const machine_config &mconfig, device_type type, std::string tag) + tim011_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_fdc(*this, FDC9266_TAG), diff --git a/src/mame/drivers/tim100.cpp b/src/mame/drivers/tim100.cpp index 0de2be552b2..d21b88dabb4 100644 --- a/src/mame/drivers/tim100.cpp +++ b/src/mame/drivers/tim100.cpp @@ -17,7 +17,7 @@ class tim100_state : public driver_device { public: - tim100_state(const machine_config &mconfig, device_type type, std::string tag) + tim100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette") diff --git a/src/mame/drivers/timetrv.cpp b/src/mame/drivers/timetrv.cpp index 47d477454de..c3677eb3b2d 100644 --- a/src/mame/drivers/timetrv.cpp +++ b/src/mame/drivers/timetrv.cpp @@ -32,7 +32,7 @@ CPU is an Intel 80188 class timetrv_state : public driver_device { public: - timetrv_state(const machine_config &mconfig, device_type type, std::string tag) + timetrv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_led_vram_lo(*this, "led_vralo"), m_led_vram_hi(*this, "led_vrahi"), diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp index f4828822d2f..6726b44f29e 100644 --- a/src/mame/drivers/tispeak.cpp +++ b/src/mame/drivers/tispeak.cpp @@ -384,7 +384,7 @@ Language Tutor modules: class tispeak_state : public hh_tms1k_state { public: - tispeak_state(const machine_config &mconfig, device_type type, std::string tag) + tispeak_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag), m_tms5100(*this, "tms5100"), m_tms6100(*this, "tms6100"), diff --git a/src/mame/drivers/tispellb.cpp b/src/mame/drivers/tispellb.cpp index bc8f7e1b196..0afe81d0a49 100644 --- a/src/mame/drivers/tispellb.cpp +++ b/src/mame/drivers/tispellb.cpp @@ -65,7 +65,7 @@ class tispellb_state : public hh_tms1k_state { public: - tispellb_state(const machine_config &mconfig, device_type type, std::string tag) + tispellb_state(const machine_config &mconfig, device_type type, const char *tag) : hh_tms1k_state(mconfig, type, tag), m_subcpu(*this, "subcpu"), m_tms6100(*this, "tms6100") diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp index 54d2e4aa2b6..8af716b28a9 100644 --- a/src/mame/drivers/tk2000.cpp +++ b/src/mame/drivers/tk2000.cpp @@ -34,7 +34,7 @@ class tk2000_state : public driver_device { public: - tk2000_state(const machine_config &mconfig, device_type type, std::string tag) + tk2000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, A2_CPU_TAG), m_ram(*this, RAM_TAG), diff --git a/src/mame/drivers/tk80.cpp b/src/mame/drivers/tk80.cpp index 64cdf623da5..b7872fc2d8f 100644 --- a/src/mame/drivers/tk80.cpp +++ b/src/mame/drivers/tk80.cpp @@ -56,7 +56,7 @@ ICS8080 class tk80_state : public driver_device { public: - tk80_state(const machine_config &mconfig, device_type type, std::string tag) + tk80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp index 51f4d556ce5..99d6f1f1db5 100644 --- a/src/mame/drivers/tk80bs.cpp +++ b/src/mame/drivers/tk80bs.cpp @@ -32,7 +32,7 @@ TODO: class tk80bs_state : public driver_device { public: - tk80bs_state(const machine_config &mconfig, device_type type, std::string tag) + tk80bs_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp index 2b359f513fe..033e9f8fa1a 100644 --- a/src/mame/drivers/tm990189.cpp +++ b/src/mame/drivers/tm990189.cpp @@ -76,7 +76,7 @@ class tm990189_state : public driver_device { public: - tm990189_state(const machine_config &mconfig, device_type type, std::string tag) + tm990189_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tms9980a(*this, "maincpu"), m_speaker(*this, "speaker"), @@ -429,7 +429,7 @@ class tm990_189_rs232_image_device : public device_t, { public: // construction/destruction - tm990_189_rs232_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tm990_189_rs232_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_SERIAL; } @@ -455,7 +455,7 @@ protected: const device_type TM990_189_RS232 = &device_creator; -tm990_189_rs232_image_device::tm990_189_rs232_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tm990_189_rs232_image_device::tm990_189_rs232_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TM990_189_RS232, "TM990/189 RS232 port", tag, owner, clock, "tm990_189_rs232_image", __FILE__), device_image_interface(mconfig, *this) { diff --git a/src/mame/drivers/tmaster.cpp b/src/mame/drivers/tmaster.cpp index 5a339b4fd29..40858fa6df1 100644 --- a/src/mame/drivers/tmaster.cpp +++ b/src/mame/drivers/tmaster.cpp @@ -121,7 +121,7 @@ To Do: class tmaster_state : public driver_device { public: - tmaster_state(const machine_config &mconfig, device_type type, std::string tag) + tmaster_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_microtouch(*this,"microtouch"), diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp index c51c0b82e82..358867c6e82 100644 --- a/src/mame/drivers/tmmjprd.cpp +++ b/src/mame/drivers/tmmjprd.cpp @@ -39,7 +39,7 @@ class tmmjprd_state : public driver_device { public: - tmmjprd_state(const machine_config &mconfig, device_type type, std::string tag) + tmmjprd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp index 74a921d4f0b..70351f63c69 100644 --- a/src/mame/drivers/tmspoker.cpp +++ b/src/mame/drivers/tmspoker.cpp @@ -219,7 +219,7 @@ class tmspoker_state : public driver_device { public: - tmspoker_state(const machine_config &mconfig, device_type type, std::string tag) + tmspoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/tokyocop.cpp b/src/mame/drivers/tokyocop.cpp index 62889ca6a7b..4f28338400d 100644 --- a/src/mame/drivers/tokyocop.cpp +++ b/src/mame/drivers/tokyocop.cpp @@ -29,7 +29,7 @@ I/O Board with Altera Flex EPF15K50EQC240-3 class tokyocop_state : public driver_device { public: - tokyocop_state(const machine_config &mconfig, device_type type, std::string tag) + tokyocop_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp index a40b3db2e14..4b3919afdc1 100644 --- a/src/mame/drivers/tomcat.cpp +++ b/src/mame/drivers/tomcat.cpp @@ -42,7 +42,7 @@ class tomcat_state : public driver_device { public: - tomcat_state(const machine_config &mconfig, device_type type, std::string tag) + tomcat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tms(*this, "tms"), m_shared_ram(*this, "shared_ram"), diff --git a/src/mame/drivers/tonton.cpp b/src/mame/drivers/tonton.cpp index 27966982f13..36770d448a8 100644 --- a/src/mame/drivers/tonton.cpp +++ b/src/mame/drivers/tonton.cpp @@ -33,7 +33,7 @@ class tonton_state : public driver_device { public: - tonton_state(const machine_config &mconfig, device_type type, std::string tag) + tonton_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_v9938(*this, "v9938"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp index 826912e3986..e265b3130f4 100644 --- a/src/mame/drivers/topspeed.cpp +++ b/src/mame/drivers/topspeed.cpp @@ -207,7 +207,7 @@ READ8_MEMBER(topspeed_state::input_bypass_r) CUSTOM_INPUT_MEMBER(topspeed_state::pedal_r) { static const UINT8 retval[8] = { 0,1,3,2,6,7,5,4 }; - std::string tag = (const char *)param; + const char *tag = (const char *)param; return retval[read_safe(ioport(tag), 0) & 7]; } diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp index ff7cda5b6c9..b422680e6f9 100644 --- a/src/mame/drivers/toratora.cpp +++ b/src/mame/drivers/toratora.cpp @@ -28,7 +28,7 @@ TODO: class toratora_state : public driver_device { public: - toratora_state(const machine_config &mconfig, device_type type, std::string tag) + toratora_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/tourtabl.cpp b/src/mame/drivers/tourtabl.cpp index 5aad75b35b5..c2b2fa57696 100644 --- a/src/mame/drivers/tourtabl.cpp +++ b/src/mame/drivers/tourtabl.cpp @@ -18,7 +18,7 @@ class tourtabl_state : public driver_device { public: - tourtabl_state(const machine_config &mconfig, device_type type, std::string tag) + tourtabl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp index f674084504c..60bdcc72630 100644 --- a/src/mame/drivers/tourvis.cpp +++ b/src/mame/drivers/tourvis.cpp @@ -258,7 +258,7 @@ I can't tell ATM if units are seconds (even if values in tables seem very relate class tourvision_state : public pce_common_state { public: - tourvision_state(const machine_config &mconfig, device_type type, std::string tag) + tourvision_state(const machine_config &mconfig, device_type type, const char *tag) : pce_common_state(mconfig, type, tag), m_subcpu(*this, "subcpu") { } diff --git a/src/mame/drivers/tricep.cpp b/src/mame/drivers/tricep.cpp index 8e04cfb485f..ecadeb6667d 100644 --- a/src/mame/drivers/tricep.cpp +++ b/src/mame/drivers/tricep.cpp @@ -17,7 +17,7 @@ class tricep_state : public driver_device { public: - tricep_state(const machine_config &mconfig, device_type type, std::string tag) + tricep_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/triforce.cpp b/src/mame/drivers/triforce.cpp index 68b99351089..a433cce2c09 100644 --- a/src/mame/drivers/triforce.cpp +++ b/src/mame/drivers/triforce.cpp @@ -443,7 +443,7 @@ Notes: class triforce_state : public driver_device { public: - triforce_state(const machine_config &mconfig, device_type type, std::string tag) + triforce_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp index 89723355948..aabba09848a 100644 --- a/src/mame/drivers/trvmadns.cpp +++ b/src/mame/drivers/trvmadns.cpp @@ -95,7 +95,7 @@ Technology = NMOS class trvmadns_state : public driver_device { public: - trvmadns_state(const machine_config &mconfig, device_type type, std::string tag) + trvmadns_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_gfxram(*this, "gfxram"), m_tileram(*this, "tileram"), diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp index d8c20c27769..19680c956cb 100644 --- a/src/mame/drivers/ts802.cpp +++ b/src/mame/drivers/ts802.cpp @@ -35,7 +35,7 @@ class ts802_state : public driver_device { public: - ts802_state(const machine_config &mconfig, device_type type, std::string tag) + ts802_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index e2395816abc..7c8eec2f7ae 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -61,7 +61,7 @@ PAGE SEL bit in PORT0 set to 1: class ts803_state : public driver_device { public: - ts803_state(const machine_config &mconfig, device_type type, std::string tag) + ts803_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/ts816.cpp b/src/mame/drivers/ts816.cpp index 88f17d88332..6bf818a2163 100644 --- a/src/mame/drivers/ts816.cpp +++ b/src/mame/drivers/ts816.cpp @@ -19,7 +19,7 @@ class ts816_state : public driver_device { public: - ts816_state(const machine_config &mconfig, device_type type, std::string tag) + ts816_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/ttchamp.cpp b/src/mame/drivers/ttchamp.cpp index d8919696780..8021db87042 100644 --- a/src/mame/drivers/ttchamp.cpp +++ b/src/mame/drivers/ttchamp.cpp @@ -75,7 +75,7 @@ we currently simulate this as the PIC is read protected. class ttchamp_state : public driver_device { public: - ttchamp_state(const machine_config &mconfig, device_type type, std::string tag) + ttchamp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette") { } diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp index 71c89ed81b1..0fd80a9e45d 100644 --- a/src/mame/drivers/tugboat.cpp +++ b/src/mame/drivers/tugboat.cpp @@ -39,7 +39,7 @@ public: TIMER_INTERRUPT }; - tugboat_state(const machine_config &mconfig, device_type type, std::string tag) + tugboat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/turrett.cpp b/src/mame/drivers/turrett.cpp index 807a4129f0b..a37bf36cfe2 100644 --- a/src/mame/drivers/turrett.cpp +++ b/src/mame/drivers/turrett.cpp @@ -322,7 +322,7 @@ extern const device_type TURRETT_HARDDISK; class turrett_hdd : public ide_hdd_device { public: - turrett_hdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) + turrett_hdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ide_hdd_device(mconfig, TURRETT_HARDDISK, "HDD Turrett Tower", tag, owner, clock, "turrett_hdd", __FILE__) { } diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp index 8ced99cb997..7d651eaacef 100644 --- a/src/mame/drivers/tutor.cpp +++ b/src/mame/drivers/tutor.cpp @@ -182,7 +182,7 @@ A=AMA, P=PRO, these keys don't exist, and so the games cannot be played. class tutor_state : public driver_device { public: - tutor_state(const machine_config &mconfig, device_type type, std::string tag) + tutor_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cart(*this, "cartslot"), diff --git a/src/mame/drivers/tv950.cpp b/src/mame/drivers/tv950.cpp index 009be46e463..7fe87623194 100644 --- a/src/mame/drivers/tv950.cpp +++ b/src/mame/drivers/tv950.cpp @@ -19,7 +19,7 @@ class tv950_state : public driver_device { public: - tv950_state(const machine_config &mconfig, device_type type, std::string tag) + tv950_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp index 435ce22dde3..20ffc65710f 100644 --- a/src/mame/drivers/tvc.cpp +++ b/src/mame/drivers/tvc.cpp @@ -38,7 +38,7 @@ class tvc_state : public driver_device { public: - tvc_state(const machine_config &mconfig, device_type type, std::string tag) + tvc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/drivers/tvcapcom.cpp b/src/mame/drivers/tvcapcom.cpp index 1f490782416..29e5508ce32 100644 --- a/src/mame/drivers/tvcapcom.cpp +++ b/src/mame/drivers/tvcapcom.cpp @@ -16,7 +16,7 @@ class tvcapcom_state : public driver_device { public: - tvcapcom_state(const machine_config &mconfig, device_type type, std::string tag) + tvcapcom_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/tvgame.cpp b/src/mame/drivers/tvgame.cpp index 59aebdec53e..44ede341caf 100644 --- a/src/mame/drivers/tvgame.cpp +++ b/src/mame/drivers/tvgame.cpp @@ -19,7 +19,7 @@ class tvgame_state : public driver_device { public: - tvgame_state(const machine_config &mconfig, device_type type, std::string tag) + tvgame_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_speaker(*this, "speaker") diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp index afd0e0b16ad..5b38a3dd019 100644 --- a/src/mame/drivers/twinkle.cpp +++ b/src/mame/drivers/twinkle.cpp @@ -247,7 +247,7 @@ Notes: class twinkle_state : public driver_device { public: - twinkle_state(const machine_config &mconfig, device_type type, std::string tag) + twinkle_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_am53cf96(*this, "am53cf96"), m_ata(*this, "ata"), diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp index d369f2e2fdd..bf4468e5dd4 100644 --- a/src/mame/drivers/twins.cpp +++ b/src/mame/drivers/twins.cpp @@ -69,7 +69,7 @@ this requires the -joystick_contradictory switch on the commandline. class twins_state : public driver_device { public: - twins_state(const machine_config &mconfig, device_type type, std::string tag) + twins_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_paletteram(*this, "paletteram"), diff --git a/src/mame/drivers/tx0.cpp b/src/mame/drivers/tx0.cpp index d57ac7300fd..d95ef46b796 100644 --- a/src/mame/drivers/tx0.cpp +++ b/src/mame/drivers/tx0.cpp @@ -357,7 +357,7 @@ class tx0_readtape_image_device : public device_t, { public: // construction/destruction - tx0_readtape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tx0_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_PUNCHTAPE; } @@ -381,7 +381,7 @@ protected: const device_type TX0_READTAPE = &device_creator; -tx0_readtape_image_device::tx0_readtape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tx0_readtape_image_device::tx0_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TX0_READTAPE, "TX0 Tape Reader", tag, owner, clock, "tx0_readtape_image", __FILE__), device_image_interface(mconfig, *this) { @@ -392,7 +392,7 @@ class tx0_punchtape_image_device : public device_t, { public: // construction/destruction - tx0_punchtape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tx0_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_PUNCHTAPE; } @@ -416,7 +416,7 @@ protected: const device_type TX0_PUNCHTAPE = &device_creator; -tx0_punchtape_image_device::tx0_punchtape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tx0_punchtape_image_device::tx0_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TX0_PUNCHTAPE, "TX0 Tape Puncher", tag, owner, clock, "tx0_punchtape_image", __FILE__), device_image_interface(mconfig, *this) { @@ -428,7 +428,7 @@ class tx0_printer_image_device : public device_t, { public: // construction/destruction - tx0_printer_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tx0_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_PRINTER; } @@ -452,7 +452,7 @@ protected: const device_type TX0_PRINTER = &device_creator; -tx0_printer_image_device::tx0_printer_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tx0_printer_image_device::tx0_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TX0_PRINTER, "TX0 Typewriter", tag, owner, clock, "tx0_printer_image", __FILE__), device_image_interface(mconfig, *this) { @@ -463,7 +463,7 @@ class tx0_magtape_image_device : public device_t, { public: // construction/destruction - tx0_magtape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tx0_magtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_MAGTAPE; } @@ -487,7 +487,7 @@ protected: const device_type TX0_MAGTAPE = &device_creator; -tx0_magtape_image_device::tx0_magtape_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tx0_magtape_image_device::tx0_magtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TX0_MAGTAPE, "TX0 Magnetic Tape", tag, owner, clock, "tx0_magtape_image", __FILE__), device_image_interface(mconfig, *this) { diff --git a/src/mame/drivers/uapce.cpp b/src/mame/drivers/uapce.cpp index 1b0906ffc02..8d95ceb1eb5 100644 --- a/src/mame/drivers/uapce.cpp +++ b/src/mame/drivers/uapce.cpp @@ -105,7 +105,7 @@ Alien Crush & Pac_Land: dumps made from PC-Engine dumps of JP versions class uapce_state : public pce_common_state { public: - uapce_state(const machine_config &mconfig, device_type type, std::string tag) + uapce_state(const machine_config &mconfig, device_type type, const char *tag) : pce_common_state(mconfig, type, tag), m_discrete(*this, "discrete") { } diff --git a/src/mame/drivers/uknc.cpp b/src/mame/drivers/uknc.cpp index c0a5b7bd08b..af546c28b6e 100644 --- a/src/mame/drivers/uknc.cpp +++ b/src/mame/drivers/uknc.cpp @@ -15,7 +15,7 @@ class uknc_state : public driver_device { public: - uknc_state(const machine_config &mconfig, device_type type, std::string tag) + uknc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/ultrsprt.cpp b/src/mame/drivers/ultrsprt.cpp index 81143ada34e..b79c9784b1d 100644 --- a/src/mame/drivers/ultrsprt.cpp +++ b/src/mame/drivers/ultrsprt.cpp @@ -16,7 +16,7 @@ class ultrsprt_state : public driver_device { public: - ultrsprt_state(const machine_config &mconfig, device_type type, std::string tag) + ultrsprt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/umipoker.cpp b/src/mame/drivers/umipoker.cpp index 9cabc077ba0..8d4f49b7db7 100644 --- a/src/mame/drivers/umipoker.cpp +++ b/src/mame/drivers/umipoker.cpp @@ -27,7 +27,7 @@ class umipoker_state : public driver_device { public: - umipoker_state(const machine_config &mconfig, device_type type, std::string tag) + umipoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram_0(*this, "vra0"), m_vram_1(*this, "vra1"), diff --git a/src/mame/drivers/unichamp.cpp b/src/mame/drivers/unichamp.cpp index b398545cbce..4c566f96619 100644 --- a/src/mame/drivers/unichamp.cpp +++ b/src/mame/drivers/unichamp.cpp @@ -47,7 +47,7 @@ class unichamp_state : public driver_device { public: - unichamp_state(const machine_config &mconfig, device_type type, std::string tag) + unichamp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gic(*this, "gic"), diff --git a/src/mame/drivers/unior.cpp b/src/mame/drivers/unior.cpp index b70f82c8122..64bf30e97d4 100644 --- a/src/mame/drivers/unior.cpp +++ b/src/mame/drivers/unior.cpp @@ -49,7 +49,7 @@ ToDo: class unior_state : public driver_device { public: - unior_state(const machine_config &mconfig, device_type type, std::string tag) : + unior_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pit(*this, "pit"), diff --git a/src/mame/drivers/unistar.cpp b/src/mame/drivers/unistar.cpp index ad45711f00f..59537dd11b0 100644 --- a/src/mame/drivers/unistar.cpp +++ b/src/mame/drivers/unistar.cpp @@ -17,7 +17,7 @@ class unistar_state : public driver_device { public: - unistar_state(const machine_config &mconfig, device_type type, std::string tag) + unistar_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp index 9aa2cf09da0..588b2a1bc39 100644 --- a/src/mame/drivers/univac.cpp +++ b/src/mame/drivers/univac.cpp @@ -32,7 +32,7 @@ class univac_state : public driver_device { public: - univac_state(const machine_config &mconfig, device_type type, std::string tag) + univac_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_p_videoram(*this, "videoram") diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp index 3da660ee821..1e08d3b6574 100644 --- a/src/mame/drivers/unixpc.cpp +++ b/src/mame/drivers/unixpc.cpp @@ -26,7 +26,7 @@ class unixpc_state : public driver_device { public: - unixpc_state(const machine_config &mconfig, device_type type, std::string tag) + unixpc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/drivers/unkfr.cpp b/src/mame/drivers/unkfr.cpp index 705e9f61030..296f58b3cbd 100644 --- a/src/mame/drivers/unkfr.cpp +++ b/src/mame/drivers/unkfr.cpp @@ -21,7 +21,7 @@ class unkfr_state : public driver_device { public: - unkfr_state(const machine_config &mconfig, device_type type, std::string tag) + unkfr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } required_device m_maincpu; diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp index 231e02ffeaf..5ac829908cc 100644 --- a/src/mame/drivers/unkhorse.cpp +++ b/src/mame/drivers/unkhorse.cpp @@ -28,7 +28,7 @@ TODO: class horse_state : public driver_device { public: - horse_state(const machine_config &mconfig, device_type type, std::string tag) + horse_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), diff --git a/src/mame/drivers/upscope.cpp b/src/mame/drivers/upscope.cpp index ea227920eac..8454f0c135e 100644 --- a/src/mame/drivers/upscope.cpp +++ b/src/mame/drivers/upscope.cpp @@ -35,7 +35,7 @@ class upscope_state : public amiga_state { public: - upscope_state(const machine_config &mconfig, device_type type, std::string tag) + upscope_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag), m_prev_cia1_porta(0xff), m_parallel_data(0xff) diff --git a/src/mame/drivers/uzebox.cpp b/src/mame/drivers/uzebox.cpp index 85e0e02dbc1..424f530e8e4 100644 --- a/src/mame/drivers/uzebox.cpp +++ b/src/mame/drivers/uzebox.cpp @@ -28,7 +28,7 @@ class uzebox_state : public driver_device { public: - uzebox_state(const machine_config &mconfig, device_type type, std::string tag) + uzebox_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cart(*this, "cartslot"), diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp index de42b245068..6acbf18954e 100644 --- a/src/mame/drivers/v6809.cpp +++ b/src/mame/drivers/v6809.cpp @@ -65,7 +65,7 @@ ToDo: class v6809_state : public driver_device { public: - v6809_state(const machine_config &mconfig, device_type type, std::string tag) + v6809_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_address(0), m_pia0(*this, "pia0"), diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp index 8411c003f84..97640e10076 100644 --- a/src/mame/drivers/vamphalf.cpp +++ b/src/mame/drivers/vamphalf.cpp @@ -71,7 +71,7 @@ TODO: class vamphalf_state : public driver_device { public: - vamphalf_state(const machine_config &mconfig, device_type type, std::string tag) + vamphalf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_qs1000(*this, "qs1000"), diff --git a/src/mame/drivers/vax11.cpp b/src/mame/drivers/vax11.cpp index 977975e01f2..acf6e607316 100644 --- a/src/mame/drivers/vax11.cpp +++ b/src/mame/drivers/vax11.cpp @@ -75,7 +75,7 @@ class vax11_state : public driver_device { public: - vax11_state(const machine_config &mconfig, device_type type, std::string tag) + vax11_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp index 7924e2416a7..1524849c555 100644 --- a/src/mame/drivers/vboy.cpp +++ b/src/mame/drivers/vboy.cpp @@ -104,7 +104,7 @@ struct vboy_timer_t; class vboy_state : public driver_device { public: - vboy_state(const machine_config &mconfig, device_type type, std::string tag) + vboy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cart(*this, "cartslot"), diff --git a/src/mame/drivers/vcombat.cpp b/src/mame/drivers/vcombat.cpp index ee56ced6336..ad72f7770b8 100644 --- a/src/mame/drivers/vcombat.cpp +++ b/src/mame/drivers/vcombat.cpp @@ -95,7 +95,7 @@ TODO : This is a partially working driver. Most of the memory maps for class vcombat_state : public driver_device { public: - vcombat_state(const machine_config &mconfig, device_type type, std::string tag) + vcombat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tlc34076(*this, "tlc34076"), m_framebuffer_ctrl(*this, "fb_control"), @@ -237,18 +237,18 @@ static void wiggle_i860_common(i860_cpu_device *device, UINT16 data) if (bus_hold) { - fprintf(stderr, "M0 asserting bus HOLD to i860 %s\n", device->tag().c_str()); + fprintf(stderr, "M0 asserting bus HOLD to i860 %s\n", device->tag()); device->i860_set_pin(DEC_PIN_BUS_HOLD, 1); } else { - fprintf(stderr, "M0 clearing bus HOLD to i860 %s\n", device->tag().c_str()); + fprintf(stderr, "M0 clearing bus HOLD to i860 %s\n", device->tag()); device->i860_set_pin(DEC_PIN_BUS_HOLD, 0); } if (reset) { - fprintf(stderr, "M0 asserting RESET to i860 %s\n", device->tag().c_str()); + fprintf(stderr, "M0 asserting RESET to i860 %s\n", device->tag()); device->i860_set_pin(DEC_PIN_RESET, 1); } else diff --git a/src/mame/drivers/vd.cpp b/src/mame/drivers/vd.cpp index 4b215191f2c..f2d17a2d6fa 100644 --- a/src/mame/drivers/vd.cpp +++ b/src/mame/drivers/vd.cpp @@ -20,7 +20,7 @@ class vd_state : public driver_device { public: - vd_state(const machine_config &mconfig, device_type type, std::string tag) + vd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/vector4.cpp b/src/mame/drivers/vector4.cpp index ca61fbf71e6..69275ba90fd 100644 --- a/src/mame/drivers/vector4.cpp +++ b/src/mame/drivers/vector4.cpp @@ -17,7 +17,7 @@ class vector4_state : public driver_device { public: - vector4_state(const machine_config &mconfig, device_type type, std::string tag) + vector4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/drivers/vega.cpp b/src/mame/drivers/vega.cpp index 8d0bb044421..12497b386ab 100644 --- a/src/mame/drivers/vega.cpp +++ b/src/mame/drivers/vega.cpp @@ -101,7 +101,7 @@ class vega_state : public driver_device { public: - vega_state(const machine_config &mconfig, device_type type, std::string tag) + vega_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_i8255(*this, "ppi8255"), diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp index a7ccb3708f3..9d366595ed8 100644 --- a/src/mame/drivers/vegaeo.cpp +++ b/src/mame/drivers/vegaeo.cpp @@ -23,7 +23,7 @@ class vegaeo_state : public eolith_state { public: - vegaeo_state(const machine_config &mconfig, device_type type, std::string tag) + vegaeo_state(const machine_config &mconfig, device_type type, const char *tag) : eolith_state(mconfig, type, tag) { } std::unique_ptr m_vega_vram; diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp index c984065e8d2..c71cff65f1a 100644 --- a/src/mame/drivers/vegas.cpp +++ b/src/mame/drivers/vegas.cpp @@ -454,7 +454,7 @@ struct dynamic_address class vegas_state : public driver_device { public: - vegas_state(const machine_config &mconfig, device_type type, std::string tag) + vegas_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_timekeeper(*this, "timekeeper") , diff --git a/src/mame/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp index 4ac34148c9c..5cfa9528dd4 100644 --- a/src/mame/drivers/vg5k.cpp +++ b/src/mame/drivers/vg5k.cpp @@ -62,7 +62,7 @@ class vg5k_state : public driver_device { public: - vg5k_state(const machine_config &mconfig, device_type type, std::string tag) + vg5k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ef9345(*this, "ef9345"), diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp index dda469941ed..e73ff6d5883 100644 --- a/src/mame/drivers/videopkr.cpp +++ b/src/mame/drivers/videopkr.cpp @@ -296,7 +296,7 @@ class videopkr_state : public driver_device { public: - videopkr_state(const machine_config &mconfig, device_type type, std::string tag) + videopkr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp index ce962427f13..bdac38aecc0 100644 --- a/src/mame/drivers/vii.cpp +++ b/src/mame/drivers/vii.cpp @@ -93,7 +93,7 @@ Detailed list of bugs: class vii_state : public driver_device { public: - vii_state(const machine_config &mconfig, device_type type, std::string tag) + vii_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cart(*this, "cartslot"), diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp index 36dd89d224f..36325bcb1f2 100644 --- a/src/mame/drivers/viper.cpp +++ b/src/mame/drivers/viper.cpp @@ -373,7 +373,7 @@ static timer_device *ds2430_bit_timer; class viper_state : public driver_device { public: - viper_state(const machine_config &mconfig, device_type type, std::string tag) + viper_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ata(*this, "ata"), diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp index c8e334ba15a..7864083b066 100644 --- a/src/mame/drivers/vk100.cpp +++ b/src/mame/drivers/vk100.cpp @@ -167,7 +167,7 @@ public: TIMER_EXECUTE_VG }; - vk100_state(const machine_config &mconfig, device_type type, std::string tag) : + vk100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_crtc(*this, "crtc"), diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp index 0d930fd853f..9af970eb247 100644 --- a/src/mame/drivers/vlc.cpp +++ b/src/mame/drivers/vlc.cpp @@ -151,7 +151,7 @@ nevada TYPE2 : 64 45 51 06 32 02 31 31 class nevada_state : public driver_device { public: - nevada_state(const machine_config &mconfig, device_type type, std::string tag) + nevada_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_duart18_68681(*this, "duart18_68681"), m_duart39_68681(*this, "duart39_68681"), diff --git a/src/mame/drivers/votrpss.cpp b/src/mame/drivers/votrpss.cpp index 8f80a246bc5..d74006139d3 100644 --- a/src/mame/drivers/votrpss.cpp +++ b/src/mame/drivers/votrpss.cpp @@ -88,7 +88,7 @@ Things to be looked at: class votrpss_state : public driver_device { public: - votrpss_state(const machine_config &mconfig, device_type type, std::string tag) + votrpss_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/votrtnt.cpp b/src/mame/drivers/votrtnt.cpp index ca3d1f0107b..7d7c007ee35 100644 --- a/src/mame/drivers/votrtnt.cpp +++ b/src/mame/drivers/votrtnt.cpp @@ -43,7 +43,7 @@ class votrtnt_state : public driver_device { public: - votrtnt_state(const machine_config &mconfig, device_type type, std::string tag) : + votrtnt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_votrax(*this, "votrax"), diff --git a/src/mame/drivers/voyager.cpp b/src/mame/drivers/voyager.cpp index 9ea134b030d..7afe5159636 100644 --- a/src/mame/drivers/voyager.cpp +++ b/src/mame/drivers/voyager.cpp @@ -26,7 +26,7 @@ TODO: VIA KT133a chipset support, GeForce 2MX video support, lots of things ;-) class voyager_state : public pcat_base_state { public: - voyager_state(const machine_config &mconfig, device_type type, std::string tag) + voyager_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/vp101.cpp b/src/mame/drivers/vp101.cpp index 55a4973c254..a1b66a5e1b8 100644 --- a/src/mame/drivers/vp101.cpp +++ b/src/mame/drivers/vp101.cpp @@ -23,7 +23,7 @@ class vp10x_state : public driver_device { public: - vp10x_state(const machine_config &mconfig, device_type type, std::string tag) + vp10x_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/vpoker.cpp b/src/mame/drivers/vpoker.cpp index 30959a2a085..1a23190c002 100644 --- a/src/mame/drivers/vpoker.cpp +++ b/src/mame/drivers/vpoker.cpp @@ -106,7 +106,7 @@ class vpoker_state : public driver_device { public: - vpoker_state(const machine_config &mconfig, device_type type, std::string tag) + vpoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/vroulet.cpp b/src/mame/drivers/vroulet.cpp index 2f3cbabb21e..dcbf7a37c29 100644 --- a/src/mame/drivers/vroulet.cpp +++ b/src/mame/drivers/vroulet.cpp @@ -46,7 +46,7 @@ Tomasz Slanina 20050225 class vroulet_state : public driver_device { public: - vroulet_state(const machine_config &mconfig, device_type type, std::string tag) + vroulet_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp index bb3a17de81e..1d655600979 100644 --- a/src/mame/drivers/vt100.cpp +++ b/src/mame/drivers/vt100.cpp @@ -34,7 +34,7 @@ class vt100_state : public driver_device { public: - vt100_state(const machine_config &mconfig, device_type type, std::string tag) : + vt100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_crtc(*this, "vt100_video"), diff --git a/src/mame/drivers/vt220.cpp b/src/mame/drivers/vt220.cpp index edbeb00cc3a..42fcb2ea2c1 100644 --- a/src/mame/drivers/vt220.cpp +++ b/src/mame/drivers/vt220.cpp @@ -19,7 +19,7 @@ class vt220_state : public driver_device { public: - vt220_state(const machine_config &mconfig, device_type type, std::string tag) + vt220_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG) { } diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp index 665f47bb13b..153cc6f249f 100644 --- a/src/mame/drivers/vt240.cpp +++ b/src/mame/drivers/vt240.cpp @@ -47,7 +47,7 @@ class vt240_state : public driver_device { public: - vt240_state(const machine_config &mconfig, device_type type, std::string tag) + vt240_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_i8251(*this, "i8251"), diff --git a/src/mame/drivers/vt320.cpp b/src/mame/drivers/vt320.cpp index 1da204444cb..5a661b962b6 100644 --- a/src/mame/drivers/vt320.cpp +++ b/src/mame/drivers/vt320.cpp @@ -16,7 +16,7 @@ class vt320_state : public driver_device { public: - vt320_state(const machine_config &mconfig, device_type type, std::string tag) + vt320_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG) { } diff --git a/src/mame/drivers/vt520.cpp b/src/mame/drivers/vt520.cpp index 1a04168a161..c65c7ebe5ee 100644 --- a/src/mame/drivers/vt520.cpp +++ b/src/mame/drivers/vt520.cpp @@ -16,7 +16,7 @@ class vt520_state : public driver_device { public: - vt520_state(const machine_config &mconfig, device_type type, std::string tag) + vt520_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/vta2000.cpp b/src/mame/drivers/vta2000.cpp index e99dc5f67bc..c301e5bcd18 100644 --- a/src/mame/drivers/vta2000.cpp +++ b/src/mame/drivers/vta2000.cpp @@ -25,7 +25,7 @@ Note: port 0 bit 4 is NOT a speaker bit. See code at 027B. class vta2000_state : public driver_device { public: - vta2000_state(const machine_config &mconfig, device_type type, std::string tag) + vta2000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_p_videoram(*this, "videoram") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp index 342b55a5262..01ea9d775bb 100644 --- a/src/mame/drivers/vtech1.cpp +++ b/src/mame/drivers/vtech1.cpp @@ -60,7 +60,7 @@ Todo: class vtech1_state : public driver_device { public: - vtech1_state(const machine_config &mconfig, device_type type, std::string tag) : + vtech1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp index 4125daa610d..77f67d7165e 100644 --- a/src/mame/drivers/wacky_gator.cpp +++ b/src/mame/drivers/wacky_gator.cpp @@ -30,7 +30,7 @@ class wackygtr_state : public driver_device { public: - wackygtr_state(const machine_config &mconfig, device_type type, std::string tag) + wackygtr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp index d75c6e092f5..7e6243e6f60 100644 --- a/src/mame/drivers/wallc.cpp +++ b/src/mame/drivers/wallc.cpp @@ -58,7 +58,7 @@ Thanks to HIGHWAYMAN for providing info on how to get to these epoxies class wallc_state : public driver_device { public: - wallc_state(const machine_config &mconfig, device_type type, std::string tag) + wallc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp index 3b3b3648689..da4e7c078b7 100644 --- a/src/mame/drivers/wardner.cpp +++ b/src/mame/drivers/wardner.cpp @@ -138,7 +138,7 @@ out: class wardner_state : public twincobr_state { public: - wardner_state(const machine_config &mconfig, device_type type, std::string tag) + wardner_state(const machine_config &mconfig, device_type type, const char *tag) : twincobr_state(mconfig, type, tag), m_membank(*this, "membank") { diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp index d58fb2a9c23..8601b04879b 100644 --- a/src/mame/drivers/warpsped.cpp +++ b/src/mame/drivers/warpsped.cpp @@ -91,7 +91,7 @@ L10, L15, L18 and G18 all read the same class warpspeed_state : public driver_device { public: - warpspeed_state(const machine_config &mconfig, device_type type, std::string tag) + warpspeed_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp index 5693a98bfd5..e2f2c10c88c 100644 --- a/src/mame/drivers/wheelfir.cpp +++ b/src/mame/drivers/wheelfir.cpp @@ -230,7 +230,7 @@ struct scroll_info class wheelfir_state : public driver_device { public: - wheelfir_state(const machine_config &mconfig, device_type type, std::string tag) + wheelfir_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), diff --git a/src/mame/drivers/white_mod.cpp b/src/mame/drivers/white_mod.cpp index 35f1751b898..b6a606f2412 100644 --- a/src/mame/drivers/white_mod.cpp +++ b/src/mame/drivers/white_mod.cpp @@ -11,7 +11,7 @@ class whitestar_mod_state : public driver_device { public: - whitestar_mod_state(const machine_config &mconfig, device_type type, std::string tag) + whitestar_mod_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/whitestar.cpp b/src/mame/drivers/whitestar.cpp index de9fdc4f51e..2eb20073da7 100644 --- a/src/mame/drivers/whitestar.cpp +++ b/src/mame/drivers/whitestar.cpp @@ -14,7 +14,7 @@ class whitestar_state : public driver_device { public: - whitestar_state(const machine_config &mconfig, device_type type, std::string tag) + whitestar_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_decobsmt(*this, "decobsmt"), diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index 486b336f94c..81b17bb1bb2 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -33,7 +33,7 @@ Wicat - various systems. class wicat_state : public driver_device { public: - wicat_state(const machine_config &mconfig, device_type type, std::string tag) + wicat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp index cb9f742d9d1..d5c3e13a649 100644 --- a/src/mame/drivers/wico.cpp +++ b/src/mame/drivers/wico.cpp @@ -45,7 +45,7 @@ ToDo: class wico_state : public genpin_class { public: - wico_state(const machine_config &mconfig, device_type type, std::string tag) + wico_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_ccpu(*this, "ccpu") , m_hcpu(*this, "hcpu") diff --git a/src/mame/drivers/wildfire.cpp b/src/mame/drivers/wildfire.cpp index 7ff8b168076..d9e7a036bfe 100644 --- a/src/mame/drivers/wildfire.cpp +++ b/src/mame/drivers/wildfire.cpp @@ -35,7 +35,7 @@ class wildfire_state : public driver_device { public: - wildfire_state(const machine_config &mconfig, device_type type, std::string tag) + wildfire_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/drivers/wildpkr.cpp b/src/mame/drivers/wildpkr.cpp index 356af480052..c3f35668fdc 100644 --- a/src/mame/drivers/wildpkr.cpp +++ b/src/mame/drivers/wildpkr.cpp @@ -171,7 +171,7 @@ class wildpkr_state : public driver_device { public: - wildpkr_state(const machine_config &mconfig, device_type type, std::string tag) + wildpkr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp index 1c2237ae0cd..df9e42a26f7 100644 --- a/src/mame/drivers/wink.cpp +++ b/src/mame/drivers/wink.cpp @@ -21,7 +21,7 @@ class wink_state : public driver_device { public: - wink_state(const machine_config &mconfig, device_type type, std::string tag) + wink_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp index 851156984fd..1eaa13ce0ee 100644 --- a/src/mame/drivers/witch.cpp +++ b/src/mame/drivers/witch.cpp @@ -236,7 +236,7 @@ TODO : class witch_state : public driver_device { public: - witch_state(const machine_config &mconfig, device_type type, std::string tag) + witch_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/drivers/wmg.cpp b/src/mame/drivers/wmg.cpp index bbc1729e94b..53084fc46f8 100644 --- a/src/mame/drivers/wmg.cpp +++ b/src/mame/drivers/wmg.cpp @@ -78,7 +78,7 @@ of save-state is also needed. class wmg_state : public williams_state { public: - wmg_state(const machine_config &mconfig, device_type type, std::string tag) + wmg_state(const machine_config &mconfig, device_type type, const char *tag) : williams_state(mconfig, type, tag) , m_p_ram(*this, "nvram") { } @@ -245,7 +245,7 @@ WRITE_LINE_MEMBER( wmg_state::wmg_port_select_w ) CUSTOM_INPUT_MEMBER(wmg_state::wmg_mux_r) { - const char* tag = (const char *)param; + const char *tag = (const char *)param; if (m_wmg_port_select) for (int i = 0; i < m_wmg_port_select; i++) diff --git a/src/mame/drivers/wms.cpp b/src/mame/drivers/wms.cpp index 8a1a6b65a8e..21f56ca3a3d 100644 --- a/src/mame/drivers/wms.cpp +++ b/src/mame/drivers/wms.cpp @@ -88,7 +88,7 @@ class wms_state : public driver_device { public: - wms_state(const machine_config &mconfig, device_type type, std::string tag) + wms_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/wpc_95.cpp b/src/mame/drivers/wpc_95.cpp index 4473fcc56dd..eb305804a4c 100644 --- a/src/mame/drivers/wpc_95.cpp +++ b/src/mame/drivers/wpc_95.cpp @@ -16,7 +16,7 @@ class wpc_95_state : public driver_device { public: - wpc_95_state(const machine_config &mconfig, device_type type, std::string tag) + wpc_95_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), maincpu(*this, "maincpu"), dcs(*this, "dcs"), diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp index 4670b8ea007..893b2331747 100644 --- a/src/mame/drivers/wpc_an.cpp +++ b/src/mame/drivers/wpc_an.cpp @@ -17,7 +17,7 @@ class wpc_an_state : public driver_device { public: - wpc_an_state(const machine_config &mconfig, device_type type, std::string tag) + wpc_an_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_bg(*this,"bg"), diff --git a/src/mame/drivers/wpc_dcs.cpp b/src/mame/drivers/wpc_dcs.cpp index 3ed2ca03e65..daff3ed55d0 100644 --- a/src/mame/drivers/wpc_dcs.cpp +++ b/src/mame/drivers/wpc_dcs.cpp @@ -16,7 +16,7 @@ class wpc_dcs_state : public driver_device { public: - wpc_dcs_state(const machine_config &mconfig, device_type type, std::string tag) + wpc_dcs_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), maincpu(*this, "maincpu"), dcs(*this, "dcs"), diff --git a/src/mame/drivers/wpc_s.cpp b/src/mame/drivers/wpc_s.cpp index 4b29462a0c4..ce4126b6db1 100644 --- a/src/mame/drivers/wpc_s.cpp +++ b/src/mame/drivers/wpc_s.cpp @@ -14,7 +14,7 @@ class wpc_s_state : public driver_device { public: - wpc_s_state(const machine_config &mconfig, device_type type, std::string tag) + wpc_s_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), maincpu(*this, "maincpu"), dcs(*this, "dcs"), diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp index 4a28b0f01b3..01c7bbd83ae 100644 --- a/src/mame/drivers/wyvernf0.cpp +++ b/src/mame/drivers/wyvernf0.cpp @@ -37,7 +37,7 @@ Actual game video: http://www.nicozon.net/watch/sm10823430 class wyvernf0_state : public driver_device { public: - wyvernf0_state(const machine_config &mconfig, device_type type, std::string tag) + wyvernf0_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bgram(*this,"bgram"), m_fgram(*this,"fgram"), diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp index 075a24c0e2a..41783de4e28 100644 --- a/src/mame/drivers/x1twin.cpp +++ b/src/mame/drivers/x1twin.cpp @@ -25,7 +25,7 @@ class x1twin_state : public x1_state { public: - x1twin_state(const machine_config &mconfig, device_type type, std::string tag) + x1twin_state(const machine_config &mconfig, device_type type, const char *tag) : x1_state(mconfig, type, tag) { } UINT32 screen_update_x1pce(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp index 688f8b89d92..faa669cd547 100644 --- a/src/mame/drivers/xavix.cpp +++ b/src/mame/drivers/xavix.cpp @@ -23,7 +23,7 @@ class xavix_state : public driver_device { public: - xavix_state(const machine_config &mconfig, device_type type, std::string tag) + xavix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/xbox.cpp b/src/mame/drivers/xbox.cpp index d664e2fe5dd..04cfb3b9a56 100644 --- a/src/mame/drivers/xbox.cpp +++ b/src/mame/drivers/xbox.cpp @@ -30,7 +30,7 @@ class xbox_state : public xbox_base_state { public: - xbox_state(const machine_config &mconfig, device_type type, std::string tag) : + xbox_state(const machine_config &mconfig, device_type type, const char *tag) : xbox_base_state(mconfig, type, tag), usbhack_index(-1), usbhack_counter(0) diff --git a/src/mame/drivers/xtheball.cpp b/src/mame/drivers/xtheball.cpp index 59b8c9968da..f08785b3726 100644 --- a/src/mame/drivers/xtheball.cpp +++ b/src/mame/drivers/xtheball.cpp @@ -19,7 +19,7 @@ class xtheball_state : public driver_device { public: - xtheball_state(const machine_config &mconfig, device_type type, std::string tag) + xtheball_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tlc34076(*this, "tlc34076"), diff --git a/src/mame/drivers/xtom3d.cpp b/src/mame/drivers/xtom3d.cpp index ff513cf08a9..c017d160442 100644 --- a/src/mame/drivers/xtom3d.cpp +++ b/src/mame/drivers/xtom3d.cpp @@ -52,7 +52,7 @@ MX29F1610MC 16M FlashROM (x7) class xtom3d_state : public pcat_base_state { public: - xtom3d_state(const machine_config &mconfig, device_type type, std::string tag) + xtom3d_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/ymmu100.cpp b/src/mame/drivers/ymmu100.cpp index 105dbc1ca60..a109418b62e 100644 --- a/src/mame/drivers/ymmu100.cpp +++ b/src/mame/drivers/ymmu100.cpp @@ -153,7 +153,7 @@ public: P2_LCD_ENABLE = 0x04 }; - mu100_state(const machine_config &mconfig, device_type type, std::string tag) + mu100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_lcd(*this, "lcd"), @@ -198,7 +198,7 @@ public: class mu100r_state : public mu100_state { public: - mu100r_state(const machine_config &mconfig, device_type type, std::string tag) + mu100r_state(const machine_config &mconfig, device_type type, const char *tag) : mu100_state(mconfig, type, tag) { } diff --git a/src/mame/drivers/z100.cpp b/src/mame/drivers/z100.cpp index 0ec67548ddc..7addd6407cd 100644 --- a/src/mame/drivers/z100.cpp +++ b/src/mame/drivers/z100.cpp @@ -154,7 +154,7 @@ ZDIPSW EQU 0FFH ; Configuration dip switches class z100_state : public driver_device { public: - z100_state(const machine_config &mconfig, device_type type, std::string tag) + z100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pia0(*this, "pia0"), diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp index aff7677cddd..ca1d5c3a3bf 100644 --- a/src/mame/drivers/z1013.cpp +++ b/src/mame/drivers/z1013.cpp @@ -60,7 +60,7 @@ Due to no input checking, misuse of commands can crash the system. class z1013_state : public driver_device { public: - z1013_state(const machine_config &mconfig, device_type type, std::string tag) + z1013_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cass(*this, "cassette"), diff --git a/src/mame/drivers/z80dev.cpp b/src/mame/drivers/z80dev.cpp index 9b57ea427c9..b18d93529a8 100644 --- a/src/mame/drivers/z80dev.cpp +++ b/src/mame/drivers/z80dev.cpp @@ -28,7 +28,7 @@ Press the up-arrow key to confirm data has been entered. class z80dev_state : public driver_device { public: - z80dev_state(const machine_config &mconfig, device_type type, std::string tag) + z80dev_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp index 85dc16e8148..8c824b53f87 100644 --- a/src/mame/drivers/z9001.cpp +++ b/src/mame/drivers/z9001.cpp @@ -44,7 +44,7 @@ ToDo: class z9001_state : public driver_device { public: - z9001_state(const machine_config &mconfig, device_type type, std::string tag) + z9001_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_framecnt(0), diff --git a/src/mame/drivers/zac_1.cpp b/src/mame/drivers/zac_1.cpp index f033114f6c6..ae94d5a5b96 100644 --- a/src/mame/drivers/zac_1.cpp +++ b/src/mame/drivers/zac_1.cpp @@ -37,7 +37,7 @@ ToDo: class zac_1_state : public genpin_class { public: - zac_1_state(const machine_config &mconfig, device_type type, std::string tag) + zac_1_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_p_ram(*this, "ram") diff --git a/src/mame/drivers/zac_2.cpp b/src/mame/drivers/zac_2.cpp index 1bb7e8e62e7..659e38ae6aa 100644 --- a/src/mame/drivers/zac_2.cpp +++ b/src/mame/drivers/zac_2.cpp @@ -15,7 +15,7 @@ class zac_2_state : public driver_device { public: - zac_2_state(const machine_config &mconfig, device_type type, std::string tag) + zac_2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_p_ram(*this, "ram"), diff --git a/src/mame/drivers/zac_proto.cpp b/src/mame/drivers/zac_proto.cpp index c68c4609344..af6b1f604e5 100644 --- a/src/mame/drivers/zac_proto.cpp +++ b/src/mame/drivers/zac_proto.cpp @@ -27,7 +27,7 @@ ToDo: class zac_proto_state : public genpin_class { public: - zac_proto_state(const machine_config &mconfig, device_type type, std::string tag) + zac_proto_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/zapcomputer.cpp b/src/mame/drivers/zapcomputer.cpp index 57207743114..f6dab84cc73 100644 --- a/src/mame/drivers/zapcomputer.cpp +++ b/src/mame/drivers/zapcomputer.cpp @@ -34,7 +34,7 @@ class zapcomp_state : public driver_device { public: - zapcomp_state(const machine_config &mconfig, device_type type, std::string tag) + zapcomp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp index 95ef7eac4c3..cf19f15c8ff 100644 --- a/src/mame/drivers/zaurus.cpp +++ b/src/mame/drivers/zaurus.cpp @@ -1414,7 +1414,7 @@ Note: class zaurus_state : public driver_device { public: - zaurus_state(const machine_config &mconfig, device_type type, std::string tag) + zaurus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, "ram") diff --git a/src/mame/drivers/zexall.cpp b/src/mame/drivers/zexall.cpp index 4d1fe464b4e..4ca777e18dd 100644 --- a/src/mame/drivers/zexall.cpp +++ b/src/mame/drivers/zexall.cpp @@ -29,7 +29,7 @@ One i/o port is used: class zexall_state : public driver_device { public: - zexall_state(const machine_config &mconfig, device_type type, std::string tag) + zexall_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp index d6447089a64..79d6ea77855 100644 --- a/src/mame/drivers/zn.cpp +++ b/src/mame/drivers/zn.cpp @@ -36,7 +36,7 @@ class zn_state : public driver_device { public: - zn_state(const machine_config &mconfig, device_type type, std::string tag) : + zn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_gpu(*this, "gpu"), m_gpu_screen(*this, "gpu:screen"), diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index 278547ce547..647ef396c0f 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -49,7 +49,7 @@ ToDo: class zorba_state : public driver_device { public: - zorba_state(const machine_config &mconfig, device_type type, std::string tag) + zorba_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_maincpu(*this, "maincpu") diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp index 8db49ba17a3..f838f3e21e2 100644 --- a/src/mame/drivers/zr107.cpp +++ b/src/mame/drivers/zr107.cpp @@ -185,7 +185,7 @@ Check gticlub.c for details on the bottom board. class zr107_state : public driver_device { public: - zr107_state(const machine_config &mconfig, device_type type, std::string tag) + zr107_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp index 25586391175..940a0ce6acc 100644 --- a/src/mame/drivers/zrt80.cpp +++ b/src/mame/drivers/zrt80.cpp @@ -33,7 +33,7 @@ public: TIMER_BEEP_OFF }; - zrt80_state(const machine_config &mconfig, device_type type, std::string tag) + zrt80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/drivers/zsbc3.cpp b/src/mame/drivers/zsbc3.cpp index 4e28ad55038..9d4588785c7 100644 --- a/src/mame/drivers/zsbc3.cpp +++ b/src/mame/drivers/zsbc3.cpp @@ -43,7 +43,7 @@ class zsbc3_state : public driver_device { public: - zsbc3_state(const machine_config &mconfig, device_type type, std::string tag) + zsbc3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/etc/template_cpu.cpp b/src/mame/etc/template_cpu.cpp index f5161a71380..3f85ad1dddc 100644 --- a/src/mame/etc/template_cpu.cpp +++ b/src/mame/etc/template_cpu.cpp @@ -99,7 +99,7 @@ void xxx_cpu_device::execute_set_input(int irqline, int state) } #endif -xxx_cpu_device::xxx_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +xxx_cpu_device::xxx_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : cpu_device(mconfig, XXX, "XXX", tag, owner, clock, "xxx", __FILE__) , m_program_config("program", ENDIANNESS_BIG, 8, 32, -1) , m_data_config("data", ENDIANNESS_BIG, 8, 32, 0) diff --git a/src/mame/etc/template_device.cpp b/src/mame/etc/template_device.cpp index 503929bb90b..8bc48c8e5de 100644 --- a/src/mame/etc/template_device.cpp +++ b/src/mame/etc/template_device.cpp @@ -27,7 +27,7 @@ const device_type XXX = &device_creator; // xxx_device - constructor //------------------------------------------------- -xxx_device::xxx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +xxx_device::xxx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, XXX, "xxx_longname", tag, owner, clock, "xxx", __FILE__) { } diff --git a/src/mame/etc/template_device.h b/src/mame/etc/template_device.h index 7359d5ead4b..409c9cb3ad3 100644 --- a/src/mame/etc/template_device.h +++ b/src/mame/etc/template_device.h @@ -30,7 +30,7 @@ class xxx_device : public device_t { public: // construction/destruction - xxx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + xxx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // I/O operations DECLARE_WRITE8_MEMBER( write ); diff --git a/src/mame/etc/template_driver.cpp b/src/mame/etc/template_driver.cpp index 0055b554c7f..c233db1b6ba 100644 --- a/src/mame/etc/template_driver.cpp +++ b/src/mame/etc/template_driver.cpp @@ -16,7 +16,7 @@ Template for skeleton drivers class xxx_state : public driver_device { public: - xxx_state(const machine_config &mconfig, device_type type, std::string tag) + xxx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index 0a3bf182c5d..2a35641950f 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -9,7 +9,7 @@ class _1942_state : public driver_device { public: - _1942_state(const machine_config &mconfig, device_type type, std::string tag) + _1942_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_fg_videoram(*this, "fg_videoram"), diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index 2deeb9b269a..9e926cbf8b6 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -9,7 +9,7 @@ class _1943_state : public driver_device { public: - _1943_state(const machine_config &mconfig, device_type type, std::string tag) + _1943_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/20pacgal.h b/src/mame/includes/20pacgal.h index a29a26ab46e..b9043dd26d2 100644 --- a/src/mame/includes/20pacgal.h +++ b/src/mame/includes/20pacgal.h @@ -14,7 +14,7 @@ class _20pacgal_state : public driver_device { public: - _20pacgal_state(const machine_config &mconfig, device_type type, std::string tag) + _20pacgal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_char_gfx_ram(*this, "char_gfx_ram"), @@ -77,7 +77,7 @@ public: class _25pacman_state : public _20pacgal_state { public: - _25pacman_state(const machine_config &mconfig, device_type type, std::string tag) + _25pacman_state(const machine_config &mconfig, device_type type, const char *tag) : _20pacgal_state(mconfig, type, tag) { } diff --git a/src/mame/includes/3do.h b/src/mame/includes/3do.h index a3be5eb1302..c826052faa4 100644 --- a/src/mame/includes/3do.h +++ b/src/mame/includes/3do.h @@ -139,7 +139,7 @@ struct DSPP { class _3do_state : public driver_device { public: - _3do_state(const machine_config &mconfig, device_type type, std::string tag) + _3do_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dram(*this, "dram"), diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index 78dc572c6a2..f40e4b338f3 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -6,7 +6,7 @@ class fortyl_state : public driver_device { public: - fortyl_state(const machine_config &mconfig, device_type type, std::string tag) + fortyl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_video_ctrl(*this, "video_ctrl"), diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index ad01080c9c9..fbc92212515 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -11,7 +11,7 @@ class _4enraya_state : public driver_device { public: - _4enraya_state(const machine_config &mconfig, device_type type, std::string tag) + _4enraya_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ay(*this, "aysnd"), diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h index 04d37a12018..da298c9174d 100644 --- a/src/mame/includes/8080bw.h +++ b/src/mame/includes/8080bw.h @@ -18,7 +18,7 @@ class _8080bw_state : public mw8080bw_state { public: - _8080bw_state(const machine_config &mconfig, device_type type, std::string tag) + _8080bw_state(const machine_config &mconfig, device_type type, const char *tag) : mw8080bw_state(mconfig, type, tag), m_schaser_effect_555_timer(*this, "schaser_sh_555"), m_claybust_gun_on(*this, "claybust_gun"), diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index ef8565451e8..892b05883df 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -14,7 +14,7 @@ class _88games_state : public driver_device { public: - _88games_state(const machine_config &mconfig, device_type type, std::string tag) + _88games_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/abc1600.h b/src/mame/includes/abc1600.h index 6c76362197c..5269a352c47 100644 --- a/src/mame/includes/abc1600.h +++ b/src/mame/includes/abc1600.h @@ -57,7 +57,7 @@ class abc1600_state : public driver_device { public: - abc1600_state(const machine_config &mconfig, device_type type, std::string tag) + abc1600_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, MC68008P8_TAG), m_dma0(*this, Z8410AB1_0_TAG), diff --git a/src/mame/includes/abc80.h b/src/mame/includes/abc80.h index ee9c032486f..794ce95d141 100644 --- a/src/mame/includes/abc80.h +++ b/src/mame/includes/abc80.h @@ -65,7 +65,7 @@ class abc80_state : public driver_device { public: - abc80_state(const machine_config &mconfig, device_type type, std::string tag) : + abc80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_pio(*this, Z80PIO_TAG), diff --git a/src/mame/includes/abc80x.h b/src/mame/includes/abc80x.h index c56f698438c..ff688fd9702 100644 --- a/src/mame/includes/abc80x.h +++ b/src/mame/includes/abc80x.h @@ -70,7 +70,7 @@ class abc800_state : public driver_device { public: - abc800_state(const machine_config &mconfig, device_type type, std::string tag) : + abc800_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_ctc(*this, Z80CTC_TAG), @@ -160,7 +160,7 @@ public: class abc800m_state : public abc800_state { public: - abc800m_state(const machine_config &mconfig, device_type type, std::string tag) : + abc800m_state(const machine_config &mconfig, device_type type, const char *tag) : abc800_state(mconfig, type, tag), m_crtc(*this, MC6845_TAG), m_palette(*this, "palette"), @@ -189,7 +189,7 @@ public: class abc800c_state : public abc800_state { public: - abc800c_state(const machine_config &mconfig, device_type type, std::string tag) : + abc800c_state(const machine_config &mconfig, device_type type, const char *tag) : abc800_state(mconfig, type, tag), m_trom(*this, SAA5052_TAG), m_palette(*this, "palette"), @@ -218,7 +218,7 @@ public: class abc802_state : public abc800_state { public: - abc802_state(const machine_config &mconfig, device_type type, std::string tag) : + abc802_state(const machine_config &mconfig, device_type type, const char *tag) : abc800_state(mconfig, type, tag), m_crtc(*this, MC6845_TAG), m_palette(*this, "palette"), @@ -262,7 +262,7 @@ public: class abc806_state : public abc800_state { public: - abc806_state(const machine_config &mconfig, device_type type, std::string tag) : + abc806_state(const machine_config &mconfig, device_type type, const char *tag) : abc800_state(mconfig, type, tag), m_crtc(*this, MC6845_TAG), m_palette(*this, "palette"), diff --git a/src/mame/includes/ac1.h b/src/mame/includes/ac1.h index c29e2d960fd..b127b882a2b 100644 --- a/src/mame/includes/ac1.h +++ b/src/mame/includes/ac1.h @@ -15,7 +15,7 @@ class ac1_state : public driver_device { public: - ac1_state(const machine_config &mconfig, device_type type, std::string tag) + ac1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cassette(*this, "cassette"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index 00c10c48986..f26d9843b3f 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -12,7 +12,7 @@ class actfancr_state : public driver_device { public: - actfancr_state(const machine_config &mconfig, device_type type, std::string tag) + actfancr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_main_ram(*this, "main_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/adam.h b/src/mame/includes/adam.h index 4596c0be499..604b14782d6 100644 --- a/src/mame/includes/adam.h +++ b/src/mame/includes/adam.h @@ -28,7 +28,7 @@ class adam_state : public driver_device { public: - adam_state(const machine_config &mconfig, device_type type, std::string tag) : + adam_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_netcpu(*this, M6801_TAG), diff --git a/src/mame/includes/advision.h b/src/mame/includes/advision.h index d4db761cf54..67182a92163 100644 --- a/src/mame/includes/advision.h +++ b/src/mame/includes/advision.h @@ -20,7 +20,7 @@ class advision_state : public driver_device { public: - advision_state(const machine_config &mconfig, device_type type, std::string tag) + advision_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I8048_TAG), m_soundcpu(*this, COP411_TAG), diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index fe895521236..81510561b29 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -9,7 +9,7 @@ class aeroboto_state : public driver_device { public: - aeroboto_state(const machine_config &mconfig, device_type type, std::string tag) + aeroboto_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mainram(*this, "mainram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index bc721632e6f..194640f805c 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -7,7 +7,7 @@ class aerofgt_state : public driver_device { public: - aerofgt_state(const machine_config &mconfig, device_type type, std::string tag) + aerofgt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg1videoram(*this, "bg1videoram"), m_bg2videoram(*this, "bg2videoram"), diff --git a/src/mame/includes/aim65.h b/src/mame/includes/aim65.h index e4893f92885..8ef3a8e98c2 100644 --- a/src/mame/includes/aim65.h +++ b/src/mame/includes/aim65.h @@ -36,7 +36,7 @@ class aim65_state : public driver_device { public: - aim65_state(const machine_config &mconfig, device_type type, std::string tag) + aim65_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cassette1(*this, "cassette"), diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index 63e34f4a535..ae570085a3e 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -11,7 +11,7 @@ class airbustr_state : public driver_device { public: - airbustr_state(const machine_config &mconfig, device_type type, std::string tag) + airbustr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_devram(*this, "devram"), m_videoram2(*this, "videoram2"), diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index 0cbba802a88..3f633044eae 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -9,7 +9,7 @@ class ajax_state : public driver_device { public: - ajax_state(const machine_config &mconfig, device_type type, std::string tag) + ajax_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/alesis.h b/src/mame/includes/alesis.h index 0424cc09c0e..c22899efdd3 100644 --- a/src/mame/includes/alesis.h +++ b/src/mame/includes/alesis.h @@ -28,7 +28,7 @@ class alesis_dm3ag_device : public device_t { public: // construction/destruction - alesis_dm3ag_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + alesis_dm3ag_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -61,7 +61,7 @@ private: class alesis_state : public driver_device { public: - alesis_state(const machine_config &mconfig, device_type type, std::string tag) + alesis_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_lcdc(*this, "hd44780"), m_cassette(*this, "cassette"), diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h index 635e4b9b366..8d78eb14660 100644 --- a/src/mame/includes/aliens.h +++ b/src/mame/includes/aliens.h @@ -14,7 +14,7 @@ class aliens_state : public driver_device { public: - aliens_state(const machine_config &mconfig, device_type type, std::string tag) + aliens_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 367829de950..22fb75f2d21 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -9,7 +9,7 @@ class alpha68k_state : public driver_device { public: - alpha68k_state(const machine_config &mconfig, device_type type, std::string tag) + alpha68k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_shared_ram(*this, "shared_ram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h index b77804f8cef..bb67a139dda 100644 --- a/src/mame/includes/ambush.h +++ b/src/mame/includes/ambush.h @@ -9,7 +9,7 @@ class ambush_state : public driver_device { public: - ambush_state(const machine_config &mconfig, device_type type, std::string tag) + ambush_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 212f4de451f..680dcffdb5e 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -326,7 +326,7 @@ Ernesto Corvi & Mariusz Wojcieszek class amiga_state : public driver_device { public: - amiga_state(const machine_config &mconfig, device_type type, std::string tag) : + amiga_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_agnus_id(AGNUS_NTSC), m_denise_id(DENISE), diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h index b30db6e1306..2270da2dc3e 100644 --- a/src/mame/includes/ampoker2.h +++ b/src/mame/includes/ampoker2.h @@ -3,7 +3,7 @@ class ampoker2_state : public driver_device { public: - ampoker2_state(const machine_config &mconfig, device_type type, std::string tag) + ampoker2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index 14becd93b66..079b811b7f6 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -11,7 +11,7 @@ class amspdwy_state : public driver_device { public: - amspdwy_state(const machine_config &mconfig, device_type type, std::string tag) + amspdwy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/amstrad.h b/src/mame/includes/amstrad.h index 4c3b524e15a..ce09d777428 100644 --- a/src/mame/includes/amstrad.h +++ b/src/mame/includes/amstrad.h @@ -125,7 +125,7 @@ public: TIMER_SET_RESOLUTION }; - amstrad_state(const machine_config &mconfig, device_type type, std::string tag) + amstrad_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ay(*this, "ay"), diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index ab0c5000cd5..ecd59f1e4e5 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -9,7 +9,7 @@ class angelkds_state : public driver_device { public: - angelkds_state(const machine_config &mconfig, device_type type, std::string tag) + angelkds_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bgtopvideoram(*this, "bgtopvideoram"), m_bgbotvideoram(*this, "bgbotvideoram"), diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h index f300aff3d0d..978d2ef0257 100644 --- a/src/mame/includes/apollo.h +++ b/src/mame/includes/apollo.h @@ -38,10 +38,10 @@ #define LOG(x) { logerror x; logerror ("\n"); apollo_check_log(); } #define LOG1(x) { if (VERBOSE > 0) LOG(x) } #define LOG2(x) { if (VERBOSE > 1) LOG(x) } -#define CLOG(x) { machine().logerror ("%s - %s: ", apollo_cpu_context(machine().device(MAINCPU)), tag().c_str()); machine().logerror x; machine().logerror ("\n"); apollo_check_log(); } +#define CLOG(x) { machine().logerror ("%s - %s: ", apollo_cpu_context(machine().device(MAINCPU)), tag()); machine().logerror x; machine().logerror ("\n"); apollo_check_log(); } #define CLOG1(x) { if (VERBOSE > 0) CLOG(x) } #define CLOG2(x) { if (VERBOSE > 1) CLOG(x) } -#define DLOG(x) { device->logerror ("%s - %s: ", apollo_cpu_context(device->machine().device(MAINCPU)), device->tag().c_str()); device->logerror x; device->logerror ("\n"); apollo_check_log(); } +#define DLOG(x) { device->logerror ("%s - %s: ", apollo_cpu_context(device->machine().device(MAINCPU)), device->tag()); device->logerror x; device->logerror ("\n"); apollo_check_log(); } #define DLOG1(x) { if (VERBOSE > 0) DLOG(x) } #define DLOG2(x) { if (VERBOSE > 1) DLOG(x) } #define MLOG(x) { machine().logerror ("%s: ", apollo_cpu_context(machine().device(MAINCPU))); machine().logerror x; machine().logerror ("\n"); apollo_check_log(); } @@ -112,7 +112,7 @@ class apollo_ni; class apollo_state : public driver_device { public: - apollo_state(const machine_config &mconfig, device_type type, std::string tag) + apollo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, MAINCPU), m_messram_ptr(*this, "messram"), @@ -326,7 +326,7 @@ void apollo_csr_set_status_register(UINT16 mask, UINT16 data); class apollo_sio: public mc68681_device { public: - apollo_sio(const machine_config &mconfig, std::string tag, + apollo_sio(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(read); @@ -353,7 +353,7 @@ class apollo_ni: public device_t, public device_image_interface { public: // construction/destruction - apollo_ni(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + apollo_ni(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~apollo_ni(); virtual iodevice_t image_type() const override { return IO_ROM; } @@ -398,8 +398,8 @@ extern const device_type APOLLO_NI; class apollo_graphics_15i : public device_t { public: - apollo_graphics_15i(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - apollo_graphics_15i(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, device_type type, const char *name, const char *shortname, const char *source); + apollo_graphics_15i(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + apollo_graphics_15i(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type, const char *name, const char *shortname, const char *source); ~apollo_graphics_15i(); UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -637,7 +637,7 @@ MACHINE_CONFIG_EXTERN( apollo_graphics ); class apollo_graphics_19i : public apollo_graphics_15i { public: - apollo_graphics_19i(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + apollo_graphics_19i(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_config_complete() override; @@ -676,7 +676,7 @@ class apollo_stdio_device: public device_t, public device_serial_interface { public: // construction/destruction - apollo_stdio_device(const machine_config &mconfig, std::string tag, + apollo_stdio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_tx_cb(device_t &device, _Object object) diff --git a/src/mame/includes/apple1.h b/src/mame/includes/apple1.h index b1010cb6313..35215b9e9a3 100644 --- a/src/mame/includes/apple1.h +++ b/src/mame/includes/apple1.h @@ -32,7 +32,7 @@ struct terminal_t class apple1_state : public driver_device { public: - apple1_state(const machine_config &mconfig, device_type type, std::string tag) + apple1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/includes/apple2.h b/src/mame/includes/apple2.h index ff01bd53410..0216a80236e 100644 --- a/src/mame/includes/apple2.h +++ b/src/mame/includes/apple2.h @@ -125,7 +125,7 @@ struct apple2_memmap_config class apple2_state : public driver_device { public: - apple2_state(const machine_config &mconfig, device_type type, std::string tag) + apple2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/includes/apple2gs.h b/src/mame/includes/apple2gs.h index e50d9faa041..6812cc2b466 100644 --- a/src/mame/includes/apple2gs.h +++ b/src/mame/includes/apple2gs.h @@ -90,7 +90,7 @@ void apple2gs_remove_irq(running_machine &machine, UINT16 irq_mask); class apple2gs_state : public apple2_state { public: - apple2gs_state(const machine_config &mconfig, device_type type, std::string tag) + apple2gs_state(const machine_config &mconfig, device_type type, const char *tag) : apple2_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_es5503(*this, "es5503"), diff --git a/src/mame/includes/apple3.h b/src/mame/includes/apple3.h index 896aaac8671..4d53b0bba56 100644 --- a/src/mame/includes/apple3.h +++ b/src/mame/includes/apple3.h @@ -40,7 +40,7 @@ class apple3_state : public driver_device { public: - apple3_state(const machine_config &mconfig, device_type type, std::string tag) + apple3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 5200de8cc94..34e49e02c8b 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -5,7 +5,7 @@ class appoooh_state : public driver_device { public: - appoooh_state(const machine_config &mconfig, device_type type, std::string tag) + appoooh_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_fg_videoram(*this, "fg_videoram"), diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index d0e7da92199..2741a17be17 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -6,7 +6,7 @@ class aquarium_state : public driver_device { public: - aquarium_state(const machine_config &mconfig, device_type type, std::string tag) + aquarium_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mid_videoram(*this, "mid_videoram"), m_bak_videoram(*this, "bak_videoram"), diff --git a/src/mame/includes/aquarius.h b/src/mame/includes/aquarius.h index a5ea8517ccc..c9325f074b6 100644 --- a/src/mame/includes/aquarius.h +++ b/src/mame/includes/aquarius.h @@ -22,7 +22,7 @@ class aquarius_state : public driver_device { public: - aquarius_state(const machine_config &mconfig, device_type type, std::string tag) + aquarius_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cassette(*this, "cassette"), diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h index 96ca38c5e20..0dc5fc7fde2 100644 --- a/src/mame/includes/arabian.h +++ b/src/mame/includes/arabian.h @@ -11,7 +11,7 @@ class arabian_state : public driver_device { public: - arabian_state(const machine_config &mconfig, device_type type, std::string tag) + arabian_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_custom_cpu_ram(*this, "custom_cpu_ram"), m_blitter(*this, "blitter"), diff --git a/src/mame/includes/arcadecl.h b/src/mame/includes/arcadecl.h index 480c7f20073..7a580d012c1 100644 --- a/src/mame/includes/arcadecl.h +++ b/src/mame/includes/arcadecl.h @@ -12,7 +12,7 @@ class arcadecl_state : public atarigen_state { public: - arcadecl_state(const machine_config &mconfig, device_type type, std::string tag) + arcadecl_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_mob(*this, "mob"), m_bitmap(*this, "bitmap") { } diff --git a/src/mame/includes/arcadia.h b/src/mame/includes/arcadia.h index f9f7931ee66..164c095852c 100644 --- a/src/mame/includes/arcadia.h +++ b/src/mame/includes/arcadia.h @@ -29,7 +29,7 @@ class arcadia_state : public driver_device { public: - arcadia_state(const machine_config &mconfig, device_type type, std::string tag) + arcadia_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_custom(*this, "custom"), m_panel(*this, "panel"), diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h index 8158adb5418..9156fa255eb 100644 --- a/src/mame/includes/archimds.h +++ b/src/mame/includes/archimds.h @@ -44,7 +44,7 @@ class archimedes_state : public driver_device { public: - archimedes_state(const machine_config &mconfig, device_type type, std::string tag) + archimedes_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_kart(*this, "kart"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index 1f3f136726a..1274f9a5d58 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -5,7 +5,7 @@ class argus_state : public driver_device { public: - argus_state(const machine_config &mconfig, device_type type, std::string tag) + argus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index 7da89d7e72d..05d3ab53400 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -20,7 +20,7 @@ public: TIMER_68705_PRESCALER_EXPIRED, }; - arkanoid_state(const machine_config &mconfig, device_type type, std::string tag) + arkanoid_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this,"videoram"), m_spriteram(*this,"spriteram"), diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index 8c58a01cef3..b09b256ee45 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -6,7 +6,7 @@ class armedf_state : public driver_device { public: - armedf_state(const machine_config &mconfig, device_type type, std::string tag) + armedf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_extra(*this, "extra"), @@ -104,7 +104,7 @@ public: class bigfghtr_state : public armedf_state { public: - bigfghtr_state(const machine_config &mconfig, device_type type, std::string tag) + bigfghtr_state(const machine_config &mconfig, device_type type, const char *tag) : armedf_state(mconfig, type, tag), m_sharedram(*this, "sharedram") { } diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h index d02da1fcd7b..32f56fd2747 100644 --- a/src/mame/includes/artmagic.h +++ b/src/mame/includes/artmagic.h @@ -16,7 +16,7 @@ public: TIMER_IRQ_OFF }; - artmagic_state(const machine_config &mconfig, device_type type, std::string tag) + artmagic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index 5de4adc05d2..028ccdd650a 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -10,7 +10,7 @@ class ashnojoe_state : public driver_device { public: - ashnojoe_state(const machine_config &mconfig, device_type type, std::string tag) + ashnojoe_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tileram_3(*this, "tileram_3"), m_tileram_4(*this, "tileram_4"), diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h index 05acbea623b..04a65a6aee3 100644 --- a/src/mame/includes/asterix.h +++ b/src/mame/includes/asterix.h @@ -18,7 +18,7 @@ public: TIMER_NMI }; - asterix_state(const machine_config &mconfig, device_type type, std::string tag) + asterix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h index 6ce78646fe0..3929311d0c9 100644 --- a/src/mame/includes/asteroid.h +++ b/src/mame/includes/asteroid.h @@ -12,7 +12,7 @@ class asteroid_state : public driver_device { public: - asteroid_state(const machine_config &mconfig, device_type type, std::string tag) + asteroid_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dvg(*this, "dvg"), diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index c6901fcfcf1..99ec5cc7e39 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -29,7 +29,7 @@ public: TIMER_SCANLINE }; - astrocde_state(const machine_config &mconfig, device_type type, std::string tag) + astrocde_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h index 11a69a7aed8..f45a3681777 100644 --- a/src/mame/includes/astrof.h +++ b/src/mame/includes/astrof.h @@ -12,7 +12,7 @@ class astrof_state : public driver_device { public: - astrof_state(const machine_config &mconfig, device_type type, std::string tag) + astrof_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_astrof_color(*this, "astrof_color"), diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h index 963a0ba5daa..5e824c3da78 100644 --- a/src/mame/includes/asuka.h +++ b/src/mame/includes/asuka.h @@ -20,7 +20,7 @@ public: TIMER_CADASH_INTERRUPT5 }; - asuka_state(const machine_config &mconfig, device_type type, std::string tag) + asuka_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cadash_shared_ram(*this, "sharedram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/at.h b/src/mame/includes/at.h index 34d213537d4..7d1d8e84d4b 100644 --- a/src/mame/includes/at.h +++ b/src/mame/includes/at.h @@ -50,7 +50,7 @@ class at586_state : public driver_device { public: - at586_state(const machine_config &mconfig, device_type type, std::string tag) + at586_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } required_device m_maincpu; @@ -61,7 +61,7 @@ public: class at_state : public driver_device { public: - at_state(const machine_config &mconfig, device_type type, std::string tag) + at_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pic8259_master(*this, "pic8259_master"), @@ -170,7 +170,7 @@ public: class megapc_state : public driver_device { public: - megapc_state(const machine_config &mconfig, device_type type, std::string tag) + megapc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_wd7600(*this, "wd7600"), diff --git a/src/mame/includes/atari.h b/src/mame/includes/atari.h index e7df9e30db6..ed899fc5386 100644 --- a/src/mame/includes/atari.h +++ b/src/mame/includes/atari.h @@ -23,7 +23,7 @@ class atari_common_state : public driver_device { public: - atari_common_state(const machine_config &mconfig, device_type type, std::string tag) + atari_common_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gtia(*this, "gtia"), diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index 5bfe589dcd2..445ab76f18a 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -20,7 +20,7 @@ class atarifb_state : public driver_device { public: - atarifb_state(const machine_config &mconfig, device_type type, std::string tag) + atarifb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_alphap1_videoram(*this, "p1_videoram"), m_alphap2_videoram(*this, "p2_videoram"), diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h index 7b17b33b571..3cef67afe31 100644 --- a/src/mame/includes/atarig1.h +++ b/src/mame/includes/atarig1.h @@ -13,7 +13,7 @@ class atarig1_state : public atarigen_state { public: - atarig1_state(const machine_config &mconfig, device_type type, std::string tag) + atarig1_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_jsa(*this, "jsa"), diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h index 05880a6675e..048d0c5384e 100644 --- a/src/mame/includes/atarig42.h +++ b/src/mame/includes/atarig42.h @@ -14,7 +14,7 @@ class atarig42_state : public atarigen_state { public: - atarig42_state(const machine_config &mconfig, device_type type, std::string tag) + atarig42_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_jsa(*this, "jsa"), diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h index 6f6ee9f5d7a..b2bc558eb1f 100644 --- a/src/mame/includes/atarigt.h +++ b/src/mame/includes/atarigt.h @@ -18,7 +18,7 @@ class atarigt_state : public atarigen_state { public: - atarigt_state(const machine_config &mconfig, device_type type, std::string tag) + atarigt_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_colorram(*this, "colorram", 32), m_playfield_tilemap(*this, "playfield"), diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h index 4ef3932f41c..e0393e3b22e 100644 --- a/src/mame/includes/atarigx2.h +++ b/src/mame/includes/atarigx2.h @@ -14,7 +14,7 @@ class atarigx2_state : public atarigen_state { public: - atarigx2_state(const machine_config &mconfig, device_type type, std::string tag) + atarigx2_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_jsa(*this, "jsa"), m_mo_command(*this, "mo_command"), diff --git a/src/mame/includes/atarist.h b/src/mame/includes/atarist.h index c9499ac7895..34a6be7972e 100644 --- a/src/mame/includes/atarist.h +++ b/src/mame/includes/atarist.h @@ -80,7 +80,7 @@ public: TIMER_BLITTER_TICK }; - st_state(const machine_config &mconfig, device_type type, std::string tag) + st_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M68000_TAG), m_fdc(*this, WD1772_TAG), @@ -341,7 +341,7 @@ protected: class megast_state : public st_state { public: - megast_state(const machine_config &mconfig, device_type type, std::string tag) + megast_state(const machine_config &mconfig, device_type type, const char *tag) : st_state(mconfig, type, tag) { } @@ -358,7 +358,7 @@ public: TIMER_MICROWIRE_TICK }; - ste_state(const machine_config &mconfig, device_type type, std::string tag) + ste_state(const machine_config &mconfig, device_type type, const char *tag) : st_state(mconfig, type, tag), m_lmc1992(*this, LMC1992_TAG) { } @@ -433,7 +433,7 @@ protected: class megaste_state : public ste_state { public: - megaste_state(const machine_config &mconfig, device_type type, std::string tag) + megaste_state(const machine_config &mconfig, device_type type, const char *tag) : ste_state(mconfig, type, tag) { } @@ -448,7 +448,7 @@ public: class stbook_state : public ste_state { public: - stbook_state(const machine_config &mconfig, device_type type, std::string tag) + stbook_state(const machine_config &mconfig, device_type type, const char *tag) : ste_state(mconfig, type, tag), m_sw400(*this, "SW400") { } diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h index 71e8da26e6c..a2e27c24704 100644 --- a/src/mame/includes/atarisy1.h +++ b/src/mame/includes/atarisy1.h @@ -13,7 +13,7 @@ class atarisy1_state : public atarigen_state { public: - atarisy1_state(const machine_config &mconfig, device_type type, std::string tag) + atarisy1_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_bankselect(*this, "bankselect"), m_mob(*this, "mob"), diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h index 793a4834d59..21be1d85549 100644 --- a/src/mame/includes/atarisy2.h +++ b/src/mame/includes/atarisy2.h @@ -15,7 +15,7 @@ class atarisy2_state : public atarigen_state { public: - atarisy2_state(const machine_config &mconfig, device_type type, std::string tag) + atarisy2_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index 07e85aa679d..e35b6b9e62c 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -11,7 +11,7 @@ class atetris_state : public driver_device { public: - atetris_state(const machine_config &mconfig, device_type type, std::string tag) + atetris_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/atom.h b/src/mame/includes/atom.h index b593f66be3a..af9ecff57cf 100644 --- a/src/mame/includes/atom.h +++ b/src/mame/includes/atom.h @@ -41,7 +41,7 @@ class atom_state : public driver_device { public: - atom_state(const machine_config &mconfig, device_type type, std::string tag) + atom_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, SY6502_TAG), m_vdg(*this, MC6847_TAG), @@ -120,7 +120,7 @@ public: class atomeb_state : public atom_state { public: - atomeb_state(const machine_config &mconfig, device_type type, std::string tag) + atomeb_state(const machine_config &mconfig, device_type type, const char *tag) : atom_state(mconfig, type, tag), m_e0(*this, "rom_e0"), m_e1(*this, "rom_e1") diff --git a/src/mame/includes/aussiebyte.h b/src/mame/includes/aussiebyte.h index 6fe92a61538..0f798e1a99f 100644 --- a/src/mame/includes/aussiebyte.h +++ b/src/mame/includes/aussiebyte.h @@ -30,7 +30,7 @@ class aussiebyte_state : public driver_device { public: - aussiebyte_state(const machine_config &mconfig, device_type type, std::string tag) + aussiebyte_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_maincpu(*this, "maincpu") diff --git a/src/mame/includes/avalnche.h b/src/mame/includes/avalnche.h index 373327ce4d7..e1884176ae1 100644 --- a/src/mame/includes/avalnche.h +++ b/src/mame/includes/avalnche.h @@ -12,7 +12,7 @@ class avalnche_state : public driver_device { public: - avalnche_state(const machine_config &mconfig, device_type type, std::string tag) + avalnche_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_discrete(*this, "discrete"), diff --git a/src/mame/includes/avigo.h b/src/mame/includes/avigo.h index ec1d82310c8..6ef813906b6 100644 --- a/src/mame/includes/avigo.h +++ b/src/mame/includes/avigo.h @@ -29,7 +29,7 @@ class avigo_state : public driver_device { public: - avigo_state(const machine_config &mconfig, device_type type, std::string tag) + avigo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h index 6786c3cba26..45cb076ec3c 100644 --- a/src/mame/includes/aztarac.h +++ b/src/mame/includes/aztarac.h @@ -11,7 +11,7 @@ class aztarac_state : public driver_device { public: - aztarac_state(const machine_config &mconfig, device_type type, std::string tag) + aztarac_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/b2m.h b/src/mame/includes/b2m.h index fb1d50e6e49..a267a2b7538 100644 --- a/src/mame/includes/b2m.h +++ b/src/mame/includes/b2m.h @@ -20,7 +20,7 @@ class b2m_state : public driver_device { public: - b2m_state(const machine_config &mconfig, device_type type, std::string tag) + b2m_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h index 1ed276ecf0f..dca560b4466 100644 --- a/src/mame/includes/badlands.h +++ b/src/mame/includes/badlands.h @@ -12,7 +12,7 @@ class badlands_state : public atarigen_state { public: - badlands_state(const machine_config &mconfig, device_type type, std::string tag) + badlands_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_playfield_tilemap(*this, "playfield"), m_mob(*this, "mob") { } diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h index fca8de986c9..f38bb7e361d 100644 --- a/src/mame/includes/bagman.h +++ b/src/mame/includes/bagman.h @@ -5,7 +5,7 @@ class bagman_state : public driver_device { public: - bagman_state(const machine_config &mconfig, device_type type, std::string tag) + bagman_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index 126ac063087..c3bd5218959 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -31,7 +31,7 @@ class balsente_state : public driver_device { public: - balsente_state(const machine_config &mconfig, device_type type, std::string tag) + balsente_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_scanline_timer(*this, "scan_timer"), m_counter_0_timer(*this, "8253_0_timer"), diff --git a/src/mame/includes/banctec.h b/src/mame/includes/banctec.h index ab8744ca894..d41e87c777e 100644 --- a/src/mame/includes/banctec.h +++ b/src/mame/includes/banctec.h @@ -14,7 +14,7 @@ class banctec_state : public driver_device { public: - banctec_state(const machine_config &mconfig, device_type type, std::string tag) + banctec_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index ec7aefe74f7..9eb8b731cd0 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -9,7 +9,7 @@ class bankp_state : public driver_device { public: - bankp_state(const machine_config &mconfig, device_type type, std::string tag) + bankp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h index f8940e08551..fb468780ea9 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -5,7 +5,7 @@ class baraduke_state : public driver_device { public: - baraduke_state(const machine_config &mconfig, device_type type, std::string tag) + baraduke_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h index 666ce66f2ba..f98632ee177 100644 --- a/src/mame/includes/batman.h +++ b/src/mame/includes/batman.h @@ -13,7 +13,7 @@ class batman_state : public atarigen_state { public: - batman_state(const machine_config &mconfig, device_type type, std::string tag) + batman_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_jsa(*this, "jsa"), m_vad(*this, "vad") { } diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index e676679ce9c..1a6e6124a12 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -9,7 +9,7 @@ class battlane_state : public driver_device { public: - battlane_state(const machine_config &mconfig, device_type type, std::string tag) + battlane_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tileram(*this, "tileram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index 7bbaf80ee50..3c1c72b4806 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -9,7 +9,7 @@ class battlera_state : public driver_device { public: - battlera_state(const machine_config &mconfig, device_type type, std::string tag) + battlera_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index 298dfd83cdf..cf4ac5ead7f 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -9,7 +9,7 @@ class battlex_state : public driver_device { public: - battlex_state(const machine_config &mconfig, device_type type, std::string tag) + battlex_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h index a036fbf34d6..b6eff358b79 100644 --- a/src/mame/includes/battlnts.h +++ b/src/mame/includes/battlnts.h @@ -12,7 +12,7 @@ class battlnts_state : public driver_device { public: - battlnts_state(const machine_config &mconfig, device_type type, std::string tag) + battlnts_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/bbc.h b/src/mame/includes/bbc.h index a8cffc7c5ac..8a5851a664f 100644 --- a/src/mame/includes/bbc.h +++ b/src/mame/includes/bbc.h @@ -46,7 +46,7 @@ enum machine_type_t class bbc_state : public driver_device { public: - bbc_state(const machine_config &mconfig, device_type type, std::string tag) : + bbc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index 48cd5206084..c2c4526502f 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -5,7 +5,7 @@ class bbusters_state : public driver_device { public: - bbusters_state(const machine_config &mconfig, device_type type, std::string tag) + bbusters_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/beathead.h b/src/mame/includes/beathead.h index 88ae6dc91a4..5913cb4a997 100644 --- a/src/mame/includes/beathead.h +++ b/src/mame/includes/beathead.h @@ -13,7 +13,7 @@ class beathead_state : public atarigen_state { public: - beathead_state(const machine_config &mconfig, device_type type, std::string tag) + beathead_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_jsa(*this, "jsa"), diff --git a/src/mame/includes/bebox.h b/src/mame/includes/bebox.h index 27c64903fa7..80ace184a53 100644 --- a/src/mame/includes/bebox.h +++ b/src/mame/includes/bebox.h @@ -32,7 +32,7 @@ public: TIMER_GET_DEVICES }; - bebox_state(const machine_config &mconfig, device_type type, std::string tag) + bebox_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ppc1(*this, "ppc1"), m_ppc2(*this, "ppc2"), diff --git a/src/mame/includes/beezer.h b/src/mame/includes/beezer.h index 9fcd8496215..a4afe9f6d30 100644 --- a/src/mame/includes/beezer.h +++ b/src/mame/includes/beezer.h @@ -8,7 +8,7 @@ class beezer_sound_device; class beezer_state : public driver_device { public: - beezer_state(const machine_config &mconfig, device_type type, std::string tag) + beezer_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), @@ -70,7 +70,7 @@ class beezer_sound_device : public device_t, public device_sound_interface { public: - beezer_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + beezer_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~beezer_sound_device() {} DECLARE_READ8_MEMBER( sh6840_r ); diff --git a/src/mame/includes/bfm_ad5.h b/src/mame/includes/bfm_ad5.h index 6950d970e3d..39f01c25739 100644 --- a/src/mame/includes/bfm_ad5.h +++ b/src/mame/includes/bfm_ad5.h @@ -7,7 +7,7 @@ class adder5_state : public driver_device { public: - adder5_state(const machine_config &mconfig, device_type type, std::string tag) + adder5_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/includes/bfm_sc45.h b/src/mame/includes/bfm_sc45.h index cd4bf707f74..5844cdc9a1b 100644 --- a/src/mame/includes/bfm_sc45.h +++ b/src/mame/includes/bfm_sc45.h @@ -63,7 +63,7 @@ class bfm_sc45_state : public driver_device { public: - bfm_sc45_state(const machine_config &mconfig, device_type type, std::string tag) + bfm_sc45_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_duart(*this, "duart68681"), m_vfd0(*this, "vfd0"), @@ -98,7 +98,7 @@ void bfm_sc45_write_serial_vfd(running_machine &machine, bool cs, bool clock, bo class sc4_state : public bfm_sc45_state { public: - sc4_state(const machine_config &mconfig, device_type type, std::string tag) + sc4_state(const machine_config &mconfig, device_type type, const char *tag) : bfm_sc45_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cpuregion(*this, "maincpu"), @@ -623,7 +623,7 @@ protected: class sc4_adder4_state : public sc4_state { public: - sc4_adder4_state(const machine_config &mconfig, device_type type, std::string tag) + sc4_adder4_state(const machine_config &mconfig, device_type type, const char *tag) : sc4_state(mconfig, type, tag), m_adder4cpu(*this, "adder4") { } diff --git a/src/mame/includes/bfm_sc5.h b/src/mame/includes/bfm_sc5.h index e8d815fea76..004a727ce04 100644 --- a/src/mame/includes/bfm_sc5.h +++ b/src/mame/includes/bfm_sc5.h @@ -6,7 +6,7 @@ class bfm_sc5_state : public bfm_sc45_state { public: - bfm_sc5_state(const machine_config &mconfig, device_type type, std::string tag) + bfm_sc5_state(const machine_config &mconfig, device_type type, const char *tag) : bfm_sc45_state(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index 5907235db8d..d0bd4a3cea5 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -5,7 +5,7 @@ class bigevglf_state : public driver_device { public: - bigevglf_state(const machine_config &mconfig, device_type type, std::string tag) + bigevglf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_paletteram(*this, "paletteram"), m_spriteram1(*this, "spriteram1"), diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index 43925568e6f..dd7bf0cb86c 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -3,7 +3,7 @@ class bigstrkb_state : public driver_device { public: - bigstrkb_state(const machine_config &mconfig, device_type type, std::string tag) + bigstrkb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index 1c138a84cac..afe83c076cb 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -13,7 +13,7 @@ class bionicc_state : public driver_device { public: - bionicc_state(const machine_config &mconfig, device_type type, std::string tag) + bionicc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram") , m_txvideoram(*this, "txvideoram"), diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h index a68c0456f3c..f2421b3b3b9 100644 --- a/src/mame/includes/bishi.h +++ b/src/mame/includes/bishi.h @@ -18,7 +18,7 @@ class bishi_state : public driver_device { public: - bishi_state(const machine_config &mconfig, device_type type, std::string tag) + bishi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/bk.h b/src/mame/includes/bk.h index f65dd632436..cd872bcaa88 100644 --- a/src/mame/includes/bk.h +++ b/src/mame/includes/bk.h @@ -13,7 +13,7 @@ class bk_state : public driver_device { public: - bk_state(const machine_config &mconfig, device_type type, std::string tag) + bk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bk0010_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index 081a632f244..ffd455d3421 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -5,7 +5,7 @@ class bking_state : public driver_device { public: - bking_state(const machine_config &mconfig, device_type type, std::string tag) + bking_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_playfield_ram(*this, "playfield_ram"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index ac53b37a3a3..e95eac874e8 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -14,7 +14,7 @@ class bladestl_state : public driver_device { public: - bladestl_state(const machine_config &mconfig, device_type type, std::string tag) + bladestl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index 30eeb0b999d..c464103385e 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -11,7 +11,7 @@ class blktiger_state : public driver_device { public: - blktiger_state(const machine_config &mconfig, device_type type, std::string tag) + blktiger_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram") , m_txvideoram(*this, "txvideoram"), diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index b195e9bcc18..2fbc5390e01 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -9,7 +9,7 @@ class blmbycar_state : public driver_device { public: - blmbycar_state(const machine_config &mconfig, device_type type, std::string tag) + blmbycar_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram_1(*this, "vram_1"), m_vram_0(*this, "vram_0"), diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h index 5133478053b..d0b40e1f628 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -6,7 +6,7 @@ class blockade_state : public driver_device { public: - blockade_state(const machine_config &mconfig, device_type type, std::string tag) + blockade_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_discrete(*this, "discrete"), diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h index 3360004f49f..81758b92397 100644 --- a/src/mame/includes/blockout.h +++ b/src/mame/includes/blockout.h @@ -9,7 +9,7 @@ class blockout_state : public driver_device { public: - blockout_state(const machine_config &mconfig, device_type type, std::string tag) + blockout_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_frontvideoram(*this, "frontvideoram"), diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h index 6254f731b20..a4bfc21a918 100644 --- a/src/mame/includes/bloodbro.h +++ b/src/mame/includes/bloodbro.h @@ -3,7 +3,7 @@ class bloodbro_state : public driver_device { public: - bloodbro_state(const machine_config &mconfig, device_type type, std::string tag) + bloodbro_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h index f22f40144f1..d1cedbeead6 100644 --- a/src/mame/includes/blstroid.h +++ b/src/mame/includes/blstroid.h @@ -19,7 +19,7 @@ public: TIMER_IRQ_ON }; - blstroid_state(const machine_config &mconfig, device_type type, std::string tag) + blstroid_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_playfield_tilemap(*this, "playfield"), m_jsa(*this, "jsa"), diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index 3e9022da8a4..f515e0c6ed1 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -9,7 +9,7 @@ class blueprnt_state : public driver_device { public: - blueprnt_state(const machine_config &mconfig, device_type type, std::string tag) + blueprnt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index acc163f58f7..d5bd855fac3 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -11,7 +11,7 @@ class bogeyman_state : public driver_device { public: - bogeyman_state(const machine_config &mconfig, device_type type, std::string tag) + bogeyman_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index a1f32ad899e..db58222ccea 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -9,7 +9,7 @@ class bombjack_state : public driver_device { public: - bombjack_state(const machine_config &mconfig, device_type type, std::string tag) + bombjack_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h index 2093f989597..9b28449b41b 100644 --- a/src/mame/includes/boogwing.h +++ b/src/mame/includes/boogwing.h @@ -17,7 +17,7 @@ class boogwing_state : public driver_device { public: - boogwing_state(const machine_config &mconfig, device_type type, std::string tag) + boogwing_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h index 18ead5f59bb..cfaa72de2b0 100644 --- a/src/mame/includes/bottom9.h +++ b/src/mame/includes/bottom9.h @@ -14,7 +14,7 @@ class bottom9_state : public driver_device { public: - bottom9_state(const machine_config &mconfig, device_type type, std::string tag) + bottom9_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index fa100f8d896..c3cfd0d6daa 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -9,7 +9,7 @@ class brkthru_state : public driver_device { public: - brkthru_state(const machine_config &mconfig, device_type type, std::string tag) + brkthru_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_videoram(*this, "fg_videoram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index a1bfc588e1b..5ef6ba53321 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -18,7 +18,7 @@ class bsktball_state : public driver_device { public: - bsktball_state(const machine_config &mconfig, device_type type, std::string tag) + bsktball_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_motion(*this, "motion"), diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 4ded4c99674..fb27d1722cc 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -9,7 +9,7 @@ class btime_state : public driver_device { public: - btime_state(const machine_config &mconfig, device_type type, std::string tag) + btime_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_rambase(*this, "rambase"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h index fcf90b3d214..065137c3262 100644 --- a/src/mame/includes/btoads.h +++ b/src/mame/includes/btoads.h @@ -17,7 +17,7 @@ class btoads_state : public driver_device { public: - btoads_state(const machine_config &mconfig, device_type type, std::string tag) + btoads_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu"), m_bsmt(*this, "bsmt"), diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index d24e31b9d30..c308ac921b5 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -10,7 +10,7 @@ public: TIMER_M68705_IRQ_ACK }; - bublbobl_state(const machine_config &mconfig, device_type type, std::string tag) + bublbobl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_objectram(*this, "objectram"), diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index 4abdde02a2e..f55343b1122 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -10,7 +10,7 @@ class buggychl_state : public driver_device { public: - buggychl_state(const machine_config &mconfig, device_type type, std::string tag) + buggychl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_charram(*this, "charram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/bullet.h b/src/mame/includes/bullet.h index 978f810e1b3..206b5dac222 100644 --- a/src/mame/includes/bullet.h +++ b/src/mame/includes/bullet.h @@ -30,7 +30,7 @@ class bullet_state : public driver_device { public: - bullet_state(const machine_config &mconfig, device_type type, std::string tag) + bullet_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_ctc(*this, Z80CTC_TAG), @@ -131,7 +131,7 @@ public: class bulletf_state : public bullet_state { public: - bulletf_state(const machine_config &mconfig, device_type type, std::string tag) : + bulletf_state(const machine_config &mconfig, device_type type, const char *tag) : bullet_state(mconfig, type, tag), m_floppy8(*this, MB8877_TAG":8"), m_floppy9(*this, MB8877_TAG":9"), diff --git a/src/mame/includes/busicom.h b/src/mame/includes/busicom.h index 3b04f20c5d0..d6a5423808f 100644 --- a/src/mame/includes/busicom.h +++ b/src/mame/includes/busicom.h @@ -14,7 +14,7 @@ class busicom_state : public driver_device { public: - busicom_state(const machine_config &mconfig, device_type type, std::string tag) + busicom_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette") { } diff --git a/src/mame/includes/bw12.h b/src/mame/includes/bw12.h index 0916575a16c..39330c20fcb 100644 --- a/src/mame/includes/bw12.h +++ b/src/mame/includes/bw12.h @@ -38,7 +38,7 @@ class bw12_state : public driver_device { public: - bw12_state(const machine_config &mconfig, device_type type, std::string tag) + bw12_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_pia(*this, PIA6821_TAG), diff --git a/src/mame/includes/bw2.h b/src/mame/includes/bw2.h index 42531a11146..041e8e4d5e5 100644 --- a/src/mame/includes/bw2.h +++ b/src/mame/includes/bw2.h @@ -31,7 +31,7 @@ class bw2_state : public driver_device { public: - bw2_state(const machine_config &mconfig, device_type type, std::string tag) + bw2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_uart(*this, I8251_TAG), diff --git a/src/mame/includes/bwidow.h b/src/mame/includes/bwidow.h index dc357b45979..48c53e2c87c 100644 --- a/src/mame/includes/bwidow.h +++ b/src/mame/includes/bwidow.h @@ -11,7 +11,7 @@ class bwidow_state : public driver_device { public: - bwidow_state(const machine_config &mconfig, device_type type, std::string tag) + bwidow_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index ee249399cf9..215cb663122 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -13,7 +13,7 @@ class bwing_state : public driver_device { public: - bwing_state(const machine_config &mconfig, device_type type, std::string tag) + bwing_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h index b9ab8687de9..98894644a3c 100644 --- a/src/mame/includes/bzone.h +++ b/src/mame/includes/bzone.h @@ -16,7 +16,7 @@ class bzone_state : public driver_device { public: - bzone_state(const machine_config &mconfig, device_type type, std::string tag) + bzone_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mathbox(*this, "mathbox"), diff --git a/src/mame/includes/c128.h b/src/mame/includes/c128.h index edb95947442..03d72b42db5 100644 --- a/src/mame/includes/c128.h +++ b/src/mame/includes/c128.h @@ -42,7 +42,7 @@ class c128_state : public driver_device { public: - c128_state(const machine_config &mconfig, device_type type, std::string tag) : + c128_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80A_TAG), m_subcpu(*this, M8502_TAG), diff --git a/src/mame/includes/c64.h b/src/mame/includes/c64.h index 4394e447213..2bf654f9080 100644 --- a/src/mame/includes/c64.h +++ b/src/mame/includes/c64.h @@ -34,7 +34,7 @@ class c64_state : public driver_device { public: - c64_state(const machine_config &mconfig, device_type type, std::string tag) : + c64_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M6510_TAG), m_pla(*this, PLA_TAG), @@ -179,7 +179,7 @@ public: class sx64_state : public c64_state { public: - sx64_state(const machine_config &mconfig, device_type type, std::string tag) + sx64_state(const machine_config &mconfig, device_type type, const char *tag) : c64_state(mconfig, type, tag) { } @@ -191,7 +191,7 @@ public: class c64c_state : public c64_state { public: - c64c_state(const machine_config &mconfig, device_type type, std::string tag) + c64c_state(const machine_config &mconfig, device_type type, const char *tag) : c64_state(mconfig, type, tag) { } }; @@ -200,7 +200,7 @@ public: class c64gs_state : public c64c_state { public: - c64gs_state(const machine_config &mconfig, device_type type, std::string tag) + c64gs_state(const machine_config &mconfig, device_type type, const char *tag) : c64c_state(mconfig, type, tag) { } diff --git a/src/mame/includes/c80.h b/src/mame/includes/c80.h index 2b6ad92b41d..0f96980fc8d 100644 --- a/src/mame/includes/c80.h +++ b/src/mame/includes/c80.h @@ -19,7 +19,7 @@ class c80_state : public driver_device { public: - c80_state(const machine_config &mconfig, device_type type, std::string tag) + c80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_pio1(*this, Z80PIO1_TAG), diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index 02314f73e4a..6f5a3e71cfb 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -6,7 +6,7 @@ class cabal_state : public driver_device { public: - cabal_state(const machine_config &mconfig, device_type type, std::string tag) + cabal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index 0d483bde85f..8667ed87797 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -6,7 +6,7 @@ class calomega_state : public driver_device { public: - calomega_state(const machine_config &mconfig, device_type type, std::string tag) : + calomega_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_acia6850_0(*this, "acia6850_0"), diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 4cff3850a0a..316a8dc2d2c 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -22,7 +22,7 @@ class canyon_state : public driver_device { public: - canyon_state(const machine_config &mconfig, device_type type, std::string tag) + canyon_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_discrete(*this, "discrete"), diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index ace918c14b7..cb63080bc17 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -17,7 +17,7 @@ public: TIMER_UPDATE }; - capbowl_state(const machine_config &mconfig, device_type type, std::string tag) + capbowl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index 0d01cdda918..e19917b9f43 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -9,7 +9,7 @@ class carjmbre_state : public driver_device { public: - carjmbre_state(const machine_config &mconfig, device_type type, std::string tag) + carjmbre_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h index c0ba199c24d..62978cef335 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -16,7 +16,7 @@ class carpolo_state : public driver_device { public: - carpolo_state(const machine_config &mconfig, device_type type, std::string tag) + carpolo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_alpharam(*this, "alpharam"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index dbd41997233..938a4757559 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -29,7 +29,7 @@ struct sprite_cave class cave_state : public driver_device { public: - cave_state(const machine_config &mconfig, device_type type, std::string tag) + cave_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoregs(*this, "videoregs"), m_vram(*this, "vram"), diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index 823d59e804c..b64eb70e6f8 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -9,7 +9,7 @@ class cbasebal_state : public driver_device { public: - cbasebal_state(const machine_config &mconfig, device_type type, std::string tag) + cbasebal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/cbm2.h b/src/mame/includes/cbm2.h index 78333352213..78ddb7824da 100644 --- a/src/mame/includes/cbm2.h +++ b/src/mame/includes/cbm2.h @@ -54,7 +54,7 @@ class cbm2_state : public driver_device { public: - cbm2_state(const machine_config &mconfig, device_type type, std::string tag) + cbm2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M6509_TAG), m_pla1(*this, PLA1_TAG), @@ -247,7 +247,7 @@ public: class cbm2hp_state : public cbm2_state { public: - cbm2hp_state(const machine_config &mconfig, device_type type, std::string tag) + cbm2hp_state(const machine_config &mconfig, device_type type, const char *tag) : cbm2_state(mconfig, type, tag) { } @@ -261,7 +261,7 @@ public: class p500_state : public cbm2_state { public: - p500_state(const machine_config &mconfig, device_type type, std::string tag) + p500_state(const machine_config &mconfig, device_type type, const char *tag) : cbm2_state(mconfig, type, tag), m_pla2(*this, PLA2_TAG), m_vic(*this, MOS6569_TAG), diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h index eea7d7dc425..51b2f20543b 100644 --- a/src/mame/includes/cbuster.h +++ b/src/mame/includes/cbuster.h @@ -12,7 +12,7 @@ class cbuster_state : public driver_device { public: - cbuster_state(const machine_config &mconfig, device_type type, std::string tag) + cbuster_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this, "ram"), m_pf1_rowscroll(*this, "pf1_rowscroll"), diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index 125303dde16..2a815cec48f 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -12,7 +12,7 @@ class ccastles_state : public driver_device { public: - ccastles_state(const machine_config &mconfig, device_type type, std::string tag) + ccastles_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_nvram_4b(*this, "nvram_4b"), diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h index f57fde2e70c..444b05c3b5e 100644 --- a/src/mame/includes/cchasm.h +++ b/src/mame/includes/cchasm.h @@ -18,7 +18,7 @@ public: TIMER_REFRESH_END }; - cchasm_state(const machine_config &mconfig, device_type type, std::string tag) + cchasm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ctc(*this, "ctc"), diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index 2bd38b7f1ee..2d0b64f566a 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -3,7 +3,7 @@ class cclimber_state : public driver_device { public: - cclimber_state(const machine_config &mconfig, device_type type, std::string tag) + cclimber_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h index 19266b57e77..2e7b13ada04 100644 --- a/src/mame/includes/cdi.h +++ b/src/mame/includes/cdi.h @@ -17,7 +17,7 @@ class cdi_state : public driver_device { public: - cdi_state(const machine_config &mconfig, device_type type, std::string tag) + cdi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_planea(*this, "planea") diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index e3f385e9846..74eb06ad0c6 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -11,7 +11,7 @@ class centiped_state : public driver_device { public: - centiped_state(const machine_config &mconfig, device_type type, std::string tag) + centiped_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_rambase(*this, "rambase"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/cgc7900.h b/src/mame/includes/cgc7900.h index ea5e318a81b..defea5ddad9 100644 --- a/src/mame/includes/cgc7900.h +++ b/src/mame/includes/cgc7900.h @@ -26,7 +26,7 @@ class cgc7900_state : public driver_device { public: - cgc7900_state(const machine_config &mconfig, device_type type, std::string tag) + cgc7900_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M68000_TAG), m_palette(*this, "palette"), diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index 822732d8626..dc457388e66 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -8,7 +8,7 @@ class chaknpop_state : public driver_device { public: - chaknpop_state(const machine_config &mconfig, device_type type, std::string tag) + chaknpop_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index 62bd63df748..6c409a7a708 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -13,7 +13,7 @@ class champbas_state : public driver_device { public: - champbas_state(const machine_config &mconfig, device_type type, std::string tag) + champbas_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index c020b917620..2b0d9b24db7 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -5,7 +5,7 @@ class changela_state : public driver_device { public: - changela_state(const machine_config &mconfig, device_type type, std::string tag) + changela_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/channelf.h b/src/mame/includes/channelf.h index c9f41bc38f6..41c7e70cd7e 100644 --- a/src/mame/includes/channelf.h +++ b/src/mame/includes/channelf.h @@ -20,7 +20,7 @@ class channelf_state : public driver_device { public: - channelf_state(const machine_config &mconfig, device_type type, std::string tag) + channelf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_custom(*this,"custom"), diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index cc15368f8a4..7957a0802f6 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -10,7 +10,7 @@ class cheekyms_state : public driver_device { public: - cheekyms_state(const machine_config &mconfig, device_type type, std::string tag) + cheekyms_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index 450b072409a..269d95edc36 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -15,7 +15,7 @@ class chqflag_state : public driver_device { public: - chqflag_state(const machine_config &mconfig, device_type type, std::string tag) + chqflag_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h index 40e49c063cb..a6f77e9eb2d 100644 --- a/src/mame/includes/cidelsa.h +++ b/src/mame/includes/cidelsa.h @@ -44,7 +44,7 @@ public: TIMER_SET_CPU_MODE }; - cidelsa_state(const machine_config &mconfig, device_type type, std::string tag) + cidelsa_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, CDP1802_TAG), m_vis(*this, CDP1869_TAG) @@ -90,7 +90,7 @@ protected: class draco_state : public cidelsa_state { public: - draco_state(const machine_config &mconfig, device_type type, std::string tag) + draco_state(const machine_config &mconfig, device_type type, const char *tag) : cidelsa_state(mconfig, type, tag), m_psg(*this, AY8910_TAG) { } diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index 268e2c4723d..6f860f51b29 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -13,7 +13,7 @@ class cinemat_state : public driver_device { public: - cinemat_state(const machine_config &mconfig, device_type type, std::string tag) + cinemat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ay1(*this, "ay1"), diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index 2426ac0ef44..d02896de619 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -5,7 +5,7 @@ class circus_state : public driver_device { public: - circus_state(const machine_config &mconfig, device_type type, std::string tag) + circus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index b95b032acb7..782a605243d 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -12,7 +12,7 @@ class circusc_state : public driver_device { public: - circusc_state(const machine_config &mconfig, device_type type, std::string tag) + circusc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spritebank(*this, "spritebank"), m_scroll(*this, "scroll"), diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index c042dc1d55c..30b7bb40e27 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -7,7 +7,7 @@ class cischeat_state : public driver_device { public: - cischeat_state(const machine_config &mconfig, device_type type, std::string tag) + cischeat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vregs(*this, "vregs"), m_scrollram(*this, "scrollram"), diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index eb9b34d8b58..bda3dd426cc 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -9,7 +9,7 @@ class citycon_state : public driver_device { public: - citycon_state(const machine_config &mconfig, device_type type, std::string tag) + citycon_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_linecolor(*this, "linecolor"), diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index 7fcc6d76ec0..c3f3c127b49 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -9,7 +9,7 @@ class cloak_state : public driver_device { public: - cloak_state(const machine_config &mconfig, device_type type, std::string tag) + cloak_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index 27d8f2c1c7e..b1f4e70f12f 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -12,7 +12,7 @@ class cloud9_state : public driver_device { public: - cloud9_state(const machine_config &mconfig, device_type type, std::string tag) + cloud9_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_nvram(*this, "nvram") , diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h index 24d89babb3f..4f03741f5af 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -3,7 +3,7 @@ class clshroad_state : public driver_device { public: - clshroad_state(const machine_config &mconfig, device_type type, std::string tag) + clshroad_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index 5948333cc3a..8acd4730ddf 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -17,7 +17,7 @@ class cninja_state : public driver_device { public: - cninja_state(const machine_config &mconfig, device_type type, std::string tag) + cninja_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/coco.h b/src/mame/includes/coco.h index 7bcf0146f98..f083911afbc 100644 --- a/src/mame/includes/coco.h +++ b/src/mame/includes/coco.h @@ -88,7 +88,7 @@ MACHINE_CONFIG_EXTERN( coco_sound ); class coco_state : public driver_device { public: - coco_state(const machine_config &mconfig, device_type type, std::string tag); + coco_state(const machine_config &mconfig, device_type type, const char *tag); required_device m_maincpu; required_device m_pia_0; diff --git a/src/mame/includes/coco12.h b/src/mame/includes/coco12.h index c97cac0e23b..bfc2149e4c2 100644 --- a/src/mame/includes/coco12.h +++ b/src/mame/includes/coco12.h @@ -36,7 +36,7 @@ class coco12_state : public coco_state { public: - coco12_state(const machine_config &mconfig, device_type type, std::string tag) + coco12_state(const machine_config &mconfig, device_type type, const char *tag) : coco_state(mconfig, type, tag), m_sam(*this, SAM_TAG), m_vdg(*this, VDG_TAG) diff --git a/src/mame/includes/coco3.h b/src/mame/includes/coco3.h index 271ce2c7ca1..9cc9a8d9d35 100644 --- a/src/mame/includes/coco3.h +++ b/src/mame/includes/coco3.h @@ -37,7 +37,7 @@ class coco3_state : public coco_state { public: - coco3_state(const machine_config &mconfig, device_type type, std::string tag) + coco3_state(const machine_config &mconfig, device_type type, const char *tag) : coco_state(mconfig, type, tag), m_gime(*this, GIME_TAG) { } diff --git a/src/mame/includes/coleco.h b/src/mame/includes/coleco.h index cbd90172800..2886f18b9a8 100644 --- a/src/mame/includes/coleco.h +++ b/src/mame/includes/coleco.h @@ -16,7 +16,7 @@ class coleco_state : public driver_device { public: - coleco_state(const machine_config &mconfig, device_type type, std::string tag) + coleco_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cart(*this, COLECOVISION_CARTRIDGE_SLOT_TAG), diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index 784c3f8d4a4..6d5871da384 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -12,7 +12,7 @@ class combatsc_state : public driver_device { public: - combatsc_state(const machine_config &mconfig, device_type type, std::string tag) + combatsc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu"), m_k007121_1(*this, "k007121_1"), diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index 23ce611a526..6888a612a0a 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -11,7 +11,7 @@ class commando_state : public driver_device { public: - commando_state(const machine_config &mconfig, device_type type, std::string tag) + commando_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram") , m_videoram2(*this, "videoram2"), diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index 4048ba940ef..d2d8c2e5816 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -9,7 +9,7 @@ class compgolf_state : public driver_device { public: - compgolf_state(const machine_config &mconfig, device_type type, std::string tag) + compgolf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_bg_ram(*this, "bg_ram"), diff --git a/src/mame/includes/compis.h b/src/mame/includes/compis.h index 3047f5a545f..8a8e48eb53e 100644 --- a/src/mame/includes/compis.h +++ b/src/mame/includes/compis.h @@ -52,7 +52,7 @@ class compis_state : public driver_device { public: - compis_state(const machine_config &mconfig, device_type type, std::string tag) + compis_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I80186_TAG), m_osp(*this, I80130_TAG), diff --git a/src/mame/includes/comquest.h b/src/mame/includes/comquest.h index 3321b549ca0..32b6ef2c935 100644 --- a/src/mame/includes/comquest.h +++ b/src/mame/includes/comquest.h @@ -13,7 +13,7 @@ class comquest_state : public driver_device { public: - comquest_state(const machine_config &mconfig, device_type type, std::string tag) + comquest_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/includes/comx35.h b/src/mame/includes/comx35.h index 66a6f09dd54..b1dfa88abbe 100644 --- a/src/mame/includes/comx35.h +++ b/src/mame/includes/comx35.h @@ -31,7 +31,7 @@ class comx35_state : public driver_device { public: - comx35_state(const machine_config &mconfig, device_type type, std::string tag) + comx35_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, CDP1802_TAG), m_vis(*this, CDP1869_TAG), diff --git a/src/mame/includes/concept.h b/src/mame/includes/concept.h index 8eee3b9858a..d6b0c3cab04 100644 --- a/src/mame/includes/concept.h +++ b/src/mame/includes/concept.h @@ -29,7 +29,7 @@ class concept_state : public driver_device { public: - concept_state(const machine_config &mconfig, device_type type, std::string tag) + concept_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_acia0(*this, ACIA_0_TAG), diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index a230d8d5c99..454a3ca21f9 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -11,7 +11,7 @@ class contra_state : public driver_device { public: - contra_state(const machine_config &mconfig, device_type type, std::string tag) + contra_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_cram(*this, "fg_cram"), m_fg_vram(*this, "fg_vram"), diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h index 8047db24489..6730f624cba 100644 --- a/src/mame/includes/coolpool.h +++ b/src/mame/includes/coolpool.h @@ -6,7 +6,7 @@ class coolpool_state : public driver_device { public: - coolpool_state(const machine_config &mconfig, device_type type, std::string tag) + coolpool_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dsp(*this, "dsp"), diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index eb19ca52166..447775fab34 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -9,7 +9,7 @@ class cop01_state : public driver_device { public: - cop01_state(const machine_config &mconfig, device_type type, std::string tag) + cop01_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bgvideoram(*this, "bgvideoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index 7034d9eef22..3030a7ed13e 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -12,7 +12,7 @@ class copsnrob_state : public driver_device { public: - copsnrob_state(const machine_config &mconfig, device_type type, std::string tag) + copsnrob_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_trucky(*this, "trucky"), m_truckram(*this, "truckram"), diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 8dce651e8f2..706b69befea 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -16,7 +16,7 @@ class cosmic_state : public driver_device { public: - cosmic_state(const machine_config &mconfig, device_type type, std::string tag) + cosmic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/cosmicos.h b/src/mame/includes/cosmicos.h index b818063dd71..d152bf22b85 100644 --- a/src/mame/includes/cosmicos.h +++ b/src/mame/includes/cosmicos.h @@ -41,7 +41,7 @@ enum class cosmicos_state : public driver_device { public: - cosmicos_state(const machine_config &mconfig, device_type type, std::string tag) + cosmicos_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, CDP1802_TAG), m_cti(*this, CDP1864_TAG), diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index b7cc1dcc02c..6e3354de437 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -97,7 +97,7 @@ struct CPS1config class cps_state : public driver_device { public: - cps_state(const machine_config &mconfig, device_type type, std::string tag) + cps_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mainram(*this, "mainram"), m_gfxram(*this, "gfxram"), diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h index 41ad4faa808..4f954dbdb9d 100644 --- a/src/mame/includes/cps3.h +++ b/src/mame/includes/cps3.h @@ -14,7 +14,7 @@ class cps3_state : public driver_device { public: - cps3_state(const machine_config &mconfig, device_type type, std::string tag) + cps3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index 689c58c2a41..a1cb75fe79a 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -15,7 +15,7 @@ Crazy Ballooon class crbaloon_state : public driver_device { public: - crbaloon_state(const machine_config &mconfig, device_type type, std::string tag) + crbaloon_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h index 24bae8ec46b..c337a5f8263 100644 --- a/src/mame/includes/crgolf.h +++ b/src/mame/includes/crgolf.h @@ -12,7 +12,7 @@ class crgolf_state : public driver_device { public: - crgolf_state(const machine_config &mconfig, device_type type, std::string tag) + crgolf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_color_select(*this, "color_select"), m_screen_flip(*this, "screen_flip"), diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index bf9f949d4ee..b7d2b3afa00 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -13,7 +13,7 @@ class crimfght_state : public driver_device { public: - crimfght_state(const machine_config &mconfig, device_type type, std::string tag) + crimfght_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index 95e025c3073..a5aecdada51 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -11,7 +11,7 @@ class crospang_state : public driver_device { public: - crospang_state(const machine_config &mconfig, device_type type, std::string tag) + crospang_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_videoram(*this, "fg_videoram"), m_bg_videoram(*this, "bg_videoram"), diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index 4b5b928c059..eb809fbceba 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -8,7 +8,7 @@ class crshrace_state : public driver_device { public: - crshrace_state(const machine_config &mconfig, device_type type, std::string tag) + crshrace_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram1(*this, "videoram1"), m_videoram2(*this, "videoram2"), diff --git a/src/mame/includes/crvision.h b/src/mame/includes/crvision.h index 91cae1f4825..53cdc1fc7a4 100644 --- a/src/mame/includes/crvision.h +++ b/src/mame/includes/crvision.h @@ -31,7 +31,7 @@ class crvision_state : public driver_device { public: - crvision_state(const machine_config &mconfig, device_type type, std::string tag) + crvision_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M6502_TAG), m_pia(*this, PIA6821_TAG), @@ -73,7 +73,7 @@ protected: class crvision_pal_state : public crvision_state { public: - crvision_pal_state(const machine_config &mconfig, device_type type, std::string tag) + crvision_pal_state(const machine_config &mconfig, device_type type, const char *tag) : crvision_state(mconfig, type, tag) { } }; @@ -81,7 +81,7 @@ public: class laser2001_state : public crvision_state { public: - laser2001_state(const machine_config &mconfig, device_type type, std::string tag) + laser2001_state(const machine_config &mconfig, device_type type, const char *tag) : crvision_state(mconfig, type, tag), m_centronics(*this, CENTRONICS_TAG), m_inp_y(*this, "Y"), diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index 83a04f69eb5..de9dee5a059 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -22,7 +22,7 @@ struct cvs_star class cvs_state : public driver_device { public: - cvs_state(const machine_config &mconfig, device_type type, std::string tag) + cvs_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_bullet_ram(*this, "bullet_ram"), diff --git a/src/mame/includes/cxhumax.h b/src/mame/includes/cxhumax.h index 0aad8fb69ba..dfa85b1720f 100644 --- a/src/mame/includes/cxhumax.h +++ b/src/mame/includes/cxhumax.h @@ -31,7 +31,7 @@ struct cx_timer_regs_t class cxhumax_state : public driver_device { public: - cxhumax_state(const machine_config &mconfig, device_type type, std::string tag) + cxhumax_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_flash(*this, "flash"), diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index 1e578ee769c..0bc65bccb57 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -16,7 +16,7 @@ class cyberbal_state : public atarigen_state { public: - cyberbal_state(const machine_config &mconfig, device_type type, std::string tag) + cyberbal_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/cybiko.h b/src/mame/includes/cybiko.h index 5dd0cb7d47a..0c6ad30b5aa 100644 --- a/src/mame/includes/cybiko.h +++ b/src/mame/includes/cybiko.h @@ -49,7 +49,7 @@ struct CYBIKO_RS232 class cybiko_state : public driver_device { public: - cybiko_state(const machine_config &mconfig, device_type type, std::string tag) + cybiko_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_crtc(*this, "hd66421"), diff --git a/src/mame/includes/dai.h b/src/mame/includes/dai.h index 937c7083244..dd05267a394 100644 --- a/src/mame/includes/dai.h +++ b/src/mame/includes/dai.h @@ -28,7 +28,7 @@ public: TIMER_TMS5501 }; - dai_state(const machine_config &mconfig, device_type type, std::string tag) + dai_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pit(*this, "pit8253"), diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index d2fbbfd2e85..13f037f0ca0 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -17,7 +17,7 @@ class darius_state : public driver_device { public: - darius_state(const machine_config &mconfig, device_type type, std::string tag) + darius_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_fg_ram(*this, "fg_ram"), diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index d053615cde7..224c1fc2ac6 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -5,7 +5,7 @@ class darkmist_state : public driver_device { public: - darkmist_state(const machine_config &mconfig, device_type type, std::string tag) + darkmist_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_t5182(*this, "t5182"), diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h index 633201ac43a..c08602d56db 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -7,7 +7,7 @@ class darkseal_state : public driver_device { public: - darkseal_state(const machine_config &mconfig, device_type type, std::string tag) + darkseal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h index 93752e8580c..257778ba849 100644 --- a/src/mame/includes/dassault.h +++ b/src/mame/includes/dassault.h @@ -15,7 +15,7 @@ class dassault_state : public driver_device { public: - dassault_state(const machine_config &mconfig, device_type type, std::string tag) + dassault_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index c70a6e2e26a..734a9a0b2d3 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -16,7 +16,7 @@ class dbz_state : public driver_device { public: - dbz_state(const machine_config &mconfig, device_type type, std::string tag) + dbz_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg1_videoram(*this, "bg1_videoram"), m_bg2_videoram(*this, "bg2_videoram"), diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index d932fdeb0af..a45e2e506d3 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -17,7 +17,7 @@ class dc_state : public driver_device { public: - dc_state(const machine_config &mconfig, device_type type, std::string tag) + dc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), dc_framebuffer_ram(*this, "frameram"), dc_texture_ram(*this, "dc_texture_ram"), diff --git a/src/mame/includes/dccons.h b/src/mame/includes/dccons.h index 7950f9ee0db..47b47d72f6c 100644 --- a/src/mame/includes/dccons.h +++ b/src/mame/includes/dccons.h @@ -8,7 +8,7 @@ class dc_cons_state : public dc_state { public: - dc_cons_state(const machine_config &mconfig, device_type type, std::string tag) + dc_cons_state(const machine_config &mconfig, device_type type, const char *tag) : dc_state(mconfig, type, tag), m_ata(*this, "ata") // m_dcflash(*this, "dcflash") diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index dafec4f1d42..d8c9455f899 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -16,7 +16,7 @@ public: TIMER_SIGNAL_IRQ }; - dcheese_state(const machine_config &mconfig, device_type type, std::string tag) + dcheese_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index e0a0fed9867..ffff5c97c3e 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -3,7 +3,7 @@ class dcon_state : public driver_device { public: - dcon_state(const machine_config &mconfig, device_type type, std::string tag) + dcon_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index 58b105f381f..a6b1c498f1b 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -10,7 +10,7 @@ class dday_state : public driver_device { public: - dday_state(const machine_config &mconfig, device_type type, std::string tag) + dday_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_textvideoram(*this, "textvideoram"), m_fgvideoram(*this, "fgvideoram"), diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index 03f7f7a3449..1c5d203856d 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -10,7 +10,7 @@ class ddragon_state : public driver_device { public: - ddragon_state(const machine_config &mconfig, device_type type, std::string tag) + ddragon_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_rambase(*this, "rambase"), m_bgvideoram(*this, "bgvideoram"), diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index 37d7ada1b4e..5513ca9076f 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -12,7 +12,7 @@ class ddragon3_state : public driver_device { public: - ddragon3_state(const machine_config &mconfig, device_type type, std::string tag) + ddragon3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_videoram(*this, "bg_videoram"), m_fg_videoram(*this, "fg_videoram"), @@ -85,7 +85,7 @@ public: class wwfwfest_state : public ddragon3_state { public: - wwfwfest_state(const machine_config &mconfig, device_type type, std::string tag) + wwfwfest_state(const machine_config &mconfig, device_type type, const char *tag) : ddragon3_state(mconfig, type, tag), m_fg0_videoram(*this, "fg0_videoram"), m_paletteram(*this, "palette") diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index 2a5e1b1b9ff..bb9a508717d 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -12,7 +12,7 @@ class ddribble_state : public driver_device { public: - ddribble_state(const machine_config &mconfig, device_type type, std::string tag) + ddribble_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_videoram(*this, "fg_videoram"), m_spriteram_1(*this, "spriteram_1"), diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index 01058c3a43f..eb82b28ad15 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -5,7 +5,7 @@ class deadang_state : public driver_device { public: - deadang_state(const machine_config &mconfig, device_type type, std::string tag) + deadang_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index e4948131ec4..c48444662a0 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -8,7 +8,7 @@ class dec0_state : public driver_device { public: - dec0_state(const machine_config &mconfig, device_type type, std::string tag) + dec0_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), @@ -113,7 +113,7 @@ public: class dec0_automat_state : public dec0_state { public: - dec0_automat_state(const machine_config &mconfig, device_type type, std::string tag) + dec0_automat_state(const machine_config &mconfig, device_type type, const char *tag) : dec0_state(mconfig, type, tag) { } diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index aea1334722b..746bfb35f1c 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -14,7 +14,7 @@ public: TIMER_DEC8_I8751 }; - dec8_state(const machine_config &mconfig, device_type type, std::string tag) + dec8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 597539512fc..c1ce644b7d1 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -13,7 +13,7 @@ class deco32_state : public driver_device { public: - deco32_state(const machine_config &mconfig, device_type type, std::string tag) + deco32_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), @@ -189,7 +189,7 @@ public: class dragngun_state : public deco32_state { public: - dragngun_state(const machine_config &mconfig, device_type type, std::string tag) + dragngun_state(const machine_config &mconfig, device_type type, const char *tag) : deco32_state(mconfig, type, tag), m_sprite_layout_0_ram(*this, "lay0"), m_sprite_layout_1_ram(*this, "lay1"), diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index a661e166ec6..e9bde7e7bb7 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -8,7 +8,7 @@ class deco_mlc_state : public driver_device { public: - deco_mlc_state(const machine_config &mconfig, device_type type, std::string tag) + deco_mlc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_deco146(*this, "ioprot"), m_mlc_ram(*this, "mlc_ram"), diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h index 16e6a2d6621..37ff50c3784 100644 --- a/src/mame/includes/decocass.h +++ b/src/mame/includes/decocass.h @@ -18,7 +18,7 @@ class decocass_state : public driver_device { public: - decocass_state(const machine_config &mconfig, device_type type, std::string tag) + decocass_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/decocrpt.h b/src/mame/includes/decocrpt.h index 41b855bf0e6..6ea05a3b7a0 100644 --- a/src/mame/includes/decocrpt.h +++ b/src/mame/includes/decocrpt.h @@ -2,9 +2,9 @@ // copyright-holders:Nicola Salmoria /*----------- defined in machine/decocrpt.c -----------*/ -void deco56_decrypt_gfx(running_machine &machine, std::string tag); -void deco74_decrypt_gfx(running_machine &machine, std::string tag); -void deco56_remap_gfx(running_machine &machine, std::string tag); +void deco56_decrypt_gfx(running_machine &machine, const char *tag); +void deco74_decrypt_gfx(running_machine &machine, const char *tag); +void deco56_remap_gfx(running_machine &machine, const char *tag); /*----------- defined in machine/deco102.c -----------*/ diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index fd0afe16581..6f3d91de158 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -10,7 +10,7 @@ class deniam_state : public driver_device { public: - deniam_state(const machine_config &mconfig, device_type type, std::string tag) + deniam_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_textram(*this, "textram"), diff --git a/src/mame/includes/dgn_beta.h b/src/mame/includes/dgn_beta.h index e5eb58621e0..a55d157aaa1 100644 --- a/src/mame/includes/dgn_beta.h +++ b/src/mame/includes/dgn_beta.h @@ -81,7 +81,7 @@ struct PageReg class dgn_beta_state : public driver_device { public: - dgn_beta_state(const machine_config &mconfig, device_type type, std::string tag) + dgn_beta_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mc6845(*this, "crtc"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/dgnalpha.h b/src/mame/includes/dgnalpha.h index 08e6c8c0907..220bc334137 100644 --- a/src/mame/includes/dgnalpha.h +++ b/src/mame/includes/dgnalpha.h @@ -38,7 +38,7 @@ class dragon_alpha_state : public dragon64_state { public: - dragon_alpha_state(const machine_config &mconfig, device_type type, std::string tag) + dragon_alpha_state(const machine_config &mconfig, device_type type, const char *tag) : dragon64_state(mconfig, type, tag), m_pia_2(*this, PIA2_TAG), m_ay8912(*this, AY8912_TAG), diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h index d84111b4366..71d9c2341f6 100644 --- a/src/mame/includes/dietgo.h +++ b/src/mame/includes/dietgo.h @@ -14,7 +14,7 @@ class dietgo_state : public driver_device { public: - dietgo_state(const machine_config &mconfig, device_type type, std::string tag) + dietgo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_deco104(*this, "ioprot104"), m_pf1_rowscroll(*this, "pf1_rowscroll"), diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index e952d7a9aa6..1a32b0a9733 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -13,7 +13,7 @@ class djboy_state : public driver_device { public: - djboy_state(const machine_config &mconfig, device_type type, std::string tag) + djboy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_paletteram(*this, "paletteram"), diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index 50d5dade85e..cbc65036a39 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -8,7 +8,7 @@ class djmain_state : public driver_device { public: - djmain_state(const machine_config &mconfig, device_type type, std::string tag) + djmain_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_obj_ram(*this, "obj_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 44908d3d90a..2033bf96bbe 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -93,7 +93,7 @@ enum class dkong_state : public driver_device { public: - dkong_state(const machine_config &mconfig, device_type type, std::string tag) + dkong_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/dm7000.h b/src/mame/includes/dm7000.h index d9a7a3a46b9..4306f4619e4 100644 --- a/src/mame/includes/dm7000.h +++ b/src/mame/includes/dm7000.h @@ -12,7 +12,7 @@ class dm7000_state : public driver_device { public: - dm7000_state(const machine_config &mconfig, device_type type, std::string tag) + dm7000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG) diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index e482176a03f..13913392953 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -12,7 +12,7 @@ class docastle_state : public driver_device { public: - docastle_state(const machine_config &mconfig, device_type type, std::string tag) + docastle_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_slave(*this, "slave"), diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index debe0184be2..c63ff99abc2 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -8,7 +8,7 @@ class dogfgt_state : public driver_device { public: - dogfgt_state(const machine_config &mconfig, device_type type, std::string tag) + dogfgt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bgvideoram(*this, "bgvideoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h index e0239c81219..4c51451c986 100644 --- a/src/mame/includes/dooyong.h +++ b/src/mame/includes/dooyong.h @@ -5,7 +5,7 @@ class dooyong_state : public driver_device { public: - dooyong_state(const machine_config &mconfig, device_type type, std::string tag) + dooyong_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), @@ -54,7 +54,7 @@ public: class dooyong_z80_state : public dooyong_state { public: - dooyong_z80_state(const machine_config &mconfig, device_type type, std::string tag) + dooyong_z80_state(const machine_config &mconfig, device_type type, const char *tag) : dooyong_state(mconfig, type, tag), m_txvideoram(*this, "txvideoram"), m_spriteram(*this, "spriteram") @@ -98,7 +98,7 @@ public: class dooyong_z80_ym2203_state : public dooyong_z80_state { public: - dooyong_z80_ym2203_state(const machine_config &mconfig, device_type type, std::string tag) + dooyong_z80_ym2203_state(const machine_config &mconfig, device_type type, const char *tag) : dooyong_z80_state(mconfig, type, tag) { } @@ -122,7 +122,7 @@ public: class dooyong_68k_state : public dooyong_state { public: - dooyong_68k_state(const machine_config &mconfig, device_type type, std::string tag) + dooyong_68k_state(const machine_config &mconfig, device_type type, const char *tag) : dooyong_state(mconfig, type, tag), m_spriteram(*this, "spriteram") { } diff --git a/src/mame/includes/dragon.h b/src/mame/includes/dragon.h index ccad20e38eb..20a6877d6f5 100644 --- a/src/mame/includes/dragon.h +++ b/src/mame/includes/dragon.h @@ -36,7 +36,7 @@ class dragon_state : public coco12_state { public: - dragon_state(const machine_config &mconfig, device_type type, std::string tag) + dragon_state(const machine_config &mconfig, device_type type, const char *tag) : coco12_state(mconfig, type, tag), m_printer(*this, PRINTER_TAG) { @@ -53,7 +53,7 @@ protected: class dragon64_state : public dragon_state { public: - dragon64_state(const machine_config &mconfig, device_type type, std::string tag) + dragon64_state(const machine_config &mconfig, device_type type, const char *tag) : dragon_state(mconfig, type, tag), m_acia(*this, ACIA_TAG) { diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index 0fa73abcce8..1fb1f52a4ec 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -27,7 +27,7 @@ class dragrace_state : public driver_device { public: - dragrace_state(const machine_config &mconfig, device_type type, std::string tag) + dragrace_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_playfield_ram(*this, "playfield_ram"), m_position_ram(*this, "position_ram"), diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index 2833c65b1da..5bd5f712888 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -7,7 +7,7 @@ class drgnmst_state : public driver_device { public: - drgnmst_state(const machine_config &mconfig, device_type type, std::string tag) + drgnmst_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vidregs(*this, "vidregs"), m_fg_videoram(*this, "fg_videoram"), diff --git a/src/mame/includes/dribling.h b/src/mame/includes/dribling.h index 9f822f92ed9..5287cc19519 100644 --- a/src/mame/includes/dribling.h +++ b/src/mame/includes/dribling.h @@ -12,7 +12,7 @@ class dribling_state : public driver_device { public: - dribling_state(const machine_config &mconfig, device_type type, std::string tag) + dribling_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppi8255_0(*this, "ppi8255_0"), diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index 91f1e2b97de..2494ef9557a 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -10,7 +10,7 @@ class drmicro_state : public driver_device { public: - drmicro_state(const machine_config &mconfig, device_type type, std::string tag) + drmicro_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_msm(*this, "msm"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index 8c4a9ff7aeb..7d84e0cc86e 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -13,7 +13,7 @@ class dynax_state : public driver_device { public: - dynax_state(const machine_config &mconfig, device_type type, std::string tag) + dynax_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index 1520b9b2b3c..218b0d3ea88 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -6,7 +6,7 @@ class dynduke_state : public driver_device { public: - dynduke_state(const machine_config &mconfig, device_type type, std::string tag) + dynduke_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_seibu_sound(*this, "seibu_sound"), diff --git a/src/mame/includes/ec184x.h b/src/mame/includes/ec184x.h index 0b57913a32d..7921bf5b97e 100644 --- a/src/mame/includes/ec184x.h +++ b/src/mame/includes/ec184x.h @@ -20,7 +20,7 @@ class ec1841_mb_device : public ibm5160_mb_device { public: // construction/destruction - ec1841_mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ec1841_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; diff --git a/src/mame/includes/einstein.h b/src/mame/includes/einstein.h index 306b40d5547..027b2370ba3 100644 --- a/src/mame/includes/einstein.h +++ b/src/mame/includes/einstein.h @@ -49,7 +49,7 @@ class einstein_state : public driver_device { public: - einstein_state(const machine_config &mconfig, device_type type, std::string tag) + einstein_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fdc(*this, IC_I042), m_color_screen(*this, "screen"), @@ -166,7 +166,7 @@ class einstein_keyboard_daisy_device : public device_t, { public: // construction/destruction - einstein_keyboard_daisy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + einstein_keyboard_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); private: virtual void device_start() override; @@ -186,7 +186,7 @@ class einstein_adc_daisy_device : public device_t, { public: // construction/destruction - einstein_adc_daisy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + einstein_adc_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); private: virtual void device_start() override; @@ -206,7 +206,7 @@ class einstein_fire_daisy_device : public device_t, { public: // construction/destruction - einstein_fire_daisy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + einstein_fire_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); private: virtual void device_start() override; diff --git a/src/mame/includes/electron.h b/src/mame/includes/electron.h index 393a90b555f..81d6b9ca171 100644 --- a/src/mame/includes/electron.h +++ b/src/mame/includes/electron.h @@ -68,7 +68,7 @@ public: TIMER_SCANLINE_INTERRUPT }; - electron_state(const machine_config &mconfig, device_type type, std::string tag) + electron_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cassette(*this, "cassette"), diff --git a/src/mame/includes/elf.h b/src/mame/includes/elf.h index 766487e1058..750d63e7367 100644 --- a/src/mame/includes/elf.h +++ b/src/mame/includes/elf.h @@ -26,7 +26,7 @@ class elf2_state : public driver_device { public: - elf2_state(const machine_config &mconfig, device_type type, std::string tag) + elf2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, CDP1802_TAG), m_vdc(*this, CDP1861_TAG), diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h index 273947d310f..3269f784949 100644 --- a/src/mame/includes/eolith.h +++ b/src/mame/includes/eolith.h @@ -7,7 +7,7 @@ class eolith_state : public driver_device { public: - eolith_state(const machine_config &mconfig, device_type type, std::string tag) + eolith_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/ep64.h b/src/mame/includes/ep64.h index c81d60b1fd3..85c0ae27a97 100644 --- a/src/mame/includes/ep64.h +++ b/src/mame/includes/ep64.h @@ -34,7 +34,7 @@ class ep64_state : public driver_device { public: - ep64_state(const machine_config &mconfig, device_type type, std::string tag) + ep64_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_dave(*this, DAVE_TAG), diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index 8c0e3977bae..da411ad52a1 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -9,7 +9,7 @@ class epos_state : public driver_device { public: - epos_state(const machine_config &mconfig, device_type type, std::string tag) + epos_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h index 6fe28444127..4ae11d35d18 100644 --- a/src/mame/includes/eprom.h +++ b/src/mame/includes/eprom.h @@ -13,7 +13,7 @@ class eprom_state : public atarigen_state { public: - eprom_state(const machine_config &mconfig, device_type type, std::string tag) + eprom_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_playfield_tilemap(*this, "playfield"), m_alpha_tilemap(*this, "alpha"), diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index d1f14f95d9e..a3808e6265a 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -15,7 +15,7 @@ class equites_state : public driver_device { public: - equites_state(const machine_config &mconfig, device_type type, std::string tag) + equites_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_videoram(*this, "bg_videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index ee35bd65bfd..7a683d5d39b 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -12,7 +12,7 @@ class esd16_state : public driver_device { public: - esd16_state(const machine_config &mconfig, device_type type, std::string tag) + esd16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram_0(*this, "vram_0"), m_vram_1(*this, "vram_1"), diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index 63bae188852..5b764363c4d 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -9,7 +9,7 @@ class espial_state : public driver_device { public: - espial_state(const machine_config &mconfig, device_type type, std::string tag) + espial_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_attributeram(*this, "attributeram"), diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h index 522204d2827..43994ec4ada 100644 --- a/src/mame/includes/esripsys.h +++ b/src/mame/includes/esripsys.h @@ -37,7 +37,7 @@ struct line_buffer_t class esripsys_state : public driver_device { public: - esripsys_state(const machine_config &mconfig, device_type type, std::string tag) + esripsys_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_framecpu(*this, "frame_cpu"), m_videocpu(*this, "video_cpu"), diff --git a/src/mame/includes/eti660.h b/src/mame/includes/eti660.h index de731e2638c..783f46eb414 100644 --- a/src/mame/includes/eti660.h +++ b/src/mame/includes/eti660.h @@ -28,7 +28,7 @@ enum class eti660_state : public driver_device { public: - eti660_state(const machine_config &mconfig, device_type type, std::string tag) + eti660_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_p_videoram(*this, "videoram") , m_maincpu(*this, CDP1802_TAG) diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index d6a5a3dc1f8..cb7097c66a6 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -11,7 +11,7 @@ class exedexes_state : public driver_device { public: - exedexes_state(const machine_config &mconfig, device_type type, std::string tag) + exedexes_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram") , m_videoram(*this, "videoram"), diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index 0dbe5cbc0e1..7bf606e2180 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -23,7 +23,7 @@ class exerion_state : public driver_device { public: - exerion_state(const machine_config &mconfig, device_type type, std::string tag) + exerion_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_main_ram(*this, "main_ram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index 6c8620f4a6c..9c825383c76 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -32,7 +32,7 @@ public: TIMER_COLLISION_IRQ }; - exidy_state(const machine_config &mconfig, device_type type, std::string tag) + exidy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index a1cf7dbc901..e6f7048ac8a 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -14,7 +14,7 @@ class exidy440_state : public driver_device { public: - exidy440_state(const machine_config &mconfig, device_type type, std::string tag) + exidy440_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_imageram(*this, "imageram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/exp85.h b/src/mame/includes/exp85.h index e42257f41bb..3e53385eb25 100644 --- a/src/mame/includes/exp85.h +++ b/src/mame/includes/exp85.h @@ -15,7 +15,7 @@ class exp85_state : public driver_device { public: - exp85_state(const machine_config &mconfig, device_type type, std::string tag) + exp85_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I8085A_TAG), m_rs232(*this, "rs232"), diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index 27f70a3b4b2..833c3c351b1 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -10,7 +10,7 @@ class exprraid_state : public driver_device { public: - exprraid_state(const machine_config &mconfig, device_type type, std::string tag) + exprraid_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_slave(*this, "slave"), diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h index 8d6e15f640f..cf1f601913b 100644 --- a/src/mame/includes/exterm.h +++ b/src/mame/includes/exterm.h @@ -11,7 +11,7 @@ class exterm_state : public driver_device { public: - exterm_state(const machine_config &mconfig, device_type type, std::string tag) + exterm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h index 3c355145375..65a74141141 100644 --- a/src/mame/includes/exzisus.h +++ b/src/mame/includes/exzisus.h @@ -3,7 +3,7 @@ class exzisus_state : public driver_device { public: - exzisus_state(const machine_config &mconfig, device_type type, std::string tag) + exzisus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cpuc(*this, "cpuc"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index 1f392a5aea2..ac790335d6f 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -7,7 +7,7 @@ class f1gp_state : public driver_device { public: - f1gp_state(const machine_config &mconfig, device_type type, std::string tag) + f1gp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sharedram(*this, "sharedram"), m_spr1vram(*this, "spr1vram"), diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index 1b8777eadf8..bce1ffa5140 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -5,7 +5,7 @@ class fantland_state : public driver_device { public: - fantland_state(const machine_config &mconfig, device_type type, std::string tag) + fantland_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_msm1(*this, "msm1"), m_msm2(*this, "msm2"), diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index 659ffab49a4..4b7cdb4cbdc 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -12,7 +12,7 @@ class fastfred_state : public galaxold_state { public: - fastfred_state(const machine_config &mconfig, device_type type, std::string tag) + fastfred_state(const machine_config &mconfig, device_type type, const char *tag) : galaxold_state(mconfig, type, tag), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index 97f7656f22b..d6c7fe0ac79 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -12,7 +12,7 @@ class fastlane_state : public driver_device { public: - fastlane_state(const machine_config &mconfig, device_type type, std::string tag) + fastlane_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_k007121_regs(*this, "k007121_regs"), diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index c3d129905b4..53f1c49e5be 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -27,7 +27,7 @@ class fcombat_state : public driver_device { public: - fcombat_state(const machine_config &mconfig, device_type type, std::string tag) + fcombat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index fe7c3508b4f..3271bc56f2d 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -10,7 +10,7 @@ public: TIMER_INTERRUPT }; - fgoal_state(const machine_config &mconfig, device_type type, std::string tag) + fgoal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mb14241(*this, "mb14241"), diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index 27f06c24f47..b308af73ad5 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -9,7 +9,7 @@ class finalizr_state : public driver_device { public: - finalizr_state(const machine_config &mconfig, device_type type, std::string tag) + finalizr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index 02bbcd72e38..74fb677fa63 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -10,7 +10,7 @@ class firetrap_state : public driver_device { public: - firetrap_state(const machine_config &mconfig, device_type type, std::string tag) + firetrap_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg1videoram(*this, "bg1videoram"), m_bg2videoram(*this, "bg2videoram"), diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index fcc6d03fe85..953be5d11f0 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -35,7 +35,7 @@ Atari Fire Truck + Super Bug + Monte Carlo driver class firetrk_state : public driver_device { public: - firetrk_state(const machine_config &mconfig, device_type type, std::string tag) + firetrk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index e51a07dfe23..ccae2455504 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -4,7 +4,7 @@ class fitfight_state : public driver_device { public: - fitfight_state(const machine_config &mconfig, device_type type, std::string tag) + fitfight_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fof_100000(*this, "fof_100000"), m_fof_600000(*this, "fof_600000"), diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index f77f3b0fc6c..8cc05b8858f 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -11,7 +11,7 @@ class flkatck_state : public driver_device { public: - flkatck_state(const machine_config &mconfig, device_type type, std::string tag) + flkatck_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_k007121_ram(*this, "k007121_ram"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h index 7e201d56ebe..cc2ff96ced2 100644 --- a/src/mame/includes/flower.h +++ b/src/mame/includes/flower.h @@ -3,7 +3,7 @@ class flower_state : public driver_device { public: - flower_state(const machine_config &mconfig, device_type type, std::string tag) + flower_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sn_nmi_enable(*this, "sn_nmi_enable"), m_spriteram(*this, "spriteram"), @@ -76,7 +76,7 @@ class flower_sound_device : public device_t, public device_sound_interface { public: - flower_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + flower_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~flower_sound_device() {} enum diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index 4f035151e4c..f8ec570fa43 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -5,7 +5,7 @@ class flstory_state : public driver_device { public: - flstory_state(const machine_config &mconfig, device_type type, std::string tag) + flstory_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/fm7.h b/src/mame/includes/fm7.h index 746bec5dc80..cdc22c6e092 100644 --- a/src/mame/includes/fm7.h +++ b/src/mame/includes/fm7.h @@ -119,7 +119,7 @@ public: TIMER_FM77AV_VSYNC }; - fm7_state(const machine_config &mconfig, device_type type, std::string tag) + fm7_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_shared_ram(*this, "shared_ram"), m_boot_ram(*this, "boot_ram"), diff --git a/src/mame/includes/fmtowns.h b/src/mame/includes/fmtowns.h index f3ad5a0d9d5..1989b2ea3a9 100644 --- a/src/mame/includes/fmtowns.h +++ b/src/mame/includes/fmtowns.h @@ -78,7 +78,7 @@ struct towns_video_controller class towns_state : public driver_device { public: - towns_state(const machine_config &mconfig, device_type type, std::string tag) + towns_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), @@ -363,7 +363,7 @@ public: class towns16_state : public towns_state { public: - towns16_state(const machine_config &mconfig, device_type type, std::string tag) + towns16_state(const machine_config &mconfig, device_type type, const char *tag) : towns_state(mconfig, type, tag) { } }; @@ -371,7 +371,7 @@ class towns16_state : public towns_state class marty_state : public towns_state { public: - marty_state(const machine_config &mconfig, device_type type, std::string tag) + marty_state(const machine_config &mconfig, device_type type, const char *tag) : towns_state(mconfig, type, tag) { } diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h index 98bd7b5f483..286427b43c8 100644 --- a/src/mame/includes/foodf.h +++ b/src/mame/includes/foodf.h @@ -12,7 +12,7 @@ class foodf_state : public atarigen_state { public: - foodf_state(const machine_config &mconfig, device_type type, std::string tag) + foodf_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_nvram(*this, "nvram"), m_playfield_tilemap(*this, "playfield"), diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index 498535e2c8e..40ab4f90f4e 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -5,7 +5,7 @@ class freekick_state : public driver_device { public: - freekick_state(const machine_config &mconfig, device_type type, std::string tag) + freekick_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 11e3d19440d..8041c7974f3 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -5,7 +5,7 @@ class fromanc2_state : public driver_device { public: - fromanc2_state(const machine_config &mconfig, device_type type, std::string tag) + fromanc2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 879abfab987..d8562d4deb9 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -14,7 +14,7 @@ class fromance_state : public driver_device { public: - fromance_state(const machine_config &mconfig, device_type type, std::string tag) + fromance_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index c4db163553e..ae8f2523a19 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -5,7 +5,7 @@ class funkybee_state : public driver_device { public: - funkybee_state(const machine_config &mconfig, device_type type, std::string tag) + funkybee_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/funkyjet.h b/src/mame/includes/funkyjet.h index f1b810746fe..ce8c0294554 100644 --- a/src/mame/includes/funkyjet.h +++ b/src/mame/includes/funkyjet.h @@ -14,7 +14,7 @@ class funkyjet_state : public driver_device { public: - funkyjet_state(const machine_config &mconfig, device_type type, std::string tag) + funkyjet_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_deco146(*this, "ioprot"), diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index 05fcc29b763..ebc3c2df912 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -3,7 +3,7 @@ class funworld_state : public driver_device { public: - funworld_state(const machine_config &mconfig, device_type type, std::string tag) + funworld_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h index b574ad9d042..1a1818158c7 100644 --- a/src/mame/includes/funybubl.h +++ b/src/mame/includes/funybubl.h @@ -5,7 +5,7 @@ class funybubl_state : public driver_device { public: - funybubl_state(const machine_config &mconfig, device_type type, std::string tag) + funybubl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_paletteram(*this, "paletteram"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index f8183141e2d..ba0c6eeaa33 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -13,7 +13,7 @@ public: TIMER_RASTER_INTERRUPT }; - fuuki16_state(const machine_config &mconfig, device_type type, std::string tag) + fuuki16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 37d88a1c93f..90af6ad1893 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -21,7 +21,7 @@ public: TIMER_RASTER_INTERRUPT }; - fuuki32_state(const machine_config &mconfig, device_type type, std::string tag) + fuuki32_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index 48cc7a24937..ea275b50248 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -9,7 +9,7 @@ class gaelco_state : public driver_device { public: - gaelco_state(const machine_config &mconfig, device_type type, std::string tag) + gaelco_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_vregs(*this, "vregs"), diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 9673ea5f195..ab458342036 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -7,7 +7,7 @@ class gaelco2_state : public driver_device { public: - gaelco2_state(const machine_config &mconfig, device_type type, std::string tag) + gaelco2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_spriteram(*this,"spriteram"), @@ -66,7 +66,7 @@ public: class bang_state : public gaelco2_state { public: - bang_state(const machine_config &mconfig, device_type type, std::string tag) + bang_state(const machine_config &mconfig, device_type type, const char *tag) : gaelco2_state(mconfig, type, tag) , m_light0_x(*this, "LIGHT0_X") , m_light0_y(*this, "LIGHT0_Y") @@ -94,7 +94,7 @@ public: class wrally2_state : public gaelco2_state { public: - wrally2_state(const machine_config &mconfig, device_type type, std::string tag) + wrally2_state(const machine_config &mconfig, device_type type, const char *tag) : gaelco2_state(mconfig, type, tag) , m_analog0(*this, "ANALOG0") , m_analog1(*this, "ANALOG1") diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index a0ce45bb7a8..8aaf90e1dc9 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -55,7 +55,7 @@ private: class gaelco3d_state : public driver_device { public: - gaelco3d_state(const machine_config &mconfig, device_type type, std::string tag) + gaelco3d_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_adsp_ram_base(*this,"adsp_ram_base"), m_m68k_ram_base(*this,"m68k_ram_base",0), diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index cdc15d0f471..d96d1e27826 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -12,7 +12,7 @@ class gaiden_state : public driver_device { public: - gaiden_state(const machine_config &mconfig, device_type type, std::string tag) + gaiden_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_videoram2(*this, "videoram2"), diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index 19db57d0bca..5a417fe44a7 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -7,7 +7,7 @@ class galaga_state : public driver_device { public: - galaga_state(const machine_config &mconfig, device_type type, std::string tag) + galaga_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_galaga_ram1(*this, "galaga_ram1"), @@ -93,7 +93,7 @@ public: class xevious_state : public galaga_state { public: - xevious_state(const machine_config &mconfig, device_type type, std::string tag) + xevious_state(const machine_config &mconfig, device_type type, const char *tag) : galaga_state(mconfig, type, tag), m_xevious_sr1(*this, "xevious_sr1"), m_xevious_sr2(*this, "xevious_sr2"), @@ -167,7 +167,7 @@ public: class bosco_state : public galaga_state { public: - bosco_state(const machine_config &mconfig, device_type type, std::string tag) + bosco_state(const machine_config &mconfig, device_type type, const char *tag) : galaga_state(mconfig, type, tag), m_bosco_radarattr(*this, "bosco_radarattr"), m_bosco_starcontrol(*this, "starcontrol"), @@ -206,7 +206,7 @@ public: class digdug_state : public galaga_state { public: - digdug_state(const machine_config &mconfig, device_type type, std::string tag) + digdug_state(const machine_config &mconfig, device_type type, const char *tag) : galaga_state(mconfig, type, tag), m_digdug_objram(*this, "digdug_objram"), m_digdug_posram(*this, "digdug_posram"), diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index ad5d80afe5d..c2413a6d11d 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -48,7 +48,7 @@ public: TIMER_GALASTRM_INTERRUPT6 }; - galastrm_state(const machine_config &mconfig, device_type type, std::string tag) + galastrm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this,"ram"), m_spriteram(*this,"spriteram") , diff --git a/src/mame/includes/galaxia.h b/src/mame/includes/galaxia.h index 6333926a87d..a582157d5df 100644 --- a/src/mame/includes/galaxia.h +++ b/src/mame/includes/galaxia.h @@ -11,7 +11,7 @@ class galaxia_state : public cvs_state { public: - galaxia_state(const machine_config &mconfig, device_type type, std::string tag) + galaxia_state(const machine_config &mconfig, device_type type, const char *tag) : cvs_state(mconfig, type, tag) { } diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index cc310e39fea..ac1e84a7b33 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -36,7 +36,7 @@ class galaxian_state : public driver_device { public: - galaxian_state(const machine_config &mconfig, device_type type, std::string tag) + galaxian_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 2592c4bbb00..6159915b451 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -27,7 +27,7 @@ struct star_gold class galaxold_state : public driver_device { public: - galaxold_state(const machine_config &mconfig, device_type type, std::string tag) + galaxold_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/galaxy.h b/src/mame/includes/galaxy.h index 8fdceb366bd..1a0e27a4841 100644 --- a/src/mame/includes/galaxy.h +++ b/src/mame/includes/galaxy.h @@ -17,7 +17,7 @@ class galaxy_state : public driver_device { public: - galaxy_state(const machine_config &mconfig, device_type type, std::string tag) + galaxy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cassette(*this, "cassette"), diff --git a/src/mame/includes/galeb.h b/src/mame/includes/galeb.h index 6a1fc7f2839..0c25b29d759 100644 --- a/src/mame/includes/galeb.h +++ b/src/mame/includes/galeb.h @@ -13,7 +13,7 @@ class galeb_state : public driver_device { public: - galeb_state(const machine_config &mconfig, device_type type, std::string tag) + galeb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 987b15deb69..5f098ff890f 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -12,7 +12,7 @@ class galivan_state : public driver_device { public: - galivan_state(const machine_config &mconfig, device_type type, std::string tag) + galivan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h index f9c53d5c804..a4697d9775e 100644 --- a/src/mame/includes/galpani2.h +++ b/src/mame/includes/galpani2.h @@ -7,7 +7,7 @@ class galpani2_state : public driver_device { public: - galpani2_state(const machine_config &mconfig, device_type type, std::string tag) + galpani2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_subcpu(*this,"sub"), diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index a5bd2903f34..788ca087540 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -5,7 +5,7 @@ class galpanic_state : public driver_device { public: - galpanic_state(const machine_config &mconfig, device_type type, std::string tag) + galpanic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_bgvideoram(*this, "bgvideoram"), diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 82de7f47339..7b934043a7e 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -12,7 +12,7 @@ class galspnbl_state : public driver_device { public: - galspnbl_state(const machine_config &mconfig, device_type type, std::string tag) + galspnbl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/gamate.h b/src/mame/includes/gamate.h index 0973d940ba5..868df1157a6 100644 --- a/src/mame/includes/gamate.h +++ b/src/mame/includes/gamate.h @@ -19,7 +19,7 @@ class gamate_sound_device : public device_t, public device_sound_interface { public: - gamate_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gamate_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~gamate_sound_device() { } DECLARE_WRITE8_MEMBER( device_w ); diff --git a/src/mame/includes/gamecom.h b/src/mame/includes/gamecom.h index 799d16dbc2a..e9f8829ab79 100644 --- a/src/mame/includes/gamecom.h +++ b/src/mame/includes/gamecom.h @@ -212,7 +212,7 @@ struct gamecom_sound_t class gamecom_state : public driver_device { public: - gamecom_state(const machine_config &mconfig, device_type type, std::string tag) + gamecom_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_p_videoram(*this,"videoram") , m_p_nvram(*this,"nvram") diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index e3576a60d29..d01d6d969a9 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -34,7 +34,7 @@ public: TIMER_VIA_0_CAL }; - gameplan_state(const machine_config &mconfig, device_type type, std::string tag) + gameplan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_trvquest_question(*this, "trvquest_q"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/gamepock.h b/src/mame/includes/gamepock.h index 038080853c7..9b842d6405a 100644 --- a/src/mame/includes/gamepock.h +++ b/src/mame/includes/gamepock.h @@ -16,7 +16,7 @@ struct HD44102CH { class gamepock_state : public driver_device { public: - gamepock_state(const machine_config &mconfig, device_type type, std::string tag) + gamepock_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index 00568d662ba..7f4e92a75f0 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -27,7 +27,7 @@ public: GAME_GALAGA3 }; - gaplus_state(const machine_config &mconfig, device_type type, std::string tag) + gaplus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h index 28dfbad1834..4d1b8a73836 100644 --- a/src/mame/includes/gatron.h +++ b/src/mame/includes/gatron.h @@ -3,7 +3,7 @@ class gatron_state : public driver_device { public: - gatron_state(const machine_config &mconfig, device_type type, std::string tag) + gatron_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h index 596ccc85f00..685021ebaa8 100644 --- a/src/mame/includes/gauntlet.h +++ b/src/mame/includes/gauntlet.h @@ -12,7 +12,7 @@ class gauntlet_state : public atarigen_state { public: - gauntlet_state(const machine_config &mconfig, device_type type, std::string tag) + gauntlet_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_playfield_tilemap(*this, "playfield"), m_alpha_tilemap(*this, "alpha"), diff --git a/src/mame/includes/gb.h b/src/mame/includes/gb.h index 90d18a78346..59f5ee91de3 100644 --- a/src/mame/includes/gb.h +++ b/src/mame/includes/gb.h @@ -46,7 +46,7 @@ class gb_state : public driver_device { public: - gb_state(const machine_config &mconfig, device_type type, std::string tag) + gb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cartslot(*this, "gbslot"), m_maincpu(*this, "maincpu"), @@ -143,7 +143,7 @@ protected: class megaduck_state : public gb_state { public: - megaduck_state(const machine_config &mconfig, device_type type, std::string tag) + megaduck_state(const machine_config &mconfig, device_type type, const char *tag) : gb_state(mconfig, type, tag) , m_cartslot(*this, "duckslot") { } diff --git a/src/mame/includes/gba.h b/src/mame/includes/gba.h index 1e79e284c33..8037ecb5795 100644 --- a/src/mame/includes/gba.h +++ b/src/mame/includes/gba.h @@ -129,7 +129,7 @@ class gba_state : public driver_device { public: - gba_state(const machine_config &mconfig, device_type type, std::string tag) + gba_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gba_pram(*this, "gba_pram"), diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index fc5ff97bf7a..6911d47fc40 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -11,7 +11,7 @@ class gberet_state : public driver_device { public: - gberet_state(const machine_config &mconfig, device_type type, std::string tag) + gberet_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index 7b383d0af41..fa32062eb1c 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -14,7 +14,7 @@ public: TIMER_GCPINBAL_INTERRUPT3 }; - gcpinbal_state(const machine_config &mconfig, device_type type, std::string tag) + gcpinbal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), diff --git a/src/mame/includes/genpc.h b/src/mame/includes/genpc.h index 8d83d3ad320..b3353de35d6 100644 --- a/src/mame/includes/genpc.h +++ b/src/mame/includes/genpc.h @@ -29,9 +29,9 @@ class ibm5160_mb_device : public device_t { public: // construction/destruction - ibm5160_mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ibm5160_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration - static void static_set_cputag(device_t &device, std::string tag); + static void static_set_cputag(device_t &device, const char *tag); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -108,7 +108,7 @@ public: DECLARE_WRITE8_MEMBER(pc_page_w); DECLARE_WRITE8_MEMBER(nmi_enable_w); - std::string m_cputag; + const char *m_cputag; private: void pc_select_dma_channel(int channel, bool state); @@ -128,7 +128,7 @@ class ibm5150_mb_device : public ibm5160_mb_device { public: // construction/destruction - ibm5150_mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ibm5150_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -160,7 +160,7 @@ class ec1841_mb_device : public ibm5160_mb_device { public: // construction/destruction - ec1841_mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ec1841_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -188,7 +188,7 @@ class pc_noppi_mb_device : public ibm5160_mb_device { public: // construction/destruction - pc_noppi_mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pc_noppi_mb_device(const machine_config &mconfig, const char *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/mame/includes/gijoe.h b/src/mame/includes/gijoe.h index 0946bf876e9..d4c417bcd01 100644 --- a/src/mame/includes/gijoe.h +++ b/src/mame/includes/gijoe.h @@ -14,7 +14,7 @@ class gijoe_state : public driver_device { public: - gijoe_state(const machine_config &mconfig, device_type type, std::string tag) + gijoe_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_workram(*this, "workram"), diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index f115c432fe2..33d09944529 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -9,7 +9,7 @@ class ginganin_state : public driver_device { public: - ginganin_state(const machine_config &mconfig, device_type type, std::string tag) + ginganin_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_txtram(*this, "txtram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index fec39aac173..06813718742 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -5,7 +5,7 @@ class gladiatr_state : public driver_device { public: - gladiatr_state(const machine_config &mconfig, device_type type, std::string tag) + gladiatr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index 6a39446acee..4fc0cbe59ee 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -9,7 +9,7 @@ class glass_state : public driver_device { public: - glass_state(const machine_config &mconfig, device_type type, std::string tag) + glass_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_vregs(*this, "vregs"), diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index 91ae35476da..83a245748e0 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -11,7 +11,7 @@ class gng_state : public driver_device { public: - gng_state(const machine_config &mconfig, device_type type, std::string tag) + gng_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram") , m_fgvideoram(*this, "fgvideoram"), diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index ff4d57bdd77..a1b6a996e0f 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -9,7 +9,7 @@ class goal92_state : public driver_device { public: - goal92_state(const machine_config &mconfig, device_type type, std::string tag) + goal92_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_data(*this, "bg_data"), m_fg_data(*this, "fg_data"), diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index 80ae9952952..a7ef567182a 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -9,7 +9,7 @@ class goindol_state : public driver_device { public: - goindol_state(const machine_config &mconfig, device_type type, std::string tag) + goindol_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this, "ram"), m_fg_scrolly(*this, "fg_scrolly"), diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index 29ac9699d87..2eb7e47df05 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -8,7 +8,7 @@ class goldstar_state : public driver_device { public: - goldstar_state(const machine_config &mconfig, device_type type, std::string tag) : + goldstar_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_vidram(*this, "fg_vidram"), m_fg_atrram(*this, "fg_atrram"), @@ -96,7 +96,7 @@ protected: class cmaster_state : public goldstar_state { public: - cmaster_state(const machine_config &mconfig, device_type type, std::string tag) : + cmaster_state(const machine_config &mconfig, device_type type, const char *tag) : goldstar_state(mconfig, type, tag) { } @@ -152,7 +152,7 @@ protected: class wingco_state : public goldstar_state { public: - wingco_state(const machine_config &mconfig, device_type type, std::string tag) : + wingco_state(const machine_config &mconfig, device_type type, const char *tag) : goldstar_state(mconfig, type, tag) { } @@ -188,7 +188,7 @@ private: class cb3_state : public goldstar_state { public: - cb3_state(const machine_config &mconfig, device_type type, std::string tag) : + cb3_state(const machine_config &mconfig, device_type type, const char *tag) : goldstar_state(mconfig, type, tag) { } @@ -211,7 +211,7 @@ protected: class sanghopm_state : public goldstar_state { public: - sanghopm_state(const machine_config &mconfig, device_type type, std::string tag) : + sanghopm_state(const machine_config &mconfig, device_type type, const char *tag) : goldstar_state(mconfig, type, tag), m_reel1_attrram(*this, "reel1_attrram"), m_reel2_attrram(*this, "reel2_attrram"), @@ -252,7 +252,7 @@ private: class unkch_state : public goldstar_state { public: - unkch_state(const machine_config &mconfig, device_type type, std::string tag) : + unkch_state(const machine_config &mconfig, device_type type, const char *tag) : goldstar_state(mconfig, type, tag), m_reel1_attrram(*this, "reel1_attrram"), m_reel2_attrram(*this, "reel2_attrram"), diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index 12a9d53d84e..375a08f7f5c 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -4,7 +4,7 @@ class gomoku_state : public driver_device { public: - gomoku_state(const machine_config &mconfig, device_type type, std::string tag) + gomoku_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), @@ -68,7 +68,7 @@ class gomoku_sound_device : public device_t, public device_sound_interface { public: - gomoku_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gomoku_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~gomoku_sound_device() { } protected: diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index e47d3fbad3c..c053588e91c 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -11,7 +11,7 @@ class gotcha_state : public driver_device { public: - gotcha_state(const machine_config &mconfig, device_type type, std::string tag) + gotcha_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fgvideoram(*this, "fgvideoram"), m_bgvideoram(*this, "bgvideoram"), diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index 02898163ef0..8f539ff234f 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -36,7 +36,7 @@ public: TIMER_NMI_CLEAR }; - gottlieb_state(const machine_config &mconfig, device_type type, std::string tag) + gottlieb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_laserdisc(*this, "laserdisc"), diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index a32d50d723b..6ad087b0242 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -5,7 +5,7 @@ class gotya_state : public driver_device { public: - gotya_state(const machine_config &mconfig, device_type type, std::string tag) + gotya_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_scroll(*this, "scroll"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/gp32.h b/src/mame/includes/gp32.h index d2e9ea3d5d2..65ae4f28ed0 100644 --- a/src/mame/includes/gp32.h +++ b/src/mame/includes/gp32.h @@ -92,7 +92,7 @@ struct s3c240x_iis_t class gp32_state : public driver_device { public: - gp32_state(const machine_config &mconfig, device_type type, std::string tag) + gp32_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_s3c240x_ram(*this, "s3c240x_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index bd7e6b99863..98061d26ece 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -13,7 +13,7 @@ class gradius3_state : public driver_device { public: - gradius3_state(const machine_config &mconfig, device_type type, std::string tag) + gradius3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_gfxram(*this, "k052109"), m_gfxrom(*this, "k051960"), diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index 83e4195aafb..3e654dcfd50 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -11,7 +11,7 @@ class grchamp_state : public driver_device { public: - grchamp_state(const machine_config &mconfig, device_type type, std::string tag) + grchamp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h index 3c3a3c0cb46..4aea8304969 100644 --- a/src/mame/includes/gridlee.h +++ b/src/mame/includes/gridlee.h @@ -25,7 +25,7 @@ class gridlee_state : public driver_device { public: - gridlee_state(const machine_config &mconfig, device_type type, std::string tag) + gridlee_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), @@ -79,7 +79,7 @@ class gridlee_sound_device : public device_t, public device_sound_interface { public: - gridlee_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gridlee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~gridlee_sound_device() { } protected: diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h index c33955d99db..60c8e76ac43 100644 --- a/src/mame/includes/groundfx.h +++ b/src/mame/includes/groundfx.h @@ -21,7 +21,7 @@ public: TIMER_GROUNDFX_INTERRUPT5 }; - groundfx_state(const machine_config &mconfig, device_type type, std::string tag) + groundfx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this,"ram"), m_spriteram(*this,"spriteram") , diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index 117b86874b0..7491fe1aa40 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -12,7 +12,7 @@ class gstriker_state : public driver_device { public: - gstriker_state(const machine_config &mconfig, device_type type, std::string tag) + gstriker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index 1bd7f127e77..014cc175082 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -6,7 +6,7 @@ class gsword_state : public driver_device { public: - gsword_state(const machine_config &mconfig, device_type type, std::string tag) + gsword_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index 03e20b24a5d..d95628aacfb 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -9,7 +9,7 @@ class gumbo_state : public driver_device { public: - gumbo_state(const machine_config &mconfig, device_type type, std::string tag) + gumbo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_videoram(*this, "bg_videoram"), m_fg_videoram(*this, "fg_videoram"), diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index 3317109412d..95aef16b0e3 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -21,7 +21,7 @@ public: TIMER_GUNBUSTR_INTERRUPT5 }; - gunbustr_state(const machine_config &mconfig, device_type type, std::string tag) + gunbustr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_tc0480scp(*this, "tc0480scp"), diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index 1dfe357d399..5afbcf87317 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -9,7 +9,7 @@ class gundealr_state : public driver_device { public: - gundealr_state(const machine_config &mconfig, device_type type, std::string tag) + gundealr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_paletteram(*this, "paletteram"), m_bg_videoram(*this, "bg_videoram"), diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index eae70b7a54a..2c5d43e0446 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -9,7 +9,7 @@ class gunsmoke_state : public driver_device { public: - gunsmoke_state(const machine_config &mconfig, device_type type, std::string tag) + gunsmoke_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index 38b929fb574..1c9bfd88e02 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -11,7 +11,7 @@ class gyruss_state : public driver_device { public: - gyruss_state(const machine_config &mconfig, device_type type, std::string tag) + gyruss_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index 6ac93fc2ffb..dd09c9229ac 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -9,7 +9,7 @@ class hanaawas_state : public driver_device { public: - hanaawas_state(const machine_config &mconfig, device_type type, std::string tag) + hanaawas_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index 4dab01a1f4b..c887c8a2597 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -44,7 +44,7 @@ class harddriv_state : public device_t /* public device_video_interface */ { public: - harddriv_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + harddriv_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_maincpu; @@ -438,7 +438,7 @@ class harddriv_sound_board_device : public device_t { public: // construction/destruction - harddriv_sound_board_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + harddriv_sound_board_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~harddriv_sound_board_device() {} DECLARE_READ16_MEMBER(hd68k_snd_data_r); @@ -506,7 +506,7 @@ private: class harddriv_board_device_state : public harddriv_state { public: - harddriv_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + harddriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -519,7 +519,7 @@ protected: class harddrivc_board_device_state : public harddriv_state { public: - harddrivc_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + harddrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -532,7 +532,7 @@ protected: class racedriv_board_device_state : public harddriv_state { public: - racedriv_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + racedriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -543,7 +543,7 @@ protected: class racedrivb1_board_device_state : public racedriv_board_device_state { public: - racedrivb1_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : + racedrivb1_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : racedriv_board_device_state(mconfig, tag, owner, clock) {}; @@ -556,7 +556,7 @@ protected: class racedrivc_board_device_state : public harddriv_state { public: - racedrivc_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + racedrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -567,7 +567,7 @@ protected: class racedrivc1_board_device_state : public racedrivc_board_device_state { public: - racedrivc1_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : + racedrivc1_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : racedrivc_board_device_state(mconfig, tag, owner, clock) {}; protected: @@ -577,7 +577,7 @@ protected: class racedrivc_panorama_side_board_device_state : public racedrivc_board_device_state { public: - racedrivc_panorama_side_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : + racedrivc_panorama_side_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : racedrivc_board_device_state(mconfig, tag, owner, clock) {}; protected: @@ -591,7 +591,7 @@ protected: class stunrun_board_device_state : public harddriv_state { public: - stunrun_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + stunrun_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -604,7 +604,7 @@ protected: class steeltal_board_device_state : public harddriv_state { public: - steeltal_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + steeltal_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -615,7 +615,7 @@ protected: class steeltal1_board_device_state : public steeltal_board_device_state { public: - steeltal1_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : + steeltal1_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : steeltal_board_device_state(mconfig, tag, owner, clock) {}; @@ -626,7 +626,7 @@ protected: class steeltalp_board_device_state : public steeltal_board_device_state { public: - steeltalp_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : + steeltalp_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : steeltal_board_device_state(mconfig, tag, owner, clock) {}; @@ -641,7 +641,7 @@ protected: class strtdriv_board_device_state : public harddriv_state { public: - strtdriv_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + strtdriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -654,7 +654,7 @@ protected: class hdrivair_board_device_state : public harddriv_state { public: - hdrivair_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hdrivair_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -665,7 +665,7 @@ protected: class hdrivairp_board_device_state : public hdrivair_board_device_state { public: - hdrivairp_board_device_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : + hdrivairp_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : hdrivair_board_device_state(mconfig, tag, owner, clock) {}; diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index e6fac151ace..12874f11e62 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -13,7 +13,7 @@ class hcastle_state : public driver_device { public: - hcastle_state(const machine_config &mconfig, device_type type, std::string tag) + hcastle_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2") , diff --git a/src/mame/includes/hec2hrp.h b/src/mame/includes/hec2hrp.h index 4f05db2cb4f..c30b7bfccd3 100644 --- a/src/mame/includes/hec2hrp.h +++ b/src/mame/includes/hec2hrp.h @@ -74,7 +74,7 @@ enum class hec2hrp_state : public driver_device { public: - hec2hrp_state(const machine_config &mconfig, device_type type, std::string tag) + hec2hrp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_disc2cpu(*this, "disc2cpu"), diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index aae9686cac9..e341d1f7687 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -5,7 +5,7 @@ class hexion_state : public driver_device { public: - hexion_state(const machine_config &mconfig, device_type type, std::string tag) + hexion_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_k053252(*this, "k053252"), diff --git a/src/mame/includes/hh_tms1k.h b/src/mame/includes/hh_tms1k.h index cd184ddcb35..4a7ccb99467 100644 --- a/src/mame/includes/hh_tms1k.h +++ b/src/mame/includes/hh_tms1k.h @@ -18,7 +18,7 @@ class hh_tms1k_state : public driver_device { public: - hh_tms1k_state(const machine_config &mconfig, device_type type, std::string tag) + hh_tms1k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_inp_matrix(*this, "IN"), diff --git a/src/mame/includes/hh_ucom4.h b/src/mame/includes/hh_ucom4.h index db52dea405c..76b3a5d7a02 100644 --- a/src/mame/includes/hh_ucom4.h +++ b/src/mame/includes/hh_ucom4.h @@ -18,7 +18,7 @@ class hh_ucom4_state : public driver_device { public: - hh_ucom4_state(const machine_config &mconfig, device_type type, std::string tag) + hh_ucom4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_inp_matrix(*this, "IN"), diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index 39bad782d07..a39d0c5a251 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -9,7 +9,7 @@ class higemaru_state : public driver_device { public: - higemaru_state(const machine_config &mconfig, device_type type, std::string tag) + higemaru_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index 3a65cd7b53f..65cf5bbcba2 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -9,7 +9,7 @@ class himesiki_state : public driver_device { public: - himesiki_state(const machine_config &mconfig, device_type type, std::string tag) + himesiki_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_ram(*this, "bg_ram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index d085942855d..4a2a4aa48a4 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -17,7 +17,7 @@ class hitme_state : public driver_device { public: - hitme_state(const machine_config &mconfig, device_type type, std::string tag) + hitme_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h index 1040019a740..fa22619a317 100644 --- a/src/mame/includes/hnayayoi.h +++ b/src/mame/includes/hnayayoi.h @@ -10,7 +10,7 @@ class hnayayoi_state : public driver_device { public: - hnayayoi_state(const machine_config &mconfig, device_type type, std::string tag) + hnayayoi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_msm(*this, "msm") { } diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index cb8247d91e5..7da413bf645 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -132,7 +132,7 @@ private: class hng64_state : public driver_device { public: - hng64_state(const machine_config &mconfig, device_type type, std::string tag) + hng64_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index 6c58029e335..02b6da3a281 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -9,7 +9,7 @@ class holeland_state : public driver_device { public: - holeland_state(const machine_config &mconfig, device_type type, std::string tag) + holeland_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 98d46483fd9..084bdecb8cb 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -7,7 +7,7 @@ class homedata_state : public driver_device { public: - homedata_state(const machine_config &mconfig, device_type type, std::string tag) + homedata_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vreg(*this, "vreg"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index 1ff24611d8b..14fc6659840 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -12,7 +12,7 @@ class homerun_state : public driver_device { public: - homerun_state(const machine_config &mconfig, device_type type, std::string tag) + homerun_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/hp48.h b/src/mame/includes/hp48.h index 68c30acc7e6..748a81bee55 100644 --- a/src/mame/includes/hp48.h +++ b/src/mame/includes/hp48.h @@ -44,7 +44,7 @@ typedef struct class hp48_state : public driver_device { public: - hp48_state(const machine_config &mconfig, device_type type, std::string tag) + hp48_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), @@ -173,7 +173,7 @@ class hp48_port_image_device : public device_t, { public: // construction/destruction - hp48_port_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + hp48_port_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_port_config(device_t &device, int port, int module, int max_size) { diff --git a/src/mame/includes/huebler.h b/src/mame/includes/huebler.h index 24c8b392f81..bb6b4c29344 100644 --- a/src/mame/includes/huebler.h +++ b/src/mame/includes/huebler.h @@ -22,7 +22,7 @@ class amu880_state : public driver_device { public: - amu880_state(const machine_config &mconfig, device_type type, std::string tag) + amu880_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cassette(*this, "cassette"), m_z80sio(*this, Z80SIO_TAG), diff --git a/src/mame/includes/hx20.h b/src/mame/includes/hx20.h index 52c33b6d64f..8f7ab801e0d 100644 --- a/src/mame/includes/hx20.h +++ b/src/mame/includes/hx20.h @@ -32,7 +32,7 @@ class hx20_state : public driver_device { public: - hx20_state(const machine_config &mconfig, device_type type, std::string tag) + hx20_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, HD6301V1_MAIN_TAG), m_subcpu(*this, HD6301V1_SLAVE_TAG), diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index 3ced5525000..4b0d2c520b9 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -10,7 +10,7 @@ public: TIMER_BLITTER }; - hyhoo_state(const machine_config &mconfig, device_type type, std::string tag) + hyhoo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_nb1413m3(*this, "nb1413m3"), diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index fde19f07fd2..0e4b848de5a 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -7,7 +7,7 @@ class hyperspt_state : public driver_device { public: - hyperspt_state(const machine_config &mconfig, device_type type, std::string tag) + hyperspt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_scroll(*this, "scroll"), diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index a3d8f3bd26b..f037f61c555 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -7,7 +7,7 @@ class hyprduel_state : public driver_device { public: - hyprduel_state(const machine_config &mconfig, device_type type, std::string tag) + hyprduel_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram_0(*this, "vram_0"), m_vram_1(*this, "vram_1"), diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index bfa58940759..bfd7039db1a 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -9,7 +9,7 @@ class ikki_state : public driver_device { public: - ikki_state(const machine_config &mconfig, device_type type, std::string tag) + ikki_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/imds2.h b/src/mame/includes/imds2.h index 8e7192063df..c5e93b4f9bd 100644 --- a/src/mame/includes/imds2.h +++ b/src/mame/includes/imds2.h @@ -22,7 +22,7 @@ class imds2_state : public driver_device { public: - imds2_state(const machine_config &mconfig, device_type type, std::string tag); + imds2_state(const machine_config &mconfig, device_type type, const char *tag); DECLARE_READ8_MEMBER(ipc_mem_read); DECLARE_WRITE8_MEMBER(ipc_mem_write); diff --git a/src/mame/includes/intv.h b/src/mame/includes/intv.h index 1ef652f1aa4..7f14c7fb55a 100644 --- a/src/mame/includes/intv.h +++ b/src/mame/includes/intv.h @@ -30,7 +30,7 @@ public: TIMER_INTV_BTB_FILL }; - intv_state(const machine_config &mconfig, device_type type, std::string tag) + intv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_sound(*this, "ay8914"), diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index 5a59cb9a2a9..24ed3325158 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -4,7 +4,7 @@ class inufuku_state : public driver_device { public: - inufuku_state(const machine_config &mconfig, device_type type, std::string tag) + inufuku_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_videoram(*this, "bg_videoram"), m_bg_rasterram(*this, "bg_rasterram"), diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index 0b2d2726768..be63ef229b1 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -3,7 +3,7 @@ class iqblock_state : public driver_device { public: - iqblock_state(const machine_config &mconfig, device_type type, std::string tag) + iqblock_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index 9a33d824006..a2fc05d6fea 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -26,7 +26,7 @@ struct irmb_ops class irobot_state : public driver_device { public: - irobot_state(const machine_config &mconfig, device_type type, std::string tag) + irobot_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_nvram(*this, "nvram") , m_videoram(*this, "videoram"), diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index c731696a0d1..b0c78ebf6e3 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -9,7 +9,7 @@ class ironhors_state : public driver_device { public: - ironhors_state(const machine_config &mconfig, device_type type, std::string tag) + ironhors_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index 04fd43bdcf1..3c7be2530f1 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -19,7 +19,7 @@ class itech32_state : public driver_device { public: - itech32_state(const machine_config &mconfig, device_type type, std::string tag) + itech32_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_main_ram(*this, "main_ram", 0), m_nvram(*this, "nvram", 0), @@ -167,7 +167,7 @@ public: inline offs_t compute_safe_address(int x, int y); inline void disable_clipping(); inline void enable_clipping(); - void logblit(std::string tag); + void logblit(const char *tag); void update_interrupts(int fast); void draw_raw(UINT16 *base, UINT16 color); void draw_raw_drivedge(UINT16 *base, UINT16 *zbase, UINT16 color); diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index 5ea16f0bd3f..2e35ffd95ad 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -16,7 +16,7 @@ class itech8_state : public driver_device { public: - itech8_state(const machine_config &mconfig, device_type type, std::string tag) + itech8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index f9d4d0a99d0..c3292723845 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -9,7 +9,7 @@ class jack_state : public driver_device { public: - jack_state(const machine_config &mconfig, device_type type, std::string tag) + jack_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 341ddcbf5eb..0249cde4bbd 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -10,7 +10,7 @@ class jackal_state : public driver_device { public: - jackal_state(const machine_config &mconfig, device_type type, std::string tag) + jackal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoctrl(*this, "videoctrl"), m_mastercpu(*this, "master"), diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h index dcd43a32598..cbee2eafd21 100644 --- a/src/mame/includes/jaguar.h +++ b/src/mame/includes/jaguar.h @@ -27,7 +27,7 @@ class jaguar_state : public driver_device { public: - jaguar_state(const machine_config &mconfig, device_type type, std::string tag) + jaguar_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gpu(*this, "gpu"), diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index c7cb3bcaf6c..2a191f5360b 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -14,7 +14,7 @@ class jailbrek_state : public driver_device { public: - jailbrek_state(const machine_config &mconfig, device_type type, std::string tag) + jailbrek_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index 96b82650351..a5f233a283c 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -19,7 +19,7 @@ class jedi_state : public driver_device { public: - jedi_state(const machine_config &mconfig, device_type type, std::string tag) + jedi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_nvram(*this, "nvram") , m_foreground_bank(*this, "foreground_bank"), diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h index b6cfa133088..8be7a680e5a 100644 --- a/src/mame/includes/jpmimpct.h +++ b/src/mame/includes/jpmimpct.h @@ -59,7 +59,7 @@ struct bt477_t class jpmimpct_state : public driver_device { public: - jpmimpct_state(const machine_config &mconfig, device_type type, std::string tag) + jpmimpct_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vfd(*this, "vfd"), m_vram(*this, "vram") , diff --git a/src/mame/includes/jpmsys5.h b/src/mame/includes/jpmsys5.h index 16eaedcadc2..d63877f4aba 100644 --- a/src/mame/includes/jpmsys5.h +++ b/src/mame/includes/jpmsys5.h @@ -17,7 +17,7 @@ class jpmsys5_state : public driver_device { public: - jpmsys5_state(const machine_config &mconfig, device_type type, std::string tag) : + jpmsys5_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_acia6850_0(*this, "acia6850_0"), diff --git a/src/mame/includes/jupiter.h b/src/mame/includes/jupiter.h index 71643260d60..ad89bc97a82 100644 --- a/src/mame/includes/jupiter.h +++ b/src/mame/includes/jupiter.h @@ -16,7 +16,7 @@ class jupiter2_state : public driver_device { public: - jupiter2_state(const machine_config &mconfig, device_type type, std::string tag) + jupiter2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, MCM6571AP_TAG) { } @@ -30,7 +30,7 @@ public: class jupiter3_state : public driver_device { public: - jupiter3_state(const machine_config &mconfig, device_type type, std::string tag) + jupiter3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_p_videoram(*this, "p_videoram"), diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h index 422832ded6b..cc8ae0ed4dd 100644 --- a/src/mame/includes/kaneko16.h +++ b/src/mame/includes/kaneko16.h @@ -23,7 +23,7 @@ class kaneko16_state : public driver_device { public: - kaneko16_state(const machine_config &mconfig, device_type type, std::string tag) + kaneko16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), @@ -98,7 +98,7 @@ public: template void kaneko16_fill_bitmap(palette_device* palette, _BitmapClass &bitmap, const rectangle &cliprect); - void kaneko16_common_oki_bank_w( const char *bankname, std::string tag, int bank, size_t fixedsize, size_t bankedsize ); + void kaneko16_common_oki_bank_w( const char *bankname, const char* tag, int bank, size_t fixedsize, size_t bankedsize ); void kaneko16_unscramble_tiles(const char *region); void kaneko16_expand_sample_banks(const char *region); }; @@ -106,7 +106,7 @@ public: class kaneko16_gtmr_state : public kaneko16_state { public: - kaneko16_gtmr_state(const machine_config &mconfig, device_type type, std::string tag) + kaneko16_gtmr_state(const machine_config &mconfig, device_type type, const char *tag) : kaneko16_state(mconfig, type, tag) { } @@ -130,7 +130,7 @@ public: class kaneko16_berlwall_state : public kaneko16_state { public: - kaneko16_berlwall_state(const machine_config &mconfig, device_type type, std::string tag) + kaneko16_berlwall_state(const machine_config &mconfig, device_type type, const char *tag) : kaneko16_state(mconfig, type, tag), m_bg15_select(*this, "bg15_select"), m_bg15_scroll(*this, "bg15_scroll"), @@ -170,7 +170,7 @@ public: class kaneko16_shogwarr_state : public kaneko16_state { public: - kaneko16_shogwarr_state(const machine_config &mconfig, device_type type, std::string tag) + kaneko16_shogwarr_state(const machine_config &mconfig, device_type type, const char *tag) : kaneko16_state(mconfig, type, tag), m_calc3_prot(*this, "calc3_prot") { diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h index c7003cdee97..2b73a14c28e 100644 --- a/src/mame/includes/kangaroo.h +++ b/src/mame/includes/kangaroo.h @@ -11,7 +11,7 @@ class kangaroo_state : public driver_device { public: - kangaroo_state(const machine_config &mconfig, device_type type, std::string tag) + kangaroo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_control(*this, "video_control"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 24b767f2299..12d44893b99 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -12,7 +12,7 @@ class karnov_state : public driver_device { public: - karnov_state(const machine_config &mconfig, device_type type, std::string tag) + karnov_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/kaypro.h b/src/mame/includes/kaypro.h index f30c5d76469..f2b5cc3df29 100644 --- a/src/mame/includes/kaypro.h +++ b/src/mame/includes/kaypro.h @@ -22,7 +22,7 @@ public: TIMER_FLOPPY }; - kaypro_state(const machine_config &mconfig, device_type type, std::string tag) + kaypro_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_maincpu(*this, "maincpu") diff --git a/src/mame/includes/kc.h b/src/mame/includes/kc.h index 69d400e609b..65af7aeedb7 100644 --- a/src/mame/includes/kc.h +++ b/src/mame/includes/kc.h @@ -57,7 +57,7 @@ class kc_state : public driver_device { public: - kc_state(const machine_config &mconfig, device_type type, std::string tag) + kc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_z80pio(*this, "z80pio"), @@ -158,7 +158,7 @@ public: class kc85_4_state : public kc_state { public: - kc85_4_state(const machine_config &mconfig, device_type type, std::string tag) + kc85_4_state(const machine_config &mconfig, device_type type, const char *tag) : kc_state(mconfig, type, tag) { } diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index 56697036e51..eec986424d7 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -10,7 +10,7 @@ class kchamp_state : public driver_device { public: - kchamp_state(const machine_config &mconfig, device_type type, std::string tag) + kchamp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index a475b5d3722..94ddc5d3bd9 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -12,7 +12,7 @@ class kickgoal_state : public driver_device { public: - kickgoal_state(const machine_config &mconfig, device_type type, std::string tag) + kickgoal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fgram(*this, "fgram"), m_bgram(*this, "bgram"), diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index ae1cd7cd16a..9a7ee062627 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -9,7 +9,7 @@ class kingofb_state : public driver_device { public: - kingofb_state(const machine_config &mconfig, device_type type, std::string tag) + kingofb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_scroll_y(*this, "scroll_y"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h index f9aeb7492df..d94cccd0714 100644 --- a/src/mame/includes/klax.h +++ b/src/mame/includes/klax.h @@ -12,7 +12,7 @@ class klax_state : public atarigen_state { public: - klax_state(const machine_config &mconfig, device_type type, std::string tag) + klax_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_playfield_tilemap(*this, "playfield"), m_mob(*this, "mob") { } diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index 70db30803b1..cafa96ed3da 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -9,7 +9,7 @@ class kncljoe_state : public driver_device { public: - kncljoe_state(const machine_config &mconfig, device_type type, std::string tag) + kncljoe_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_scrollregs(*this, "scrollregs"), diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 06f8de401ff..f5ee6f795d5 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -14,7 +14,7 @@ class konamigx_state : public driver_device { public: - konamigx_state(const machine_config &mconfig, device_type type, std::string tag) + konamigx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index 87a197b3b25..3d0e6d0fce3 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -9,7 +9,7 @@ class kopunch_state : public driver_device { public: - kopunch_state(const machine_config &mconfig, device_type type, std::string tag) + kopunch_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/kramermc.h b/src/mame/includes/kramermc.h index e9b31d20bef..7a0dbd6020e 100644 --- a/src/mame/includes/kramermc.h +++ b/src/mame/includes/kramermc.h @@ -14,7 +14,7 @@ class kramermc_state : public driver_device { public: - kramermc_state(const machine_config &mconfig, device_type type, std::string tag) + kramermc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index df22a15e076..0f6873d8e7a 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -9,7 +9,7 @@ class ksayakyu_state : public driver_device { public: - ksayakyu_state(const machine_config &mconfig, device_type type, std::string tag) + ksayakyu_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/kyocera.h b/src/mame/includes/kyocera.h index b642c03b206..43a1c835670 100644 --- a/src/mame/includes/kyocera.h +++ b/src/mame/includes/kyocera.h @@ -55,7 +55,7 @@ class kc85_state : public driver_device { public: - kc85_state(const machine_config &mconfig, device_type type, std::string tag) + kc85_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I8085_TAG), m_rtc(*this, UPD1990A_TAG), @@ -160,7 +160,7 @@ public: class trsm100_state : public kc85_state { public: - trsm100_state(const machine_config &mconfig, device_type type, std::string tag) + trsm100_state(const machine_config &mconfig, device_type type, const char *tag) : kc85_state(mconfig, type, tag) { } virtual void machine_start() override; @@ -169,7 +169,7 @@ public: class pc8201_state : public kc85_state { public: - pc8201_state(const machine_config &mconfig, device_type type, std::string tag) + pc8201_state(const machine_config &mconfig, device_type type, const char *tag) : kc85_state(mconfig, type, tag), m_cas_cart(*this, "cas_cartslot") { } @@ -199,7 +199,7 @@ public: class tandy200_state : public driver_device { public: - tandy200_state(const machine_config &mconfig, device_type type, std::string tag) + tandy200_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I8085_TAG), m_rtc(*this, RP5C01A_TAG), diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index bda0de526c6..3c3b113c1d9 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -9,7 +9,7 @@ class kyugo_state : public driver_device { public: - kyugo_state(const machine_config &mconfig, device_type type, std::string tag) + kyugo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fgvideoram(*this, "fgvideoram"), m_bgvideoram(*this, "bgvideoram"), diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index e614f052311..092b28a7503 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -12,7 +12,7 @@ class labyrunr_state : public driver_device { public: - labyrunr_state(const machine_config &mconfig, device_type type, std::string tag) + labyrunr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_k007121(*this, "k007121"), m_maincpu(*this,"maincpu"), diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index 42481ba3d48..8b7308edf5c 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -11,7 +11,7 @@ class ladybug_state : public driver_device { public: - ladybug_state(const machine_config &mconfig, device_type type, std::string tag) + ladybug_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index e75ae0b9185..39114c577dd 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -11,7 +11,7 @@ class ladyfrog_state : public driver_device { public: - ladyfrog_state(const machine_config &mconfig, device_type type, std::string tag) + ladyfrog_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_scrlram(*this, "scrlram"), diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index 901f100b070..f50cd4e1bd9 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -19,7 +19,7 @@ class laserbat_state_base : public driver_device { public: - laserbat_state_base(const machine_config &mconfig, device_type type, std::string tag) + laserbat_state_base(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_row0(*this, "ROW0") , m_row1(*this, "ROW1") @@ -153,7 +153,7 @@ protected: class laserbat_state : public laserbat_state_base { public: - laserbat_state(const machine_config &mconfig, device_type type, std::string tag) + laserbat_state(const machine_config &mconfig, device_type type, const char *tag) : laserbat_state_base(mconfig, type, tag) , m_csg(*this, "csg") , m_synth_low(*this, "synth_low") @@ -183,7 +183,7 @@ protected: class catnmous_state : public laserbat_state_base { public: - catnmous_state(const machine_config &mconfig, device_type type, std::string tag) + catnmous_state(const machine_config &mconfig, device_type type, const char *tag) : laserbat_state_base(mconfig, type, tag) , m_audiocpu(*this, "audiocpu") , m_pia(*this, "pia") diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index 1a00c99109f..617f03aeba9 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -11,7 +11,7 @@ class lasso_state : public driver_device { public: - lasso_state(const machine_config &mconfig, device_type type, std::string tag) + lasso_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index 48f4fa7b071..615bafd2a8d 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -11,7 +11,7 @@ class lastduel_state : public driver_device { public: - lastduel_state(const machine_config &mconfig, device_type type, std::string tag) + lastduel_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h index 34d952de1b1..58134751943 100644 --- a/src/mame/includes/lazercmd.h +++ b/src/mame/includes/lazercmd.h @@ -25,7 +25,7 @@ class lazercmd_state : public driver_device { public: - lazercmd_state(const machine_config &mconfig, device_type type, std::string tag) + lazercmd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), diff --git a/src/mame/includes/lc80.h b/src/mame/includes/lc80.h index 6f7306b8a8f..36788b37f00 100644 --- a/src/mame/includes/lc80.h +++ b/src/mame/includes/lc80.h @@ -23,7 +23,7 @@ class lc80_state : public driver_device { public: - lc80_state(const machine_config &mconfig, device_type type, std::string tag) + lc80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_pio2(*this, Z80PIO2_TAG), diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index 2bb5e29906f..456c28508e1 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -8,7 +8,7 @@ class legionna_state : public driver_device { public: - legionna_state(const machine_config &mconfig, device_type type, std::string tag) + legionna_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), /*m_back_data(*this, "back_data"), diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h index c0b2a5dbdfc..ab2133cef3b 100644 --- a/src/mame/includes/leland.h +++ b/src/mame/includes/leland.h @@ -27,7 +27,7 @@ class leland_80186_sound_device; class leland_state : public driver_device { public: - leland_state(const machine_config &mconfig, device_type type, std::string tag) + leland_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_master(*this, "master"), m_slave(*this, "slave"), @@ -210,8 +210,8 @@ public: class leland_80186_sound_device : public device_t { public: - leland_80186_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - leland_80186_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + leland_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + leland_80186_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE16_MEMBER(peripheral_ctrl); @@ -284,7 +284,7 @@ extern const device_type LELAND_80186; class redline_80186_sound_device : public leland_80186_sound_device { public: - redline_80186_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + redline_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE16_MEMBER(redline_dac_w); virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -294,7 +294,7 @@ extern const device_type REDLINE_80186; class ataxx_80186_sound_device : public leland_80186_sound_device { public: - ataxx_80186_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ataxx_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -303,7 +303,7 @@ extern const device_type ATAXX_80186; class wsf_80186_sound_device : public leland_80186_sound_device { public: - wsf_80186_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wsf_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index ebe68cbe291..2e91c0d7250 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -7,7 +7,7 @@ class lemmings_state : public driver_device { public: - lemmings_state(const machine_config &mconfig, device_type type, std::string tag) + lemmings_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bitmap0(2048, 256), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h index adeeaa06841..f53c540f38d 100644 --- a/src/mame/includes/lethal.h +++ b/src/mame/includes/lethal.h @@ -16,7 +16,7 @@ class lethal_state : public driver_device { public: - lethal_state(const machine_config &mconfig, device_type type, std::string tag) + lethal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h index c2f54d4ed02..eb501e82122 100644 --- a/src/mame/includes/lethalj.h +++ b/src/mame/includes/lethalj.h @@ -17,7 +17,7 @@ public: TIMER_GEN_EXT1_INT }; - lethalj_state(const machine_config &mconfig, device_type type, std::string tag) + lethalj_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_screen(*this, "screen"), diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index 1ef009a4388..c57acc02391 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -3,7 +3,7 @@ class liberate_state : public driver_device { public: - liberate_state(const machine_config &mconfig, device_type type, std::string tag) + liberate_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_vram(*this, "bg_vram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/liberatr.h b/src/mame/includes/liberatr.h index 871fe96ff96..39e3c11b967 100644 --- a/src/mame/includes/liberatr.h +++ b/src/mame/includes/liberatr.h @@ -13,7 +13,7 @@ class liberatr_state : public atarigen_state { public: - liberatr_state(const machine_config &mconfig, device_type type, std::string tag) + liberatr_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_base_ram(*this, "base_ram"), m_planet_frame(*this, "planet_frame"), diff --git a/src/mame/includes/lisa.h b/src/mame/includes/lisa.h index 0c7db6081e2..f359191d605 100644 --- a/src/mame/includes/lisa.h +++ b/src/mame/includes/lisa.h @@ -101,7 +101,7 @@ struct lisa_features_t class lisa_state : public driver_device { public: - lisa_state(const machine_config &mconfig, device_type type, std::string tag) + lisa_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_via0(*this, "via6522_0"), diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index fc87e89b2cc..863e84b1f5e 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -4,7 +4,7 @@ class lkage_state : public driver_device { public: - lkage_state(const machine_config &mconfig, device_type type, std::string tag) + lkage_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vreg(*this, "vreg"), m_scroll(*this, "scroll"), diff --git a/src/mame/includes/llc.h b/src/mame/includes/llc.h index f79d0245c6a..e74bf7f5acc 100644 --- a/src/mame/includes/llc.h +++ b/src/mame/includes/llc.h @@ -21,7 +21,7 @@ class llc_state : public driver_device { public: - llc_state(const machine_config &mconfig, device_type type, std::string tag) + llc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_speaker(*this, "speaker"), m_p_videoram(*this, "videoram"), diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index 83e2df256f3..86407bd3671 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -22,7 +22,7 @@ class lockon_state : public driver_device { public: - lockon_state(const machine_config &mconfig, device_type type, std::string tag) + lockon_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_char_ram(*this, "char_ram"), m_hud_ram(*this, "hud_ram"), diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index 9dd8826ffea..fbc1b57227e 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -17,7 +17,7 @@ struct lordgun_gun_data class lordgun_state : public driver_device { public: - lordgun_state(const machine_config &mconfig, device_type type, std::string tag) + lordgun_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index adeafdb133d..17f4c2faf16 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -4,7 +4,7 @@ class lsasquad_state : public driver_device { public: - lsasquad_state(const machine_config &mconfig, device_type type, std::string tag) + lsasquad_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_scrollram(*this, "scrollram"), diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h index 763c0c1f48c..64f2e25322e 100644 --- a/src/mame/includes/lucky74.h +++ b/src/mame/includes/lucky74.h @@ -5,7 +5,7 @@ class lucky74_state : public driver_device { public: - lucky74_state(const machine_config &mconfig, device_type type, std::string tag) + lucky74_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_videoram(*this, "fg_videoram"), m_fg_colorram(*this, "fg_colorram"), diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h index bd24205ae11..851559d18bb 100644 --- a/src/mame/includes/lvcards.h +++ b/src/mame/includes/lvcards.h @@ -3,7 +3,7 @@ class lvcards_state : public driver_device { public: - lvcards_state(const machine_config &mconfig, device_type type, std::string tag) + lvcards_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/lviv.h b/src/mame/includes/lviv.h index a1f387223c3..f0634fc237d 100644 --- a/src/mame/includes/lviv.h +++ b/src/mame/includes/lviv.h @@ -18,7 +18,7 @@ class lviv_state : public driver_device { public: - lviv_state(const machine_config &mconfig, device_type type, std::string tag) + lviv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index 0c9f08dfd47..6a7dedb889c 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -6,7 +6,7 @@ class lwings_state : public driver_device { public: - lwings_state(const machine_config &mconfig, device_type type, std::string tag) + lwings_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram") , m_fgvideoram(*this, "fgvideoram"), diff --git a/src/mame/includes/lynx.h b/src/mame/includes/lynx.h index 61cf1efd015..f11b34bd69f 100644 --- a/src/mame/includes/lynx.h +++ b/src/mame/includes/lynx.h @@ -106,7 +106,7 @@ public: TIMER_UART }; - lynx_state(const machine_config &mconfig, device_type type, std::string tag) + lynx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mem_0000(*this, "mem_0000"), m_mem_fc00(*this, "mem_fc00"), diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index d5e403e4343..7f9ff1a4557 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -39,7 +39,7 @@ public: TIMER_INTERRUPT }; - m10_state(const machine_config &mconfig, device_type type, std::string tag) + m10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_memory(*this, "memory"), m_rom(*this, "rom"), diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index cd50e8c0a15..f34df43c638 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -17,7 +17,7 @@ struct pf_layer_info class m107_state : public driver_device { public: - m107_state(const machine_config &mconfig, device_type type, std::string tag) + m107_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/m5.h b/src/mame/includes/m5.h index bedd52c0940..7ba55be8172 100644 --- a/src/mame/includes/m5.h +++ b/src/mame/includes/m5.h @@ -19,7 +19,7 @@ class m5_state : public driver_device { public: - m5_state(const machine_config &mconfig, device_type type, std::string tag) + m5_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_fd5cpu(*this, Z80_FD5_TAG), diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index 1564cd64f57..d1efe7dc698 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -3,7 +3,7 @@ class m52_state : public driver_device { public: - m52_state(const machine_config &mconfig, device_type type, std::string tag) + m52_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h index 43fa6483ebb..c54442ee974 100644 --- a/src/mame/includes/m57.h +++ b/src/mame/includes/m57.h @@ -3,7 +3,7 @@ class m57_state : public driver_device { public: - m57_state(const machine_config &mconfig, device_type type, std::string tag) + m57_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_scrollram(*this, "scrollram"), diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index e47aaa9ab05..6254d3e86d5 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -4,7 +4,7 @@ class m58_state : public driver_device { public: - m58_state(const machine_config &mconfig, device_type type, std::string tag) + m58_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index e5dfeb2b4e6..40d09120cab 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -6,7 +6,7 @@ class m62_state : public driver_device { public: - m62_state(const machine_config &mconfig, device_type type, std::string tag) + m62_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_m62_tileram(*this, "m62_tileram"), diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 3966d25f6ad..29afaea26c7 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -24,7 +24,7 @@ class m72_state : public driver_device { public: - m72_state(const machine_config &mconfig, device_type type, std::string tag) + m72_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/m79amb.h b/src/mame/includes/m79amb.h index 46024b05624..22574023cf5 100644 --- a/src/mame/includes/m79amb.h +++ b/src/mame/includes/m79amb.h @@ -5,7 +5,7 @@ class m79amb_state : public driver_device { public: - m79amb_state(const machine_config &mconfig, device_type type, std::string tag) + m79amb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_mask(*this, "mask"), diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h index a5926e06189..20412db5fe2 100644 --- a/src/mame/includes/m90.h +++ b/src/mame/includes/m90.h @@ -5,7 +5,7 @@ class m90_state : public driver_device { public: - m90_state(const machine_config &mconfig, device_type type, std::string tag) + m90_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_data(*this, "video_data"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index 37246141a96..ceff8595f12 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -26,7 +26,7 @@ public: TIMER_SPRITEBUFFER }; - m92_state(const machine_config &mconfig, device_type type, std::string tag) + m92_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_vram_data(*this, "vram_data"), diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h index 18fba9b90c0..8b093993abc 100644 --- a/src/mame/includes/mac.h +++ b/src/mame/includes/mac.h @@ -151,7 +151,7 @@ class mac_sound_device : public device_t, public device_sound_interface { public: - mac_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mac_sound_device() {} void enable_sound(int on); @@ -190,7 +190,7 @@ extern const device_type MAC_SOUND; class mac_state : public driver_device { public: - mac_state(const machine_config &mconfig, device_type type, std::string tag) + mac_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_via1(*this, "via6522_0"), diff --git a/src/mame/includes/macpci.h b/src/mame/includes/macpci.h index e42790a90dd..5494942a6d2 100644 --- a/src/mame/includes/macpci.h +++ b/src/mame/includes/macpci.h @@ -76,7 +76,7 @@ enum model_t class macpci_state : public driver_device { public: - macpci_state(const machine_config &mconfig, device_type type, std::string tag) + macpci_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_via1(*this, "via6522_0"), diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index d578e07af15..ffcbb5e89f5 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -9,7 +9,7 @@ class macrossp_state : public driver_device { public: - macrossp_state(const machine_config &mconfig, device_type type, std::string tag) + macrossp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_scra_videoram(*this, "scra_videoram"), diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h index eeb3229ed5c..475823d53a9 100644 --- a/src/mame/includes/madalien.h +++ b/src/mame/includes/madalien.h @@ -17,7 +17,7 @@ class madalien_state : public driver_device { public: - madalien_state(const machine_config &mconfig, device_type type, std::string tag) + madalien_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_charram(*this, "charram"), diff --git a/src/mame/includes/madmotor.h b/src/mame/includes/madmotor.h index 07d6a360df9..bb8c3c288e2 100644 --- a/src/mame/includes/madmotor.h +++ b/src/mame/includes/madmotor.h @@ -12,7 +12,7 @@ class madmotor_state : public driver_device { public: - madmotor_state(const machine_config &mconfig, device_type type, std::string tag) + madmotor_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index 41b3f635ab2..36199b3c49c 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -3,7 +3,7 @@ class magmax_state : public driver_device { public: - magmax_state(const machine_config &mconfig, device_type type, std::string tag) + magmax_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h index cfb36fdf4c3..32973d75bc7 100644 --- a/src/mame/includes/mainevt.h +++ b/src/mame/includes/mainevt.h @@ -15,7 +15,7 @@ class mainevt_state : public driver_device { public: - mainevt_state(const machine_config &mconfig, device_type type, std::string tag) + mainevt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h index 80461f64b53..e1240a8d8c2 100644 --- a/src/mame/includes/mainsnk.h +++ b/src/mame/includes/mainsnk.h @@ -3,7 +3,7 @@ class mainsnk_state : public driver_device { public: - mainsnk_state(const machine_config &mconfig, device_type type, std::string tag) + mainsnk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index 778141d9817..00f4e3a2afb 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -12,7 +12,7 @@ class malzak_state : public driver_device { public: - malzak_state(const machine_config &mconfig, device_type type, std::string tag) + malzak_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_s2636_0(*this, "s2636_0"), diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index f2851c03e2b..8bbfcf8ff25 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -30,7 +30,7 @@ public: GAME_MOTOS }; - mappy_state(const machine_config &mconfig, device_type type, std::string tag) + mappy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h index f77bda2a8e5..c96b4b91165 100644 --- a/src/mame/includes/marineb.h +++ b/src/mame/includes/marineb.h @@ -3,7 +3,7 @@ class marineb_state : public driver_device { public: - marineb_state(const machine_config &mconfig, device_type type, std::string tag) + marineb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index 0d7ccfa0301..b19a4faa211 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -44,7 +44,7 @@ class mario_state : public driver_device { public: - mario_state(const machine_config &mconfig, device_type type, std::string tag) + mario_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index 301b2d9a815..c64bfadd5da 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -9,7 +9,7 @@ class markham_state : public driver_device { public: - markham_state(const machine_config &mconfig, device_type type, std::string tag) + markham_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index 155afef4849..af41168bed5 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -4,7 +4,7 @@ class matmania_state : public driver_device { public: - matmania_state(const machine_config &mconfig, device_type type, std::string tag) + matmania_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_videoram2(*this, "videoram2"), diff --git a/src/mame/includes/maygay1b.h b/src/mame/includes/maygay1b.h index 8e4dca521f9..b76f3192a33 100644 --- a/src/mame/includes/maygay1b.h +++ b/src/mame/includes/maygay1b.h @@ -29,7 +29,7 @@ class maygay1b_state : public driver_device { public: - maygay1b_state(const machine_config &mconfig, device_type type, std::string tag) + maygay1b_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_vfd(*this, "vfd"), diff --git a/src/mame/includes/mbc55x.h b/src/mame/includes/mbc55x.h index a1646f5375d..7069084d83e 100644 --- a/src/mame/includes/mbc55x.h +++ b/src/mame/includes/mbc55x.h @@ -89,7 +89,7 @@ struct keyboard_t class mbc55x_state : public driver_device { public: - mbc55x_state(const machine_config &mconfig, device_type type, std::string tag) + mbc55x_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, MAINCPU_TAG), m_crtc(*this, VID_MC6845_NAME), diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h index 81295cf11fd..57ae0501ec0 100644 --- a/src/mame/includes/mbee.h +++ b/src/mame/includes/mbee.h @@ -33,7 +33,7 @@ public: TIMER_MBEE_NEWKB }; - mbee_state(const machine_config &mconfig, device_type type, std::string tag) + mbee_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_maincpu(*this, "maincpu") diff --git a/src/mame/includes/mboard.h b/src/mame/includes/mboard.h index 4c292c055ac..b6e8c5028f4 100644 --- a/src/mame/includes/mboard.h +++ b/src/mame/includes/mboard.h @@ -41,7 +41,7 @@ enum class mboard_state : public driver_device { public: - mboard_state(const machine_config &mconfig, device_type type, std::string tag) + mboard_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_line(*this, "LINE"), diff --git a/src/mame/includes/mc1000.h b/src/mame/includes/mc1000.h index 36e90ea8501..32ba93e2fe0 100644 --- a/src/mame/includes/mc1000.h +++ b/src/mame/includes/mc1000.h @@ -27,7 +27,7 @@ class mc1000_state : public driver_device { public: - mc1000_state(const machine_config &mconfig, device_type type, std::string tag) + mc1000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_vdg(*this, MC6847_TAG), diff --git a/src/mame/includes/mc1502.h b/src/mame/includes/mc1502.h index 80bf80d65cd..28b38aca85e 100644 --- a/src/mame/includes/mc1502.h +++ b/src/mame/includes/mc1502.h @@ -23,7 +23,7 @@ class mc1502_state : public driver_device { public: - mc1502_state(const machine_config &mconfig, device_type type, std::string tag) + mc1502_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_upd8251(*this, "upd8251"), diff --git a/src/mame/includes/mc80.h b/src/mame/includes/mc80.h index f530175a058..74699a2327c 100644 --- a/src/mame/includes/mc80.h +++ b/src/mame/includes/mc80.h @@ -18,7 +18,7 @@ class mc80_state : public driver_device { public: - mc80_state(const machine_config &mconfig, device_type type, std::string tag) + mc80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_p_videoram(*this, "videoram"), m_maincpu(*this, "maincpu") { } diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index 42ea7b1f535..9e382505896 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -4,7 +4,7 @@ class mcatadv_state : public driver_device { public: - mcatadv_state(const machine_config &mconfig, device_type type, std::string tag) + mcatadv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram1(*this, "videoram1"), m_videoram2(*this, "videoram2"), diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index 0826c0ee263..ff7937f669c 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -21,7 +21,7 @@ class mcr_state : public driver_device { public: - mcr_state(const machine_config &mconfig, device_type type, std::string tag) + mcr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ipu(*this, "ipu"), diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index 8a3d86c581f..8f4bf006bc7 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -3,7 +3,7 @@ class mcr3_state : public mcr_state { public: - mcr3_state(const machine_config &mconfig, device_type type, std::string tag) + mcr3_state(const machine_config &mconfig, device_type type, const char *tag) : mcr_state(mconfig, type, tag), m_spyhunt_alpharam(*this, "spyhunt_alpha"), m_screen(*this, "screen") { } diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index 17ac3e492d7..56f4f10a94e 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -17,7 +17,7 @@ struct counter_state class mcr68_state : public driver_device { public: - mcr68_state(const machine_config &mconfig, device_type type, std::string tag) + mcr68_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_chip_squeak_deluxe(*this, "csd"), m_sounds_good(*this, "sg"), diff --git a/src/mame/includes/md_cons.h b/src/mame/includes/md_cons.h index 51a0920ec0c..f7fc4e5054c 100644 --- a/src/mame/includes/md_cons.h +++ b/src/mame/includes/md_cons.h @@ -11,7 +11,7 @@ class md_cons_state : public md_base_state { public: - md_cons_state(const machine_config &mconfig, device_type type, std::string tag) + md_cons_state(const machine_config &mconfig, device_type type, const char *tag) : md_base_state(mconfig, type, tag), m_32x(*this,"sega32x"), m_segacd(*this,"segacd"), diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index 65ba0b0def9..f8c0e47fa94 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -13,7 +13,7 @@ class meadows_state : public driver_device { public: - meadows_state(const machine_config &mconfig, device_type type, std::string tag) + meadows_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index 2240034e12c..b2461c802c5 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -40,7 +40,7 @@ struct genesis_z80_vars class md_base_state : public driver_device { public: - md_base_state(const machine_config &mconfig, device_type type, std::string tag) + md_base_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_z80snd(*this,"genesis_snd_z80"), @@ -135,7 +135,7 @@ public: class md_boot_state : public md_base_state { public: - md_boot_state(const machine_config &mconfig, device_type type, std::string tag) + md_boot_state(const machine_config &mconfig, device_type type, const char *tag) : md_base_state(mconfig, type, tag) { m_protcount = 0;} // bootleg specific diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index bc034b102da..414b670cc36 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -21,7 +21,7 @@ class megasys1_state : public driver_device { public: - megasys1_state(const machine_config &mconfig, device_type type, std::string tag) + megasys1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vregs(*this, "vregs"), m_objectram(*this, "objectram"), diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index 2a312eaae00..8621b5c90af 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -9,7 +9,7 @@ class megazone_state : public driver_device { public: - megazone_state(const machine_config &mconfig, device_type type, std::string tag) + megazone_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_scrolly(*this, "scrolly"), m_scrollx(*this, "scrollx"), diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index e4dcaf228fb..bbe17d2e161 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -11,7 +11,7 @@ class mermaid_state : public driver_device { public: - mermaid_state(const machine_config &mconfig, device_type type, std::string tag) + mermaid_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram2(*this, "videoram2"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h index 646b8ca79a3..9c321e209c6 100644 --- a/src/mame/includes/metalmx.h +++ b/src/mame/includes/metalmx.h @@ -8,7 +8,7 @@ class metalmx_state : public driver_device { public: - metalmx_state(const machine_config &mconfig, device_type type, std::string tag) + metalmx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gsp(*this, "gsp"), diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index 1c667f9d8c4..b8783156faa 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -9,7 +9,7 @@ class metlclsh_state : public driver_device { public: - metlclsh_state(const machine_config &mconfig, device_type type, std::string tag) + metlclsh_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fgram(*this, "fgram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index 7bfaaab6cdb..e47da64dfaa 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -22,7 +22,7 @@ public: TIMER_METRO_BLIT_DONE }; - metro_state(const machine_config &mconfig, device_type type, std::string tag) + metro_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h index 2a44f786995..7083c202795 100644 --- a/src/mame/includes/mexico86.h +++ b/src/mame/includes/mexico86.h @@ -5,7 +5,7 @@ class mexico86_state : public driver_device { public: - mexico86_state(const machine_config &mconfig, device_type type, std::string tag) + mexico86_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_objectram(*this, "objectram"), m_protection_ram(*this, "protection_ram"), diff --git a/src/mame/includes/mhavoc.h b/src/mame/includes/mhavoc.h index aa3900940f7..1758ebcd67b 100644 --- a/src/mame/includes/mhavoc.h +++ b/src/mame/includes/mhavoc.h @@ -20,7 +20,7 @@ class mhavoc_state : public driver_device { public: - mhavoc_state(const machine_config &mconfig, device_type type, std::string tag) + mhavoc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_zram0(*this, "zram0"), m_zram1(*this, "zram1"), diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index 2b9a826a8d2..e6295b78ae0 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -50,7 +50,7 @@ public: TIMER_ADC_DONE }; - micro3d_state(const machine_config &mconfig, device_type type, std::string tag) + micro3d_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), @@ -229,7 +229,7 @@ class micro3d_sound_device : public device_t, public device_sound_interface { public: - micro3d_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + micro3d_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~micro3d_sound_device() {} void noise_sh_w(UINT8 data); diff --git a/src/mame/includes/micronic.h b/src/mame/includes/micronic.h index 999e1c38691..2284e875dbe 100644 --- a/src/mame/includes/micronic.h +++ b/src/mame/includes/micronic.h @@ -25,7 +25,7 @@ class micronic_state : public driver_device { public: - micronic_state(const machine_config &mconfig, device_type type, std::string tag) + micronic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_lcdc(*this, HD61830_TAG), diff --git a/src/mame/includes/microtan.h b/src/mame/includes/microtan.h index d8ae616a6e1..c9e990ea472 100644 --- a/src/mame/includes/microtan.h +++ b/src/mame/includes/microtan.h @@ -30,7 +30,7 @@ public: TIMER_PULSE_NMI }; - microtan_state(const machine_config &mconfig, device_type type, std::string tag) + microtan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h index 1707fa91c61..e64a7992611 100644 --- a/src/mame/includes/midtunit.h +++ b/src/mame/includes/midtunit.h @@ -18,7 +18,7 @@ public: TIMER_DMA }; - midtunit_state(const machine_config &mconfig, device_type type, std::string tag) + midtunit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette(*this, "palette"), diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index bbf3f2e3a84..196f4e64bb4 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -47,7 +47,7 @@ public: TIMER_SCANLINE }; - midvunit_state(const machine_config &mconfig, device_type type, std::string tag) + midvunit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_nvram(*this, "nvram"), m_ram_base(*this, "ram_base"), diff --git a/src/mame/includes/midwunit.h b/src/mame/includes/midwunit.h index 775086484ae..c9a210bca9a 100644 --- a/src/mame/includes/midwunit.h +++ b/src/mame/includes/midwunit.h @@ -11,7 +11,7 @@ class midwunit_state : public midtunit_state { public: - midwunit_state(const machine_config &mconfig, device_type type, std::string tag) + midwunit_state(const machine_config &mconfig, device_type type, const char *tag) : midtunit_state(mconfig, type, tag), m_midway_serial_pic(*this, "serial_pic"), m_nvram(*this, "nvram"), diff --git a/src/mame/includes/midxunit.h b/src/mame/includes/midxunit.h index a9288ee8685..1f25950dc9f 100644 --- a/src/mame/includes/midxunit.h +++ b/src/mame/includes/midxunit.h @@ -11,7 +11,7 @@ class midxunit_state : public midtunit_state { public: - midxunit_state(const machine_config &mconfig, device_type type, std::string tag) + midxunit_state(const machine_config &mconfig, device_type type, const char *tag) : midtunit_state(mconfig, type, tag), m_nvram(*this, "nvram"), m_midway_serial_pic(*this, "serial_pic") { } diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h index 2cfd5bc43b3..b6b03c975bf 100644 --- a/src/mame/includes/midyunit.h +++ b/src/mame/includes/midyunit.h @@ -41,7 +41,7 @@ public: TIMER_AUTOERASE_LINE }; - midyunit_state(const machine_config &mconfig, device_type type, std::string tag) + midyunit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h index e9574f20fc2..54850ec49d3 100644 --- a/src/mame/includes/midzeus.h +++ b/src/mame/includes/midzeus.h @@ -13,7 +13,7 @@ class midzeus_state : public driver_device { public: - midzeus_state(const machine_config &mconfig, device_type type, std::string tag) + midzeus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_nvram(*this, "nvram"), m_ram_base(*this, "ram_base"), @@ -89,7 +89,7 @@ private: class midzeus2_state : public midzeus_state { public: - midzeus2_state(const machine_config &mconfig, device_type type, std::string tag) + midzeus2_state(const machine_config &mconfig, device_type type, const char *tag) : midzeus_state(mconfig, type, tag) { } DECLARE_VIDEO_START(midzeus2); diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index 8bf9b52c0a1..cdd6a8887bc 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -9,7 +9,7 @@ class mikie_state : public driver_device { public: - mikie_state(const machine_config &mconfig, device_type type, std::string tag) + mikie_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/mikro80.h b/src/mame/includes/mikro80.h index 43605587be3..441ca98bcda 100644 --- a/src/mame/includes/mikro80.h +++ b/src/mame/includes/mikro80.h @@ -20,7 +20,7 @@ public: TIMER_RESET }; - mikro80_state(const machine_config &mconfig, device_type type, std::string tag) + mikro80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cursor_ram(*this, "cursor_ram"), m_video_ram(*this, "video_ram"), diff --git a/src/mame/includes/mikromik.h b/src/mame/includes/mikromik.h index 0dfa8412ceb..fd87077d48c 100644 --- a/src/mame/includes/mikromik.h +++ b/src/mame/includes/mikromik.h @@ -35,7 +35,7 @@ class mm1_state : public driver_device { public: - mm1_state(const machine_config &mconfig, device_type type, std::string tag) : + mm1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I8085A_TAG), m_iop(*this, I8212_TAG), diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index 0a0d6aa5f0e..b94aad312e0 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -14,7 +14,7 @@ class mitchell_state : public driver_device { public: - mitchell_state(const machine_config &mconfig, device_type type, std::string tag) + mitchell_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index 6cf0e86f082..d3b2946bb2c 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -6,7 +6,7 @@ class mjkjidai_state : public driver_device { public: - mjkjidai_state(const machine_config &mconfig, device_type type, std::string tag) + mjkjidai_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index fd627b33376..824766648e5 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -13,7 +13,7 @@ enum {MAT_STACK_SIZE = 32}; class model1_state : public driver_device { public: - model1_state(const machine_config &mconfig, device_type type, std::string tag) + model1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_m1audio(*this, "m1audio"), diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 80454133bf7..1f4bbcaa6d5 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -16,7 +16,7 @@ struct geo_state; class model2_state : public driver_device { public: - model2_state(const machine_config &mconfig, device_type type, std::string tag) + model2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_workram(*this, "workram"), m_bufferram(*this, "bufferram"), diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index 5afa3887cd9..1c66bf531c9 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -51,7 +51,7 @@ class model3_renderer; class model3_state : public driver_device { public: - model3_state(const machine_config &mconfig, device_type type, std::string tag) + model3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_lsi53c810(*this, "lsi53c810"), diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h index 77cf58e984b..51eb27a061b 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -9,7 +9,7 @@ class momoko_state : public driver_device { public: - momoko_state(const machine_config &mconfig, device_type type, std::string tag) + momoko_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index fefd94d6fdd..28cb1e9ffef 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -18,7 +18,7 @@ class moo_state : public driver_device { public: - moo_state(const machine_config &mconfig, device_type type, std::string tag) + moo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_workram(*this, "workram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h index 2e7b18449b9..53deb5cf82f 100644 --- a/src/mame/includes/mosaic.h +++ b/src/mame/includes/mosaic.h @@ -9,7 +9,7 @@ class mosaic_state : public driver_device { public: - mosaic_state(const machine_config &mconfig, device_type type, std::string tag) + mosaic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h index 2c00ac20ab7..8e23e7d80b1 100644 --- a/src/mame/includes/mouser.h +++ b/src/mame/includes/mouser.h @@ -9,7 +9,7 @@ class mouser_state : public driver_device { public: - mouser_state(const machine_config &mconfig, device_type type, std::string tag) + mouser_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/mpf1.h b/src/mame/includes/mpf1.h index 7945e00513b..603dd68f838 100644 --- a/src/mame/includes/mpf1.h +++ b/src/mame/includes/mpf1.h @@ -26,7 +26,7 @@ class mpf1_state : public driver_device { public: - mpf1_state(const machine_config &mconfig, device_type type, std::string tag) + mpf1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_ctc(*this, Z80CTC_TAG), diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h index 73f50049e60..3a79b1c0ce0 100644 --- a/src/mame/includes/mpu4.h +++ b/src/mame/includes/mpu4.h @@ -94,7 +94,7 @@ struct bwb_chr_table//dynamically populated table for BwB protection class mpu4_state : public driver_device { public: - mpu4_state(const machine_config &mconfig, device_type type, std::string tag) + mpu4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_vfd(*this, "vfd"), diff --git a/src/mame/includes/mpz80.h b/src/mame/includes/mpz80.h index df7d2191b06..5477c9c156c 100644 --- a/src/mame/includes/mpz80.h +++ b/src/mame/includes/mpz80.h @@ -16,7 +16,7 @@ class mpz80_state : public driver_device { public: - mpz80_state(const machine_config &mconfig, device_type type, std::string tag) + mpz80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_ram(*this, RAM_TAG), diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index b307b723c7c..0a83c779498 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -9,7 +9,7 @@ class mrdo_state : public driver_device { public: - mrdo_state(const machine_config &mconfig, device_type type, std::string tag) + mrdo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bgvideoram(*this, "bgvideoram"), m_fgvideoram(*this, "fgvideoram"), diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index 356536ace7b..89a139fabcf 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -9,7 +9,7 @@ class mrflea_state : public driver_device { public: - mrflea_state(const machine_config &mconfig, device_type type, std::string tag) + mrflea_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index ce77d7cbd50..ba39ef942a6 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -9,7 +9,7 @@ class mrjong_state : public driver_device { public: - mrjong_state(const machine_config &mconfig, device_type type, std::string tag) + mrjong_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index 66d15e35f88..87fe602a7de 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -3,7 +3,7 @@ class ms32_state : public driver_device { public: - ms32_state(const machine_config &mconfig, device_type type, std::string tag) + ms32_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mainram(*this, "mainram"), m_roz_ctrl(*this, "roz_ctrl"), diff --git a/src/mame/includes/msbc1.h b/src/mame/includes/msbc1.h index ce77734cf80..75cf55060e6 100644 --- a/src/mame/includes/msbc1.h +++ b/src/mame/includes/msbc1.h @@ -13,7 +13,7 @@ class msbc1_state : public driver_device { public: - msbc1_state(const machine_config &mconfig, device_type type, std::string tag) + msbc1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,MC68000R12_TAG) { diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h index 613529a5ea9..d2f94f51e41 100644 --- a/src/mame/includes/msisaac.h +++ b/src/mame/includes/msisaac.h @@ -8,7 +8,7 @@ class msisaac_state : public driver_device { public: - msisaac_state(const machine_config &mconfig, device_type type, std::string tag) + msisaac_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/msx.h b/src/mame/includes/msx.h index 5792de2b551..284f13c77b8 100644 --- a/src/mame/includes/msx.h +++ b/src/mame/includes/msx.h @@ -114,7 +114,7 @@ class msx_state : public driver_device { public: - msx_state(const machine_config &mconfig, device_type type, std::string tag) + msx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_v9938(*this, "v9938") diff --git a/src/mame/includes/mtx.h b/src/mame/includes/mtx.h index c9706471021..5558e1fcd15 100644 --- a/src/mame/includes/mtx.h +++ b/src/mame/includes/mtx.h @@ -30,7 +30,7 @@ class mtx_state : public driver_device { public: - mtx_state(const machine_config &mconfig, device_type type, std::string tag) + mtx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_sn(*this, SN76489A_TAG), diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index 23e4744578f..e670686d9c4 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -4,7 +4,7 @@ class mugsmash_state : public driver_device { public: - mugsmash_state(const machine_config &mconfig, device_type type, std::string tag) + mugsmash_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram1(*this, "videoram1"), m_videoram2(*this, "videoram2"), diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h index 3ca20f5ef87..ed6d3fae67a 100644 --- a/src/mame/includes/multfish.h +++ b/src/mame/includes/multfish.h @@ -14,7 +14,7 @@ class igrosoft_gamble_state : public driver_device { public: - igrosoft_gamble_state(const machine_config &mconfig, device_type type, std::string tag) + igrosoft_gamble_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_m48t35(*this, "m48t35" ), diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h index 37a9fc88ef7..6606f5591ab 100644 --- a/src/mame/includes/munchmo.h +++ b/src/mame/includes/munchmo.h @@ -9,7 +9,7 @@ class munchmo_state : public driver_device { public: - munchmo_state(const machine_config &mconfig, device_type type, std::string tag) + munchmo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sprite_xpos(*this, "sprite_xpos"), m_sprite_tile(*this, "sprite_tile"), diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index 7f4fe7db0ee..160f2398d16 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -5,7 +5,7 @@ class mustache_state : public driver_device { public: - mustache_state(const machine_config &mconfig, device_type type, std::string tag) + mustache_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index 7438b124f96..1641d3a1086 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -38,7 +38,7 @@ class mw8080bw_state : public driver_device { public: - mw8080bw_state(const machine_config &mconfig, device_type type, std::string tag) + mw8080bw_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_mb14241(*this,"mb14241"), diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 79290a664b5..6e311814bba 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -15,7 +15,7 @@ class mystston_state : public driver_device { public: - mystston_state(const machine_config &mconfig, device_type type, std::string tag) + mystston_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ay8910_data(*this, "ay8910_data"), m_ay8910_select(*this, "ay8910_select"), diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h index 16a712d9c87..0ea09731627 100644 --- a/src/mame/includes/mystwarr.h +++ b/src/mame/includes/mystwarr.h @@ -9,7 +9,7 @@ class mystwarr_state : public konamigx_state { public: - mystwarr_state(const machine_config &mconfig, device_type type, std::string tag) + mystwarr_state(const machine_config &mconfig, device_type type, const char *tag) : konamigx_state(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_k053252(*this, "k053252"), diff --git a/src/mame/includes/mz700.h b/src/mame/includes/mz700.h index 59d6482e4ae..552dd9a20c0 100644 --- a/src/mame/includes/mz700.h +++ b/src/mame/includes/mz700.h @@ -22,7 +22,7 @@ class mz_state : public driver_device { public: - mz_state(const machine_config &mconfig, device_type type, std::string tag) + mz_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_speaker(*this, "speaker") diff --git a/src/mame/includes/mz80.h b/src/mame/includes/mz80.h index 2cf8a6da018..93dd6c09b9d 100644 --- a/src/mame/includes/mz80.h +++ b/src/mame/includes/mz80.h @@ -20,7 +20,7 @@ class mz80_state : public driver_device { public: - mz80_state(const machine_config &mconfig, device_type type, std::string tag) + mz80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pit(*this, "pit8253"), diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h index 4f4d96449c4..783efd70a12 100644 --- a/src/mame/includes/n64.h +++ b/src/mame/includes/n64.h @@ -15,7 +15,7 @@ class n64_rdp; class n64_state : public driver_device { public: - n64_state(const machine_config &mconfig, device_type type, std::string tag) + n64_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } @@ -58,7 +58,7 @@ private: public: // construction/destruction - n64_periphs(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + n64_periphs(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ32_MEMBER( is64_r ); DECLARE_WRITE32_MEMBER( is64_w ); diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index 1b123c71095..9e5926ced41 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -7,7 +7,7 @@ class n8080_state : public driver_device { public: - n8080_state(const machine_config &mconfig, device_type type, std::string tag) + n8080_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h index 94512e846d7..eeb702ae58e 100644 --- a/src/mame/includes/namcofl.h +++ b/src/mame/includes/namcofl.h @@ -21,7 +21,7 @@ class namcofl_state : public namcos2_shared_state { public: - namcofl_state(const machine_config &mconfig, device_type type, std::string tag) + namcofl_state(const machine_config &mconfig, device_type type, const char *tag) : namcos2_shared_state(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_mcu(*this,"mcu"), diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index 1af5a81b5f3..17b4b79009f 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -28,7 +28,7 @@ enum class namcona1_state : public driver_device { public: - namcona1_state(const machine_config &mconfig, device_type type, std::string tag) + namcona1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_mcu(*this,"mcu"), diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h index 4e2439f672d..02930edb0e0 100644 --- a/src/mame/includes/namconb1.h +++ b/src/mame/includes/namconb1.h @@ -28,7 +28,7 @@ class namconb1_state : public namcos2_shared_state { public: - namconb1_state(const machine_config &mconfig, device_type type, std::string tag) + namconb1_state(const machine_config &mconfig, device_type type, const char *tag) : namcos2_shared_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), diff --git a/src/mame/includes/namcond1.h b/src/mame/includes/namcond1.h index 5c30cb9e81c..979bf93bf05 100644 --- a/src/mame/includes/namcond1.h +++ b/src/mame/includes/namcond1.h @@ -13,7 +13,7 @@ class namcond1_state : public driver_device { public: - namcond1_state(const machine_config &mconfig, device_type type, std::string tag) + namcond1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index f88c32b8c16..7c0146bdaa7 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -8,7 +8,7 @@ class namcos1_state : public driver_device { public: - namcos1_state(const machine_config &mconfig, device_type type, std::string tag) + namcos1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index 2cb1b5741c8..b26aff34a91 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -96,7 +96,7 @@ enum class namcos2_shared_state : public driver_device { public: - namcos2_shared_state(const machine_config &mconfig, device_type type, std::string tag) + namcos2_shared_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_dspmaster(*this, "dspmaster"), m_dspslave(*this, "dspslave"), @@ -259,7 +259,7 @@ public: class namcos2_state : public namcos2_shared_state { public: - namcos2_state(const machine_config &mconfig, device_type type, std::string tag) + namcos2_state(const machine_config &mconfig, device_type type, const char *tag) : namcos2_shared_state(mconfig, type, tag), m_dpram(*this, "dpram"), m_paletteram(*this, "paletteram"), diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h index e50f1210583..e35265aa830 100644 --- a/src/mame/includes/namcos21.h +++ b/src/mame/includes/namcos21.h @@ -43,7 +43,7 @@ struct edge class namcos21_state : public namcos2_shared_state { public: - namcos21_state(const machine_config &mconfig, device_type type, std::string tag) + namcos21_state(const machine_config &mconfig, device_type type, const char *tag) : namcos2_shared_state(mconfig, type, tag), m_winrun_dspbios(*this,"winrun_dspbios"), m_winrun_polydata(*this,"winrun_polydata"), diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index 8a51c0e9963..28a01852fbf 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -171,7 +171,7 @@ enum namcos22_dsp_upload_state class namcos22_state : public driver_device { public: - namcos22_state(const machine_config &mconfig, device_type type, std::string tag) + namcos22_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_master(*this, "master"), diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h index 4120413e9e5..5842c5c570e 100644 --- a/src/mame/includes/namcos86.h +++ b/src/mame/includes/namcos86.h @@ -5,7 +5,7 @@ class namcos86_state : public driver_device { public: - namcos86_state(const machine_config &mconfig, device_type type, std::string tag) + namcos86_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cpu1(*this, "cpu1"), m_cpu2(*this, "cpu2"), diff --git a/src/mame/includes/naomi.h b/src/mame/includes/naomi.h index 60123e45f6c..3e1e6c80eb0 100644 --- a/src/mame/includes/naomi.h +++ b/src/mame/includes/naomi.h @@ -37,7 +37,7 @@ enum { class naomi_state : public dc_state { public: - naomi_state(const machine_config &mconfig, device_type type, std::string tag) + naomi_state(const machine_config &mconfig, device_type type, const char *tag) : dc_state(mconfig, type, tag), pvr2_texture_ram(*this, "textureram2"), pvr2_framebuffer_ram(*this, "frameram2"), diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index ebd56bd4924..5e0075719b0 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -5,7 +5,7 @@ class naughtyb_state : public driver_device { public: - naughtyb_state(const machine_config &mconfig, device_type type, std::string tag) + naughtyb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_naughtyb_custom(*this, "naughtyb_custom"), diff --git a/src/mame/includes/nb1413m3.h b/src/mame/includes/nb1413m3.h index 3170b92c319..0408c2009cc 100644 --- a/src/mame/includes/nb1413m3.h +++ b/src/mame/includes/nb1413m3.h @@ -126,7 +126,7 @@ enum { class nb1413m3_device : public device_t { public: - nb1413m3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nb1413m3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~nb1413m3_device() {} // (static) configuration helpers diff --git a/src/mame/includes/nb1414m4.h b/src/mame/includes/nb1414m4.h index 032eeaa7fde..20e392f6f2e 100644 --- a/src/mame/includes/nb1414m4.h +++ b/src/mame/includes/nb1414m4.h @@ -4,7 +4,7 @@ class nb1414m4_device : public device_t, public device_video_interface { public: - nb1414m4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nb1414m4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~nb1414m4_device() {} void exec(UINT16 mcu_cmd, UINT8 *vram, UINT16 &scrollx, UINT16 &scrolly, tilemap_t *tilemap); diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h index 426afc6e337..c08991c7f7c 100644 --- a/src/mame/includes/nbmj8688.h +++ b/src/mame/includes/nbmj8688.h @@ -11,7 +11,7 @@ public: TIMER_BLITTER }; - nbmj8688_state(const machine_config &mconfig, device_type type, std::string tag) : + nbmj8688_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_nb1413m3(*this, "nb1413m3"), diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index 5ba748835dc..6c636e289cb 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -10,7 +10,7 @@ public: TIMER_BLITTER }; - nbmj8891_state(const machine_config &mconfig, device_type type, std::string tag) + nbmj8891_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_nb1413m3(*this, "nb1413m3"), diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h index cab6f296c47..2a51f2ae112 100644 --- a/src/mame/includes/nbmj8900.h +++ b/src/mame/includes/nbmj8900.h @@ -10,7 +10,7 @@ public: TIMER_BLITTER }; - nbmj8900_state(const machine_config &mconfig, device_type type, std::string tag) + nbmj8900_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_nb1413m3(*this, "nb1413m3"), diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index 384371a4437..74920f3555f 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -5,7 +5,7 @@ class nbmj8991_state : public driver_device { public: - nbmj8991_state(const machine_config &mconfig, device_type type, std::string tag) + nbmj8991_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index ee3fef9048e..ec36eb8f168 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -23,7 +23,7 @@ public: TIMER_BLITTER }; - nbmj9195_state(const machine_config &mconfig, device_type type, std::string tag) + nbmj9195_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_dac1(*this, "dac1"), diff --git a/src/mame/includes/nc.h b/src/mame/includes/nc.h index 19eff645869..76652a70c61 100644 --- a/src/mame/includes/nc.h +++ b/src/mame/includes/nc.h @@ -39,7 +39,7 @@ enum class nc_state : public driver_device { public: - nc_state(const machine_config &mconfig, device_type type, std::string tag) : + nc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index f8bfa3ea72e..1d86132e94c 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -8,7 +8,7 @@ class nemesis_state : public driver_device { public: - nemesis_state(const machine_config &mconfig, device_type type, std::string tag) + nemesis_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_charram(*this, "charram"), m_xscroll1(*this, "xscroll1"), diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index ede20034bd6..da50cb62765 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -30,7 +30,7 @@ class neogeo_state : public driver_device { public: - neogeo_state(const machine_config &mconfig, device_type type, std::string tag) + neogeo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_banked_cart(*this, "banked_cart"), m_maincpu(*this, "maincpu"), @@ -228,7 +228,7 @@ public: class neogeo_noslot_state : public neogeo_state { public: - neogeo_noslot_state(const machine_config &mconfig, device_type type, std::string tag) + neogeo_noslot_state(const machine_config &mconfig, device_type type, const char *tag) : neogeo_state(mconfig, type, tag), /* legacy cartridge specifics */ m_mslugx_prot(*this, "mslugx_prot"), @@ -331,7 +331,7 @@ class neogeo_noslot_state : public neogeo_state class neogeo_noslot_kog_state : public neogeo_state { public: - neogeo_noslot_kog_state(const machine_config &mconfig, device_type type, std::string tag) + neogeo_noslot_kog_state(const machine_config &mconfig, device_type type, const char *tag) : neogeo_state(mconfig, type, tag), /* legacy cartridge specifics */ m_bootleg_prot(*this, "bootleg_prot"), diff --git a/src/mame/includes/nes.h b/src/mame/includes/nes.h index d7393de9fc1..b3ba8450829 100644 --- a/src/mame/includes/nes.h +++ b/src/mame/includes/nes.h @@ -52,7 +52,7 @@ class nes_state : public driver_device { public: - nes_state(const machine_config &mconfig, device_type type, std::string tag) + nes_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppu(*this, "ppu"), diff --git a/src/mame/includes/newbrain.h b/src/mame/includes/newbrain.h index 3ad7112dedb..72edaf3b451 100644 --- a/src/mame/includes/newbrain.h +++ b/src/mame/includes/newbrain.h @@ -56,7 +56,7 @@ class newbrain_state : public driver_device { public: - newbrain_state(const machine_config &mconfig, device_type type, std::string tag) : + newbrain_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_copcpu(*this, COP420_TAG), @@ -206,7 +206,7 @@ protected: class newbrain_eim_state : public newbrain_state { public: - newbrain_eim_state(const machine_config &mconfig, device_type type, std::string tag) + newbrain_eim_state(const machine_config &mconfig, device_type type, const char *tag) : newbrain_state(mconfig, type, tag), m_fdccpu(*this, FDC_Z80_TAG), m_ctc(*this, Z80CTC_TAG), diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h index 3bc3c6657dc..e2d380a7cd3 100644 --- a/src/mame/includes/news.h +++ b/src/mame/includes/news.h @@ -4,7 +4,7 @@ class news_state : public driver_device { public: - news_state(const machine_config &mconfig, device_type type, std::string tag) + news_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bgram(*this, "bgram"), m_fgram(*this, "fgram"), diff --git a/src/mame/includes/next.h b/src/mame/includes/next.h index 83f9ac25866..09e221be65f 100644 --- a/src/mame/includes/next.h +++ b/src/mame/includes/next.h @@ -21,7 +21,7 @@ class next_state : public driver_device { public: - next_state(const machine_config &mconfig, device_type type, std::string tag) + next_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), maincpu(*this, "maincpu"), rtc(*this, "rtc"), diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index e52b077500e..45f35a3d42c 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -11,7 +11,7 @@ class ninjakd2_state : public driver_device { public: - ninjakd2_state(const machine_config &mconfig, device_type type, std::string tag) + ninjakd2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h index e65b0e03f65..2c1dc94e902 100644 --- a/src/mame/includes/ninjaw.h +++ b/src/mame/includes/ninjaw.h @@ -16,7 +16,7 @@ class ninjaw_state : public driver_device { public: - ninjaw_state(const machine_config &mconfig, device_type type, std::string tag) + ninjaw_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h index 4ad7fcf3540..7084c08c077 100644 --- a/src/mame/includes/nitedrvr.h +++ b/src/mame/includes/nitedrvr.h @@ -20,7 +20,7 @@ class nitedrvr_state : public driver_device { public: - nitedrvr_state(const machine_config &mconfig, device_type type, std::string tag) + nitedrvr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_hvc(*this, "hvc"), diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index 27ba0ed18ca..2115240a0da 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -12,7 +12,7 @@ public: TIMER_BLITTER }; - niyanpai_state(const machine_config &mconfig, device_type type, std::string tag) + niyanpai_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_tmp68301(*this, "tmp68301"), diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index dc71e964979..269db67fc82 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -8,7 +8,7 @@ class nmk16_state : public driver_device { public: - nmk16_state(const machine_config &mconfig, device_type type, std::string tag) + nmk16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h index 1f9a4aa6e01..0053087ec91 100644 --- a/src/mame/includes/norautp.h +++ b/src/mame/includes/norautp.h @@ -11,7 +11,7 @@ class norautp_state : public driver_device { public: - norautp_state(const machine_config &mconfig, device_type type, std::string tag) + norautp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index 16a93407536..497a337c4e5 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -3,7 +3,7 @@ class nova2001_state : public driver_device { public: - nova2001_state(const machine_config &mconfig, device_type type, std::string tag) + nova2001_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h index d51429d6c1b..893014050cd 100644 --- a/src/mame/includes/nycaptor.h +++ b/src/mame/includes/nycaptor.h @@ -5,7 +5,7 @@ class nycaptor_state : public driver_device { public: - nycaptor_state(const machine_config &mconfig, device_type type, std::string tag) + nycaptor_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_scrlram(*this, "scrlram"), diff --git a/src/mame/includes/ob68k1a.h b/src/mame/includes/ob68k1a.h index d178cef7570..88f57f52d82 100644 --- a/src/mame/includes/ob68k1a.h +++ b/src/mame/includes/ob68k1a.h @@ -26,7 +26,7 @@ class ob68k1a_state : public driver_device { public: - ob68k1a_state(const machine_config &mconfig, device_type type, std::string tag) + ob68k1a_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, MC68000L10_TAG), m_dbrg(*this, COM8116_TAG), diff --git a/src/mame/includes/offtwall.h b/src/mame/includes/offtwall.h index 5505c76c1eb..1e8ce7c8441 100644 --- a/src/mame/includes/offtwall.h +++ b/src/mame/includes/offtwall.h @@ -13,7 +13,7 @@ class offtwall_state : public atarigen_state { public: - offtwall_state(const machine_config &mconfig, device_type type, std::string tag) + offtwall_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_jsa(*this, "jsa"), m_vad(*this, "vad"), diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index 183206e0d8c..86986de1b99 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -9,7 +9,7 @@ class ohmygod_state : public driver_device { public: - ohmygod_state(const machine_config &mconfig, device_type type, std::string tag) + ohmygod_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index b7ae669091a..65c7e36bd9c 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -10,7 +10,7 @@ class ojankohs_state : public driver_device { public: - ojankohs_state(const machine_config &mconfig, device_type type, std::string tag) + ojankohs_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/ondra.h b/src/mame/includes/ondra.h index 035ac0c2c32..9277b907e4f 100644 --- a/src/mame/includes/ondra.h +++ b/src/mame/includes/ondra.h @@ -15,7 +15,7 @@ class ondra_state : public driver_device { public: - ondra_state(const machine_config &mconfig, device_type type, std::string tag) + ondra_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cassette(*this, "cassette"), diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index 4c04370bad3..c7f854e6a09 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -5,7 +5,7 @@ class oneshot_state : public driver_device { public: - oneshot_state(const machine_config &mconfig, device_type type, std::string tag) + oneshot_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sprites(*this, "sprites"), m_bg_videoram(*this, "bg_videoram"), diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h index 8443deaa84e..e93ab442abd 100644 --- a/src/mame/includes/opwolf.h +++ b/src/mame/includes/opwolf.h @@ -18,7 +18,7 @@ public: TIMER_CCHIP }; - opwolf_state(const machine_config &mconfig, device_type type, std::string tag) + opwolf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cchip_ram(*this, "cchip_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/orao.h b/src/mame/includes/orao.h index df0a5f767ef..9707d6019f1 100644 --- a/src/mame/includes/orao.h +++ b/src/mame/includes/orao.h @@ -14,7 +14,7 @@ class orao_state : public driver_device { public: - orao_state(const machine_config &mconfig, device_type type, std::string tag) + orao_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_memory(*this, "memory"), m_video_ram(*this, "video_ram"), diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index a29afdd96c1..1095f531f04 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -20,7 +20,7 @@ class orbit_state : public driver_device { public: - orbit_state(const machine_config &mconfig, device_type type, std::string tag) + orbit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_playfield_ram(*this, "playfield_ram"), m_sprite_ram(*this, "sprite_ram"), diff --git a/src/mame/includes/orion.h b/src/mame/includes/orion.h index 286d43af94e..5d6a57058be 100644 --- a/src/mame/includes/orion.h +++ b/src/mame/includes/orion.h @@ -24,7 +24,7 @@ class orion_state : public radio86_state { public: - orion_state(const machine_config &mconfig, device_type type, std::string tag) + orion_state(const machine_config &mconfig, device_type type, const char *tag) : radio86_state(mconfig, type, tag) , m_fdc(*this, "fd1793") , m_ram(*this, RAM_TAG) diff --git a/src/mame/includes/osborne1.h b/src/mame/includes/osborne1.h index ee7da6ae3d4..7a7e6d64a84 100644 --- a/src/mame/includes/osborne1.h +++ b/src/mame/includes/osborne1.h @@ -27,7 +27,7 @@ public: TIMER_ACIA_RXC_TXC }; - osborne1_state(const machine_config &mconfig, device_type type, std::string tag) : + osborne1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/osi.h b/src/mame/includes/osi.h index bac2769faa7..43485a7a5f4 100644 --- a/src/mame/includes/osi.h +++ b/src/mame/includes/osi.h @@ -30,7 +30,7 @@ class sb2m600_state : public driver_device { public: - sb2m600_state(const machine_config &mconfig, device_type type, std::string tag) : + sb2m600_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M6502_TAG), m_acia_0(*this, "acia_0"), @@ -108,7 +108,7 @@ protected: class c1p_state : public sb2m600_state { public: - c1p_state(const machine_config &mconfig, device_type type, std::string tag) : + c1p_state(const machine_config &mconfig, device_type type, const char *tag) : sb2m600_state(mconfig, type, tag), m_beep(*this, "beeper") { @@ -126,7 +126,7 @@ public: class c1pmf_state : public c1p_state { public: - c1pmf_state(const machine_config &mconfig, device_type type, std::string tag) : + c1pmf_state(const machine_config &mconfig, device_type type, const char *tag) : c1p_state(mconfig, type, tag), m_floppy0(*this, "floppy0"), m_floppy1(*this, "floppy1") @@ -148,7 +148,7 @@ private: class uk101_state : public sb2m600_state { public: - uk101_state(const machine_config &mconfig, device_type type, std::string tag) : + uk101_state(const machine_config &mconfig, device_type type, const char *tag) : sb2m600_state(mconfig, type, tag) { } diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index 86bad52e905..d730f4fbc7b 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -33,7 +33,7 @@ public: TIMER_AD_INTERRUPT }; - othunder_state(const machine_config &mconfig, device_type type, std::string tag) + othunder_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this,"spriteram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index 892caddc3c7..ad0cceba7a7 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -14,7 +14,7 @@ class overdriv_state : public driver_device { public: - overdriv_state(const machine_config &mconfig, device_type type, std::string tag) + overdriv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/p2000t.h b/src/mame/includes/p2000t.h index 062d386cc4a..0548f661356 100644 --- a/src/mame/includes/p2000t.h +++ b/src/mame/includes/p2000t.h @@ -18,7 +18,7 @@ class p2000t_state : public driver_device { public: - p2000t_state(const machine_config &mconfig, device_type type, std::string tag) + p2000t_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index 7b3a24ad68b..9c4eee41deb 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -5,7 +5,7 @@ class pacland_state : public driver_device { public: - pacland_state(const machine_config &mconfig, device_type type, std::string tag) + pacland_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h index 970f94cbff9..d62272914f5 100644 --- a/src/mame/includes/pacman.h +++ b/src/mame/includes/pacman.h @@ -11,7 +11,7 @@ class pacman_state : public driver_device { public: - pacman_state(const machine_config &mconfig, device_type type, std::string tag) + pacman_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_namco_sound(*this, "namco"), diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index 9f623307f88..8fb440f473f 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -9,7 +9,7 @@ class pandoras_state : public driver_device { public: - pandoras_state(const machine_config &mconfig, device_type type, std::string tag) + pandoras_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index 98b27c4360a..0d63f4f3ee0 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -5,7 +5,7 @@ class paradise_state : public driver_device { public: - paradise_state(const machine_config &mconfig, device_type type, std::string tag) + paradise_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki2(*this, "oki2"), diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h index 945b63a9ce2..e9fa82faa35 100644 --- a/src/mame/includes/parodius.h +++ b/src/mame/includes/parodius.h @@ -20,7 +20,7 @@ public: TIMER_NMI }; - parodius_state(const machine_config &mconfig, device_type type, std::string tag) + parodius_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/partner.h b/src/mame/includes/partner.h index 0d19898a1f1..f5eba1168f8 100644 --- a/src/mame/includes/partner.h +++ b/src/mame/includes/partner.h @@ -16,7 +16,7 @@ class partner_state : public radio86_state { public: - partner_state(const machine_config &mconfig, device_type type, std::string tag) + partner_state(const machine_config &mconfig, device_type type, const char *tag) : radio86_state(mconfig, type, tag), m_ram(*this, RAM_TAG), m_fdc(*this, "wd1793") { } diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h index 6f65fb91fc7..e54f385787c 100644 --- a/src/mame/includes/pass.h +++ b/src/mame/includes/pass.h @@ -3,7 +3,7 @@ class pass_state : public driver_device { public: - pass_state(const machine_config &mconfig, device_type type, std::string tag) + pass_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_videoram(*this, "bg_videoram"), m_fg_videoram(*this, "fg_videoram"), diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index 6e8eed670cc..af0d87dc1f6 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -10,7 +10,7 @@ public: TIMER_BLITTER }; - pastelg_state(const machine_config &mconfig, device_type type, std::string tag) + pastelg_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_nb1413m3(*this, "nb1413m3"), diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h index 92497a9df77..4fcd6b64574 100644 --- a/src/mame/includes/pbaction.h +++ b/src/mame/includes/pbaction.h @@ -9,7 +9,7 @@ class pbaction_state : public driver_device { public: - pbaction_state(const machine_config &mconfig, device_type type, std::string tag) + pbaction_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_videoram2(*this, "videoram2"), diff --git a/src/mame/includes/pc1251.h b/src/mame/includes/pc1251.h index 53666cdeb62..653342b6d17 100644 --- a/src/mame/includes/pc1251.h +++ b/src/mame/includes/pc1251.h @@ -26,7 +26,7 @@ public: TIMER_POWER_UP }; - pc1251_state(const machine_config &mconfig, device_type type, std::string tag) + pc1251_state(const machine_config &mconfig, device_type type, const char *tag) : pocketc_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/pc1350.h b/src/mame/includes/pc1350.h index f6eaec4ef34..b52b8a53304 100644 --- a/src/mame/includes/pc1350.h +++ b/src/mame/includes/pc1350.h @@ -27,7 +27,7 @@ public: TIMER_POWER_UP }; - pc1350_state(const machine_config &mconfig, device_type type, std::string tag) + pc1350_state(const machine_config &mconfig, device_type type, const char *tag) : pocketc_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG) { } diff --git a/src/mame/includes/pc1401.h b/src/mame/includes/pc1401.h index eb277f57797..0ce077476ad 100644 --- a/src/mame/includes/pc1401.h +++ b/src/mame/includes/pc1401.h @@ -26,7 +26,7 @@ public: TIMER_POWER_UP }; - pc1401_state(const machine_config &mconfig, device_type type, std::string tag) + pc1401_state(const machine_config &mconfig, device_type type, const char *tag) : pocketc_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/pc1403.h b/src/mame/includes/pc1403.h index dcd836eceb0..c5bdf2f943f 100644 --- a/src/mame/includes/pc1403.h +++ b/src/mame/includes/pc1403.h @@ -26,7 +26,7 @@ public: TIMER_POWER_UP }; - pc1403_state(const machine_config &mconfig, device_type type, std::string tag) + pc1403_state(const machine_config &mconfig, device_type type, const char *tag) : pocketc_state(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/pc1512.h b/src/mame/includes/pc1512.h index 005ce1336bb..2334e8c92d5 100644 --- a/src/mame/includes/pc1512.h +++ b/src/mame/includes/pc1512.h @@ -44,7 +44,7 @@ class pc1512_state : public driver_device { public: - pc1512_state(const machine_config &mconfig, device_type type, std::string tag) + pc1512_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I8086_TAG), m_dmac(*this, I8237A5_TAG), @@ -230,7 +230,7 @@ public: class pc1640_state : public pc1512_state { public: - pc1640_state(const machine_config &mconfig, device_type type, std::string tag) + pc1640_state(const machine_config &mconfig, device_type type, const char *tag) : pc1512_state(mconfig, type, tag), m_sw(*this, "SW"), m_opt(0) diff --git a/src/mame/includes/pc4.h b/src/mame/includes/pc4.h index 5327e0f774e..f2d6a8519b9 100644 --- a/src/mame/includes/pc4.h +++ b/src/mame/includes/pc4.h @@ -17,7 +17,7 @@ class pc4_state : public driver_device { public: - pc4_state(const machine_config &mconfig, device_type type, std::string tag) + pc4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_beep(*this, "beeper"), diff --git a/src/mame/includes/pc8001.h b/src/mame/includes/pc8001.h index 5d708f6129c..76d3bafb529 100644 --- a/src/mame/includes/pc8001.h +++ b/src/mame/includes/pc8001.h @@ -31,7 +31,7 @@ class pc8001_state : public driver_device { public: - pc8001_state(const machine_config &mconfig, device_type type, std::string tag) + pc8001_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_rtc(*this, UPD1990A_TAG), @@ -82,7 +82,7 @@ public: class pc8001mk2_state : public pc8001_state { public: - pc8001mk2_state(const machine_config &mconfig, device_type type, std::string tag) + pc8001mk2_state(const machine_config &mconfig, device_type type, const char *tag) : pc8001_state(mconfig, type, tag), m_kanji_rom(*this, "kanji") { } diff --git a/src/mame/includes/pc8401a.h b/src/mame/includes/pc8401a.h index 8df422b8fa3..e7f63d2cad4 100644 --- a/src/mame/includes/pc8401a.h +++ b/src/mame/includes/pc8401a.h @@ -35,7 +35,7 @@ class pc8401a_state : public driver_device { public: - pc8401a_state(const machine_config &mconfig, device_type type, std::string tag) + pc8401a_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_rtc(*this, UPD1990A_TAG), @@ -99,7 +99,7 @@ public: class pc8500_state : public pc8401a_state { public: - pc8500_state(const machine_config &mconfig, device_type type, std::string tag) + pc8500_state(const machine_config &mconfig, device_type type, const char *tag) : pc8401a_state(mconfig, type, tag) { } diff --git a/src/mame/includes/pce.h b/src/mame/includes/pce.h index 7958cf0f16c..9d9a7d34b56 100644 --- a/src/mame/includes/pce.h +++ b/src/mame/includes/pce.h @@ -33,7 +33,7 @@ class pce_state : public driver_device { public: - pce_state(const machine_config &mconfig, device_type type, std::string tag) + pce_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cd_ram(*this, "cd_ram"), diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h index 92a581e422e..83133b3f612 100644 --- a/src/mame/includes/pcktgal.h +++ b/src/mame/includes/pcktgal.h @@ -6,7 +6,7 @@ class pcktgal_state : public driver_device { public: - pcktgal_state(const machine_config &mconfig, device_type type, std::string tag) + pcktgal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/pcw.h b/src/mame/includes/pcw.h index 540d0970c0a..fb9b35b96e9 100644 --- a/src/mame/includes/pcw.h +++ b/src/mame/includes/pcw.h @@ -28,7 +28,7 @@ class pcw_state : public driver_device { public: - pcw_state(const machine_config &mconfig, device_type type, std::string tag) + pcw_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_fdc(*this, "upd765"), diff --git a/src/mame/includes/pcw16.h b/src/mame/includes/pcw16.h index d937ecc1eb4..3f611f878d5 100644 --- a/src/mame/includes/pcw16.h +++ b/src/mame/includes/pcw16.h @@ -34,7 +34,7 @@ class pcw16_state : public driver_device { public: - pcw16_state(const machine_config &mconfig, device_type type, std::string tag) + pcw16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_flash0(*this, "flash0"), diff --git a/src/mame/includes/pdp1.h b/src/mame/includes/pdp1.h index 9f03942367b..c1745369736 100644 --- a/src/mame/includes/pdp1.h +++ b/src/mame/includes/pdp1.h @@ -235,7 +235,7 @@ struct lightpen_t class pdp1_state : public driver_device { public: - pdp1_state(const machine_config &mconfig, device_type type, std::string tag) + pdp1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/pecom.h b/src/mame/includes/pecom.h index 81c92979992..c8b9768bb31 100644 --- a/src/mame/includes/pecom.h +++ b/src/mame/includes/pecom.h @@ -16,7 +16,7 @@ class pecom_state : public driver_device { public: - pecom_state(const machine_config &mconfig, device_type type, std::string tag) + pecom_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cdp1802(*this, CDP1802_TAG), m_cdp1869(*this, CDP1869_TAG), diff --git a/src/mame/includes/pes.h b/src/mame/includes/pes.h index 8149037b4d0..cd57dc3f772 100644 --- a/src/mame/includes/pes.h +++ b/src/mame/includes/pes.h @@ -20,7 +20,7 @@ class pes_state : public driver_device { public: - pes_state(const machine_config &mconfig, device_type type, std::string tag) + pes_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_terminal(*this, TERMINAL_TAG), diff --git a/src/mame/includes/pet.h b/src/mame/includes/pet.h index 2324b149b85..d4572a99c05 100644 --- a/src/mame/includes/pet.h +++ b/src/mame/includes/pet.h @@ -36,7 +36,7 @@ class pet_state : public driver_device { public: - pet_state(const machine_config &mconfig, device_type type, std::string tag) : + pet_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M6502_TAG), m_via(*this, M6522_TAG), @@ -201,7 +201,7 @@ public: class pet2001b_state : public pet_state { public: - pet2001b_state(const machine_config &mconfig, device_type type, std::string tag) : + pet2001b_state(const machine_config &mconfig, device_type type, const char *tag) : pet_state(mconfig, type, tag) { } @@ -212,7 +212,7 @@ public: class pet80_state : public pet2001b_state { public: - pet80_state(const machine_config &mconfig, device_type type, std::string tag) : + pet80_state(const machine_config &mconfig, device_type type, const char *tag) : pet2001b_state(mconfig, type, tag) { } @@ -227,7 +227,7 @@ public: class superpet_state : public pet80_state { public: - superpet_state(const machine_config &mconfig, device_type type, std::string tag) + superpet_state(const machine_config &mconfig, device_type type, const char *tag) : pet80_state(mconfig, type, tag) { } }; @@ -236,7 +236,7 @@ public: class cbm8096_state : public pet80_state { public: - cbm8096_state(const machine_config &mconfig, device_type type, std::string tag) : + cbm8096_state(const machine_config &mconfig, device_type type, const char *tag) : pet80_state(mconfig, type, tag) { } }; @@ -245,7 +245,7 @@ public: class cbm8296_state : public pet80_state { public: - cbm8296_state(const machine_config &mconfig, device_type type, std::string tag) : + cbm8296_state(const machine_config &mconfig, device_type type, const char *tag) : pet80_state(mconfig, type, tag), m_basic_rom(*this, "basic"), m_editor_rom(*this, "editor"), diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index fec59357bcd..23f43937ff3 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -19,7 +19,7 @@ class pgm_state : public driver_device { public: - pgm_state(const machine_config &mconfig, device_type type, std::string tag) + pgm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoregs(*this, "videoregs"), m_videoram(*this, "videoram"), @@ -115,7 +115,7 @@ public: class pgm_asic3_state : public pgm_state { public: - pgm_asic3_state(const machine_config &mconfig, device_type type, std::string tag) + pgm_asic3_state(const machine_config &mconfig, device_type type, const char *tag) : pgm_state(mconfig, type, tag) { } @@ -137,7 +137,7 @@ public: class pgm_arm_type1_state : public pgm_state { public: - pgm_arm_type1_state(const machine_config &mconfig, device_type type, std::string tag) + pgm_arm_type1_state(const machine_config &mconfig, device_type type, const char *tag) : pgm_state(mconfig, type, tag), m_arm7_shareram(*this, "arm7_shareram"), m_prot(*this, "prot") { @@ -263,7 +263,7 @@ public: class pgm_arm_type2_state : public pgm_state { public: - pgm_arm_type2_state(const machine_config &mconfig, device_type type, std::string tag) + pgm_arm_type2_state(const machine_config &mconfig, device_type type, const char *tag) : pgm_state(mconfig, type, tag), m_arm_ram(*this, "arm_ram"), m_arm7_shareram(*this, "arm7_shareram"), @@ -307,7 +307,7 @@ public: class pgm_arm_type3_state : public pgm_state { public: - pgm_arm_type3_state(const machine_config &mconfig, device_type type, std::string tag) + pgm_arm_type3_state(const machine_config &mconfig, device_type type, const char *tag) : pgm_state(mconfig, type, tag), m_arm_ram(*this, "arm_ram"), m_arm_ram2(*this, "arm_ram2"), @@ -367,7 +367,7 @@ public: class pgm_022_025_state : public pgm_state { public: - pgm_022_025_state(const machine_config &mconfig, device_type type, std::string tag) + pgm_022_025_state(const machine_config &mconfig, device_type type, const char *tag) : pgm_state(mconfig, type, tag), m_sharedprotram(*this, "sharedprotram"), m_igs025(*this,"igs025"), @@ -395,7 +395,7 @@ public: class pgm_012_025_state : public pgm_state { public: - pgm_012_025_state(const machine_config &mconfig, device_type type, std::string tag) + pgm_012_025_state(const machine_config &mconfig, device_type type, const char *tag) : pgm_state(mconfig, type, tag), m_igs025(*this,"igs025") { @@ -422,7 +422,7 @@ public: class pgm_028_025_state : public pgm_state { public: - pgm_028_025_state(const machine_config &mconfig, device_type type, std::string tag) + pgm_028_025_state(const machine_config &mconfig, device_type type, const char *tag) : pgm_state(mconfig, type, tag), m_sharedprotram(*this, "sharedprotram"), m_igs025(*this,"igs025"), diff --git a/src/mame/includes/phc25.h b/src/mame/includes/phc25.h index 545b5e705d7..635e7cbeb70 100644 --- a/src/mame/includes/phc25.h +++ b/src/mame/includes/phc25.h @@ -27,7 +27,7 @@ class phc25_state : public driver_device { public: - phc25_state(const machine_config &mconfig, device_type type, std::string tag) + phc25_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_video_ram(*this, "video_ram") , m_maincpu(*this, Z80_TAG) diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h index 36ccbde6663..0f423efea69 100644 --- a/src/mame/includes/phoenix.h +++ b/src/mame/includes/phoenix.h @@ -7,7 +7,7 @@ class phoenix_state : public driver_device { public: - phoenix_state(const machine_config &mconfig, device_type type, std::string tag) + phoenix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_pleiads_custom(*this, "pleiads_custom"), @@ -83,7 +83,7 @@ class phoenix_sound_device : public device_t, public device_sound_interface { public: - phoenix_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + phoenix_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~phoenix_sound_device() {} DECLARE_WRITE8_MEMBER( control_a_w ); diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h index 63fc900ef73..afc47ef6ccc 100644 --- a/src/mame/includes/pingpong.h +++ b/src/mame/includes/pingpong.h @@ -3,7 +3,7 @@ class pingpong_state : public driver_device { public: - pingpong_state(const machine_config &mconfig, device_type type, std::string tag) + pingpong_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index 1767907a7b6..20486d5b541 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -6,7 +6,7 @@ class pirates_state : public driver_device { public: - pirates_state(const machine_config &mconfig, device_type type, std::string tag) + pirates_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h index 96c407148f8..91dadd7172e 100644 --- a/src/mame/includes/pitnrun.h +++ b/src/mame/includes/pitnrun.h @@ -3,7 +3,7 @@ class pitnrun_state : public driver_device { public: - pitnrun_state(const machine_config &mconfig, device_type type, std::string tag) + pitnrun_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), diff --git a/src/mame/includes/pk8000.h b/src/mame/includes/pk8000.h index 4bff9b5b0c3..ad895850537 100644 --- a/src/mame/includes/pk8000.h +++ b/src/mame/includes/pk8000.h @@ -3,7 +3,7 @@ class pk8000_base_state : public driver_device { public: - pk8000_base_state(const machine_config &mconfig, device_type type, std::string tag) + pk8000_base_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } diff --git a/src/mame/includes/pk8020.h b/src/mame/includes/pk8020.h index 34d96f4766e..d8de9284db6 100644 --- a/src/mame/includes/pk8020.h +++ b/src/mame/includes/pk8020.h @@ -23,7 +23,7 @@ class pk8020_state : public driver_device { public: - pk8020_state(const machine_config &mconfig, device_type type, std::string tag) + pk8020_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppi8255_1(*this, "ppi8255_1"), diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h index 0eacd97cd01..5f0b0e76b94 100644 --- a/src/mame/includes/pktgaldx.h +++ b/src/mame/includes/pktgaldx.h @@ -14,7 +14,7 @@ class pktgaldx_state : public driver_device { public: - pktgaldx_state(const machine_config &mconfig, device_type type, std::string tag) + pktgaldx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_deco104(*this, "ioprot104"), m_pf1_rowscroll(*this, "pf1_rowscroll"), diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index efad96194a3..c69f07cd514 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -12,7 +12,7 @@ struct chr_bank class playch10_state : public driver_device { public: - playch10_state(const machine_config &mconfig, device_type type, std::string tag) + playch10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppu(*this, "ppu"), diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index aafef470b2b..2d609ea518f 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -7,7 +7,7 @@ class playmark_state : public driver_device { public: - playmark_state(const machine_config &mconfig, device_type type, std::string tag) + playmark_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bgvideoram(*this, "bgvideoram"), m_videoram1(*this, "videoram1"), diff --git a/src/mame/includes/plus4.h b/src/mame/includes/plus4.h index a59d0f59aee..fbd590c9601 100644 --- a/src/mame/includes/plus4.h +++ b/src/mame/includes/plus4.h @@ -36,7 +36,7 @@ class plus4_state : public driver_device { public: - plus4_state(const machine_config &mconfig, device_type type, std::string tag) + plus4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, MOS7501_TAG), m_pla(*this, PLA_TAG), @@ -161,7 +161,7 @@ public: class c16_state : public plus4_state { public: - c16_state(const machine_config &mconfig, device_type type, std::string tag) + c16_state(const machine_config &mconfig, device_type type, const char *tag) : plus4_state(mconfig, type, tag) { } diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index 76fdd5c8650..91caec85865 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -14,7 +14,7 @@ static const UINT16 dsp56k_bank04_size = 0x1fc0; class polygonet_state : public driver_device { public: - polygonet_state(const machine_config &mconfig, device_type type, std::string tag) + polygonet_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/pmd85.h b/src/mame/includes/pmd85.h index 8b02cfedcaf..691b382a478 100644 --- a/src/mame/includes/pmd85.h +++ b/src/mame/includes/pmd85.h @@ -24,7 +24,7 @@ public: TIMER_CASSETTE }; - pmd85_state(const machine_config &mconfig, device_type type, std::string tag) + pmd85_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/includes/pocketc.h b/src/mame/includes/pocketc.h index 02d193b4750..5edc361dc70 100644 --- a/src/mame/includes/pocketc.h +++ b/src/mame/includes/pocketc.h @@ -14,7 +14,7 @@ typedef const char *POCKETC_FIGURE[]; class pocketc_state : public driver_device { public: - pocketc_state(const machine_config &mconfig, device_type type, std::string tag) + pocketc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } DECLARE_PALETTE_INIT(pocketc); diff --git a/src/mame/includes/poisk1.h b/src/mame/includes/poisk1.h index aae7313b172..57a24f0c052 100644 --- a/src/mame/includes/poisk1.h +++ b/src/mame/includes/poisk1.h @@ -24,7 +24,7 @@ class p1_state : public driver_device { public: - p1_state(const machine_config &mconfig, device_type type, std::string tag) + p1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pic8259(*this, "pic8259"), diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h index 6650b73209d..a4cf94fd34f 100644 --- a/src/mame/includes/pokechmp.h +++ b/src/mame/includes/pokechmp.h @@ -3,7 +3,7 @@ class pokechmp_state : public driver_device { public: - pokechmp_state(const machine_config &mconfig, device_type type, std::string tag) + pokechmp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index 09fc149b6c9..16f0963c709 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -15,7 +15,7 @@ class polepos_state : public driver_device { public: - polepos_state(const machine_config &mconfig, device_type type, std::string tag) + polepos_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), @@ -114,7 +114,7 @@ class polepos_sound_device : public device_t, public device_sound_interface { public: - polepos_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~polepos_sound_device() { } protected: diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index 8efab248691..9525c9a21a7 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -14,7 +14,7 @@ public: TIMER_IRQ5_GEN }; - policetr_state(const machine_config &mconfig, device_type type, std::string tag) + policetr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_rambase(*this, "rambase"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/poly88.h b/src/mame/includes/poly88.h index a654e77e15f..9a3dc93f135 100644 --- a/src/mame/includes/poly88.h +++ b/src/mame/includes/poly88.h @@ -23,7 +23,7 @@ public: TIMER_CASSETTE }; - poly88_state(const machine_config &mconfig, device_type type, std::string tag) + poly88_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/poly880.h b/src/mame/includes/poly880.h index 6362dd2324a..6245a728a9c 100644 --- a/src/mame/includes/poly880.h +++ b/src/mame/includes/poly880.h @@ -23,7 +23,7 @@ class poly880_state : public driver_device { public: - poly880_state(const machine_config &mconfig, device_type type, std::string tag) + poly880_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_cassette(*this, "cassette"), diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index 02ee1eb13c5..a39b4e05792 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -10,7 +10,7 @@ class polyplay_state : public driver_device { public: - polyplay_state(const machine_config &mconfig, device_type type, std::string tag) + polyplay_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_characterram(*this, "characterram"), diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h index cfd0b910869..c6196e08d55 100644 --- a/src/mame/includes/poolshrk.h +++ b/src/mame/includes/poolshrk.h @@ -13,7 +13,7 @@ class poolshrk_state : public driver_device { public: - poolshrk_state(const machine_config &mconfig, device_type type, std::string tag) + poolshrk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index fc9b87870c1..3eb5fb91808 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -3,7 +3,7 @@ class pooyan_state : public driver_device { public: - pooyan_state(const machine_config &mconfig, device_type type, std::string tag) + pooyan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index 704278c2962..f24304dbe3b 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -4,7 +4,7 @@ class popeye_state : public driver_device { public: - popeye_state(const machine_config &mconfig, device_type type, std::string tag) + popeye_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_background_pos(*this, "background_pos"), m_palettebank(*this, "palettebank"), diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h index 4dd2efc481d..9ef9f287e95 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -9,7 +9,7 @@ class popper_state : public driver_device { public: - popper_state(const machine_config &mconfig, device_type type, std::string tag) + popper_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ol_videoram(*this, "ol_videoram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/portfoli.h b/src/mame/includes/portfoli.h index 00de2679edc..7070f734e42 100644 --- a/src/mame/includes/portfoli.h +++ b/src/mame/includes/portfoli.h @@ -30,7 +30,7 @@ class portfolio_state : public driver_device { public: - portfolio_state(const machine_config &mconfig, device_type type, std::string tag) + portfolio_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M80C88A_TAG), m_lcdc(*this, HD61830_TAG), diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h index e5b789e8a3d..6d978f630fd 100644 --- a/src/mame/includes/portrait.h +++ b/src/mame/includes/portrait.h @@ -5,7 +5,7 @@ class portrait_state : public driver_device { public: - portrait_state(const machine_config &mconfig, device_type type, std::string tag) + portrait_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index fdfcf81201e..1b6e5a65f99 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -5,7 +5,7 @@ class powerins_state : public driver_device { public: - powerins_state(const machine_config &mconfig, device_type type, std::string tag) + powerins_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/pp01.h b/src/mame/includes/pp01.h index 7a0905ba6cb..e8e15fce57e 100644 --- a/src/mame/includes/pp01.h +++ b/src/mame/includes/pp01.h @@ -22,7 +22,7 @@ class pp01_state : public driver_device { public: - pp01_state(const machine_config &mconfig, device_type type, std::string tag) + pp01_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pit(*this, "pit8253"), diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h index c45d25bba48..1b3d1c0a35d 100644 --- a/src/mame/includes/prehisle.h +++ b/src/mame/includes/prehisle.h @@ -5,7 +5,7 @@ class prehisle_state : public driver_device { public: - prehisle_state(const machine_config &mconfig, device_type type, std::string tag) + prehisle_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tx_vram(*this, "tx_vram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/primo.h b/src/mame/includes/primo.h index 34d9c50f34d..ee12938af28 100644 --- a/src/mame/includes/primo.h +++ b/src/mame/includes/primo.h @@ -20,7 +20,7 @@ class primo_state : public driver_device { public: - primo_state(const machine_config &mconfig, device_type type, std::string tag) + primo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_iec(*this, CBM_IEC_TAG), diff --git a/src/mame/includes/prof180x.h b/src/mame/includes/prof180x.h index 0ceb6a09b48..7caadfc1345 100644 --- a/src/mame/includes/prof180x.h +++ b/src/mame/includes/prof180x.h @@ -15,7 +15,7 @@ class prof180x_state : public driver_device { public: - prof180x_state(const machine_config &mconfig, device_type type, std::string tag) + prof180x_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_centronics(*this, CENTRONICS_TAG) { diff --git a/src/mame/includes/prof80.h b/src/mame/includes/prof80.h index efe43d1d1d8..faa9d7be323 100644 --- a/src/mame/includes/prof80.h +++ b/src/mame/includes/prof80.h @@ -33,7 +33,7 @@ class prof80_state : public driver_device { public: - prof80_state(const machine_config &mconfig, device_type type, std::string tag) + prof80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_mmu(*this, MMU_TAG), diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index d87e36ef2a8..9d0f2f6b69e 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -10,7 +10,7 @@ class psikyo_state : public driver_device { public: - psikyo_state(const machine_config &mconfig, device_type type, std::string tag) + psikyo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_vram_0(*this, "vram_0"), diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 20f986aa3a5..6005905e38a 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -16,7 +16,7 @@ class psikyo4_state : public driver_device { public: - psikyo4_state(const machine_config &mconfig, device_type type, std::string tag) + psikyo4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_vidregs(*this, "vidregs"), diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index 47531c5fbf1..4332eb98ab6 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -25,7 +25,7 @@ class psikyosh_state : public driver_device { public: - psikyosh_state(const machine_config &mconfig, device_type type, std::string tag) + psikyosh_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram") , m_bgram(*this, "bgram"), diff --git a/src/mame/includes/psion.h b/src/mame/includes/psion.h index 9371e168326..bf09325add0 100644 --- a/src/mame/includes/psion.h +++ b/src/mame/includes/psion.h @@ -23,7 +23,7 @@ class psion_state : public driver_device { public: - psion_state(const machine_config &mconfig, device_type type, std::string tag) + psion_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_lcdc(*this, "hd44780"), @@ -88,7 +88,7 @@ public: class psion1_state : public psion_state { public: - psion1_state(const machine_config &mconfig, device_type type, std::string tag) + psion1_state(const machine_config &mconfig, device_type type, const char *tag) : psion_state(mconfig, type, tag) { } diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h index b5c173d5092..3430fb2d3aa 100644 --- a/src/mame/includes/psychic5.h +++ b/src/mame/includes/psychic5.h @@ -6,7 +6,7 @@ class psychic5_state : public driver_device { public: - psychic5_state(const machine_config &mconfig, device_type type, std::string tag) + psychic5_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index ca0fad05d3b..b8e3bf4cd43 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -13,7 +13,7 @@ class punchout_state : public driver_device { public: - punchout_state(const machine_config &mconfig, device_type type, std::string tag) + punchout_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/px8.h b/src/mame/includes/px8.h index 3ad1cb54650..8ce81932b28 100644 --- a/src/mame/includes/px8.h +++ b/src/mame/includes/px8.h @@ -31,7 +31,7 @@ class px8_state : public driver_device { public: - px8_state(const machine_config &mconfig, device_type type, std::string tag) + px8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, UPD70008_TAG), m_cassette(*this, "cassette"), diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h index 2a696cb7288..5c8968e12ee 100644 --- a/src/mame/includes/qdrmfgp.h +++ b/src/mame/includes/qdrmfgp.h @@ -9,7 +9,7 @@ class qdrmfgp_state : public driver_device { public: - qdrmfgp_state(const machine_config &mconfig, device_type type, std::string tag) + qdrmfgp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_nvram(*this, "nvram"), diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h index 047015cbdb7..0372610aec1 100644 --- a/src/mame/includes/qix.h +++ b/src/mame/includes/qix.h @@ -23,7 +23,7 @@ class qix_state : public driver_device { public: - qix_state(const machine_config &mconfig, device_type type, std::string tag) + qix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/ql.h b/src/mame/includes/ql.h index c0a7a032350..3e0d2d082ee 100644 --- a/src/mame/includes/ql.h +++ b/src/mame/includes/ql.h @@ -37,7 +37,7 @@ class ql_state : public driver_device { public: - ql_state(const machine_config &mconfig, device_type type, std::string tag) : + ql_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M68008_TAG), m_ipc(*this, I8749_TAG), diff --git a/src/mame/includes/quasar.h b/src/mame/includes/quasar.h index 7a206207cb3..3c8569c4626 100644 --- a/src/mame/includes/quasar.h +++ b/src/mame/includes/quasar.h @@ -11,7 +11,7 @@ class quasar_state : public cvs_state { public: - quasar_state(const machine_config &mconfig, device_type type, std::string tag) + quasar_state(const machine_config &mconfig, device_type type, const char *tag) : cvs_state(mconfig, type, tag) { } std::unique_ptr m_effectram; diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h index ae38db454ea..7d4bf69ac9c 100644 --- a/src/mame/includes/quizdna.h +++ b/src/mame/includes/quizdna.h @@ -3,7 +3,7 @@ class quizdna_state : public driver_device { public: - quizdna_state(const machine_config &mconfig, device_type type, std::string tag) + quizdna_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h index 592851bc921..12ae17965d1 100644 --- a/src/mame/includes/quizpani.h +++ b/src/mame/includes/quizpani.h @@ -5,7 +5,7 @@ class quizpani_state : public driver_device { public: - quizpani_state(const machine_config &mconfig, device_type type, std::string tag) + quizpani_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/radio86.h b/src/mame/includes/radio86.h index 5f57cd339b6..8985e1692f6 100644 --- a/src/mame/includes/radio86.h +++ b/src/mame/includes/radio86.h @@ -25,7 +25,7 @@ public: TIMER_RESET }; - radio86_state(const machine_config &mconfig, device_type type, std::string tag) + radio86_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cassette(*this, "cassette"), diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index 02eed6b9f42..ab809bc8552 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -12,7 +12,7 @@ class raiden_state : public driver_device { public: - raiden_state(const machine_config &mconfig, device_type type, std::string tag) + raiden_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_seibu_sound(*this, "seibu_sound"), diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h index 17f87813ee4..0cedfb94a78 100644 --- a/src/mame/includes/raiden2.h +++ b/src/mame/includes/raiden2.h @@ -7,7 +7,7 @@ class raiden2_state : public driver_device { public: - raiden2_state(const machine_config &mconfig, device_type type, std::string tag) + raiden2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), /* back_data(*this, "back_data"), diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h index e9f6ca68bac..cf56d22ef3a 100644 --- a/src/mame/includes/rallyx.h +++ b/src/mame/includes/rallyx.h @@ -14,7 +14,7 @@ struct jungler_star class rallyx_state : public driver_device { public: - rallyx_state(const machine_config &mconfig, device_type type, std::string tag) + rallyx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_radarattr(*this, "radarattr"), diff --git a/src/mame/includes/rampart.h b/src/mame/includes/rampart.h index b275d145c8f..d7e62bc9b39 100644 --- a/src/mame/includes/rampart.h +++ b/src/mame/includes/rampart.h @@ -13,7 +13,7 @@ class rampart_state : public atarigen_state { public: - rampart_state(const machine_config &mconfig, device_type type, std::string tag) + rampart_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_mob(*this, "mob"), m_oki(*this, "oki"), diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h index b06cd58b0f8..4d4771a407d 100644 --- a/src/mame/includes/rastan.h +++ b/src/mame/includes/rastan.h @@ -12,7 +12,7 @@ class rastan_state : public driver_device { public: - rastan_state(const machine_config &mconfig, device_type type, std::string tag) + rastan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/rbisland.h b/src/mame/includes/rbisland.h index f98ecba0ab7..0fa8a251740 100644 --- a/src/mame/includes/rbisland.h +++ b/src/mame/includes/rbisland.h @@ -12,7 +12,7 @@ class rbisland_state : public driver_device { public: - rbisland_state(const machine_config &mconfig, device_type type, std::string tag) + rbisland_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index eb037452d28..4b3c3d9689a 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -5,7 +5,7 @@ class realbrk_state : public driver_device { public: - realbrk_state(const machine_config &mconfig, device_type type, std::string tag) + realbrk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tmp68301(*this, "tmp68301"), diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h index 908448882e4..c3aeb7be441 100644 --- a/src/mame/includes/redalert.h +++ b/src/mame/includes/redalert.h @@ -14,7 +14,7 @@ class redalert_state : public driver_device { public: - redalert_state(const machine_config &mconfig, device_type type, std::string tag) + redalert_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bitmap_videoram(*this, "bitmap_videoram"), m_charmap_videoram(*this, "charram"), diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h index 7727a3f336a..cae4ad37e3d 100644 --- a/src/mame/includes/relief.h +++ b/src/mame/includes/relief.h @@ -12,7 +12,7 @@ class relief_state : public atarigen_state { public: - relief_state(const machine_config &mconfig, device_type type, std::string tag) + relief_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_vad(*this, "vad"), m_okibank(*this, "okibank") diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h index fd4273a0065..fc619d2c8be 100644 --- a/src/mame/includes/renegade.h +++ b/src/mame/includes/renegade.h @@ -7,7 +7,7 @@ class renegade_state : public driver_device { public: - renegade_state(const machine_config &mconfig, device_type type, std::string tag) + renegade_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h index 52fc230a84c..9e35b0455b0 100644 --- a/src/mame/includes/retofinv.h +++ b/src/mame/includes/retofinv.h @@ -3,7 +3,7 @@ class retofinv_state : public driver_device { public: - retofinv_state(const machine_config &mconfig, device_type type, std::string tag) + retofinv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/rltennis.h b/src/mame/includes/rltennis.h index 2a8fcdf99e0..321a778d689 100644 --- a/src/mame/includes/rltennis.h +++ b/src/mame/includes/rltennis.h @@ -9,7 +9,7 @@ class rltennis_state : public driver_device { public: - rltennis_state(const machine_config &mconfig, device_type type, std::string tag) + rltennis_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac_1(*this, "dac1"), diff --git a/src/mame/includes/rm380z.h b/src/mame/includes/rm380z.h index 3d36c2f0238..616dbb06da9 100644 --- a/src/mame/includes/rm380z.h +++ b/src/mame/includes/rm380z.h @@ -93,7 +93,7 @@ public: required_device m_floppy0; required_device m_floppy1; - rm380z_state(const machine_config &mconfig, device_type type, std::string tag) + rm380z_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, RM380Z_MAINCPU_TAG), m_messram(*this, RAM_TAG), diff --git a/src/mame/includes/rmnimbus.h b/src/mame/includes/rmnimbus.h index 6e1c6dfafd1..692d6eb338a 100644 --- a/src/mame/includes/rmnimbus.h +++ b/src/mame/includes/rmnimbus.h @@ -51,7 +51,7 @@ class rmnimbus_state : public driver_device { public: - rmnimbus_state(const machine_config &mconfig, device_type type, std::string tag) : + rmnimbus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_msm(*this, MSM5205_TAG), diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 71dc4eb69cd..52c34236776 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -13,7 +13,7 @@ class rockrage_state : public driver_device { public: - rockrage_state(const machine_config &mconfig, device_type type, std::string tag) + rockrage_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index 3cc2851abc6..db48d923c8f 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -3,7 +3,7 @@ class rocnrope_state : public driver_device { public: - rocnrope_state(const machine_config &mconfig, device_type type, std::string tag) + rocnrope_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h index ee60bbcaa42..6861c53fff2 100644 --- a/src/mame/includes/rohga.h +++ b/src/mame/includes/rohga.h @@ -17,7 +17,7 @@ class rohga_state : public driver_device { public: - rohga_state(const machine_config &mconfig, device_type type, std::string tag) + rohga_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h index 361d97cc84a..edaba1ab1cc 100644 --- a/src/mame/includes/rollerg.h +++ b/src/mame/includes/rollerg.h @@ -18,7 +18,7 @@ public: TIMER_NMI }; - rollerg_state(const machine_config &mconfig, device_type type, std::string tag) + rollerg_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h index 4d8ab3d588b..a1860032610 100644 --- a/src/mame/includes/rollrace.h +++ b/src/mame/includes/rollrace.h @@ -3,7 +3,7 @@ class rollrace_state : public driver_device { public: - rollrace_state(const machine_config &mconfig, device_type type, std::string tag) + rollrace_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/route16.h b/src/mame/includes/route16.h index ce0ef31f66f..32eb59800b6 100644 --- a/src/mame/includes/route16.h +++ b/src/mame/includes/route16.h @@ -5,7 +5,7 @@ class route16_state : public driver_device { public: - route16_state(const machine_config &mconfig, device_type type, std::string tag) + route16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sn(*this, "snsnd"), m_sharedram(*this, "sharedram"), diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index cd0f47dea38..e71ad1c73b4 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -5,7 +5,7 @@ class rpunch_state : public driver_device { public: - rpunch_state(const machine_config &mconfig, device_type type, std::string tag) + rpunch_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index 397e46257a7..ae07cd6a322 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -3,7 +3,7 @@ class runaway_state : public driver_device { public: - runaway_state(const machine_config &mconfig, device_type type, std::string tag) + runaway_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_sprite_ram(*this, "sprite_ram"), diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index 5de0323bede..2819bbde4a9 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -14,7 +14,7 @@ class rungun_state : public driver_device { public: - rungun_state(const machine_config &mconfig, device_type type, std::string tag) + rungun_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/s11.h b/src/mame/includes/s11.h index cba85ff87ec..1d8f355ec0a 100644 --- a/src/mame/includes/s11.h +++ b/src/mame/includes/s11.h @@ -22,7 +22,7 @@ class s11_state : public genpin_class { public: - s11_state(const machine_config &mconfig, device_type type, std::string tag) + s11_state(const machine_config &mconfig, device_type type, const char *tag) : genpin_class(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), @@ -123,7 +123,7 @@ private: class s11a_state : public s11_state { public: - s11a_state(const machine_config &mconfig, device_type type, std::string tag) + s11a_state(const machine_config &mconfig, device_type type, const char *tag) : s11_state(mconfig, type, tag) { } @@ -141,7 +141,7 @@ private: class s11b_state : public s11a_state { public: - s11b_state(const machine_config &mconfig, device_type type, std::string tag) + s11b_state(const machine_config &mconfig, device_type type, const char *tag) : s11a_state(mconfig, type, tag), m_bg_hc55516(*this, "hc55516_bg") @@ -174,7 +174,7 @@ private: class s11c_state : public s11b_state { public: - s11c_state(const machine_config &mconfig, device_type type, std::string tag) + s11c_state(const machine_config &mconfig, device_type type, const char *tag) : s11b_state(mconfig, type, tag) { } diff --git a/src/mame/includes/sage2.h b/src/mame/includes/sage2.h index 713603c8371..2a80606aa20 100644 --- a/src/mame/includes/sage2.h +++ b/src/mame/includes/sage2.h @@ -29,7 +29,7 @@ class sage2_state : public driver_device { public: - sage2_state(const machine_config &mconfig, device_type type, std::string tag) + sage2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M68000_TAG), m_pic(*this, I8259_TAG), diff --git a/src/mame/includes/samcoupe.h b/src/mame/includes/samcoupe.h index 8e1d96be416..201754c993d 100644 --- a/src/mame/includes/samcoupe.h +++ b/src/mame/includes/samcoupe.h @@ -50,7 +50,7 @@ public: TIMER_VIDEO_UPDATE }; - samcoupe_state(const machine_config &mconfig, device_type type, std::string tag) + samcoupe_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index 7e2e87eda1c..dfa69ed44f2 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -7,7 +7,7 @@ class sauro_state : public driver_device { public: - sauro_state(const machine_config &mconfig, device_type type, std::string tag) + sauro_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index 05463cefd68..f1a7db9b7b0 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -7,7 +7,7 @@ class sbasketb_state : public driver_device { public: - sbasketb_state(const machine_config &mconfig, device_type type, std::string tag) + sbasketb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index 2767c1772dd..9df4807e9be 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -3,7 +3,7 @@ class sbugger_state : public driver_device { public: - sbugger_state(const machine_config &mconfig, device_type type, std::string tag) + sbugger_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index 43a44704753..288d67822ac 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -3,7 +3,7 @@ class scotrsht_state : public driver_device { public: - scotrsht_state(const machine_config &mconfig, device_type type, std::string tag) + scotrsht_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h index 23964fb491f..2648ce25237 100644 --- a/src/mame/includes/scramble.h +++ b/src/mame/includes/scramble.h @@ -8,7 +8,7 @@ class scramble_state : public galaxold_state { public: - scramble_state(const machine_config &mconfig, device_type type, std::string tag) + scramble_state(const machine_config &mconfig, device_type type, const char *tag) : galaxold_state(mconfig, type, tag), m_konami_7474(*this, "konami_7474"), m_ppi8255_0(*this, "ppi8255_0"), diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index c490d72a175..0261ea14a7a 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -3,7 +3,7 @@ class sderby_state : public driver_device { public: - sderby_state(const machine_config &mconfig, device_type type, std::string tag) + sderby_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_md_videoram(*this, "md_videoram"), diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index a1c3300d691..77e690fc86e 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -21,7 +21,7 @@ public: TIMER_VBLANK_LATCH_CLEAR }; - segag80r_state(const machine_config &mconfig, device_type type, std::string tag) + segag80r_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mainram(*this, "mainram"), m_videoram(*this, "videoram"), @@ -164,7 +164,7 @@ class sega005_sound_device : public device_t, public device_sound_interface { public: - sega005_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega005_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); emu_timer *m_sega005_sound_timer; sound_stream *m_sega005_stream; diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h index e1d0f1f2864..b9c74242fbd 100644 --- a/src/mame/includes/segag80v.h +++ b/src/mame/includes/segag80v.h @@ -13,7 +13,7 @@ class segag80v_state : public driver_device { public: - segag80v_state(const machine_config &mconfig, device_type type, std::string tag) + segag80v_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mainram(*this, "mainram"), m_vectorram(*this, "vectorram"), diff --git a/src/mame/includes/segahang.h b/src/mame/includes/segahang.h index f490ca3a0b5..6de20b3b774 100644 --- a/src/mame/includes/segahang.h +++ b/src/mame/includes/segahang.h @@ -22,7 +22,7 @@ class segahang_state : public sega_16bit_common_base { public: // construction/destruction - segahang_state(const machine_config &mconfig, device_type type, std::string tag) + segahang_state(const machine_config &mconfig, device_type type, const char *tag) : sega_16bit_common_base(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), diff --git a/src/mame/includes/segaorun.h b/src/mame/includes/segaorun.h index ef1c7b6d075..6343dd07835 100644 --- a/src/mame/includes/segaorun.h +++ b/src/mame/includes/segaorun.h @@ -22,7 +22,7 @@ class segaorun_state : public sega_16bit_common_base { public: // construction/destruction - segaorun_state(const machine_config &mconfig, device_type type, std::string tag) + segaorun_state(const machine_config &mconfig, device_type type, const char *tag) : sega_16bit_common_base(mconfig, type, tag), m_mapper(*this, "mapper"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/segas16a.h b/src/mame/includes/segas16a.h index 37075bd0384..f34c9ae1b8b 100644 --- a/src/mame/includes/segas16a.h +++ b/src/mame/includes/segas16a.h @@ -25,7 +25,7 @@ class segas16a_state : public sega_16bit_common_base { public: // construction/destruction - segas16a_state(const machine_config &mconfig, device_type type, std::string tag) + segas16a_state(const machine_config &mconfig, device_type type, const char *tag) : sega_16bit_common_base(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/segas16b.h b/src/mame/includes/segas16b.h index 11b98ec203d..28f783dbd15 100644 --- a/src/mame/includes/segas16b.h +++ b/src/mame/includes/segas16b.h @@ -24,7 +24,7 @@ class segas16b_state : public sega_16bit_common_base { public: // construction/destruction - segas16b_state(const machine_config &mconfig, device_type type, std::string tag) + segas16b_state(const machine_config &mconfig, device_type type, const char *tag) : sega_16bit_common_base(mconfig, type, tag), m_mapper(*this, "mapper"), m_maincpu(*this, "maincpu"), @@ -221,7 +221,7 @@ class isgsm_state : public segas16b_state { public: // construction/destruction - isgsm_state(const machine_config &mconfig, device_type type, std::string tag) + isgsm_state(const machine_config &mconfig, device_type type, const char *tag) : segas16b_state(mconfig, type, tag), m_read_xor(0), m_cart_addrlatch(0), diff --git a/src/mame/includes/segas18.h b/src/mame/includes/segas18.h index cf6043576fb..44e66be4fb4 100644 --- a/src/mame/includes/segas18.h +++ b/src/mame/includes/segas18.h @@ -23,7 +23,7 @@ class segas18_state : public sega_16bit_common_base { public: // construction/destruction - segas18_state(const machine_config &mconfig, device_type type, std::string tag) + segas18_state(const machine_config &mconfig, device_type type, const char *tag) : sega_16bit_common_base(mconfig, type, tag), m_mapper(*this, "mapper"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h index f5e3f473939..f2633b12632 100644 --- a/src/mame/includes/segas24.h +++ b/src/mame/includes/segas24.h @@ -11,7 +11,7 @@ class segas24_state : public driver_device { public: - segas24_state(const machine_config &mconfig, device_type type, std::string tag) + segas24_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index 422b54a5c83..32392914aad 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -16,7 +16,7 @@ class segas32_state : public device_t { public: - segas32_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segas32_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_shared_ptr m_z80_shared_ram; optional_shared_ptr m_ga2_dpram; @@ -266,7 +266,7 @@ protected: class segas32_regular_state : public segas32_state { public: - segas32_regular_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segas32_regular_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -277,7 +277,7 @@ protected: class segas32_v25_state : public segas32_state { public: - segas32_v25_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segas32_v25_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -288,7 +288,7 @@ protected: class sega_multi32_state : public segas32_state { public: - sega_multi32_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_multi32_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/includes/segasp.h b/src/mame/includes/segasp.h index 3896e4ce040..ee952a7dcd9 100644 --- a/src/mame/includes/segasp.h +++ b/src/mame/includes/segasp.h @@ -11,7 +11,7 @@ class segasp_state : public naomi_state { public: - segasp_state(const machine_config &mconfig, device_type type, std::string tag) + segasp_state(const machine_config &mconfig, device_type type, const char *tag) : naomi_state(mconfig, type, tag), m_sp_eeprom(*this, "sp_eeprom") { } diff --git a/src/mame/includes/segaxbd.h b/src/mame/includes/segaxbd.h index b2391c14ed9..0625ceb619b 100644 --- a/src/mame/includes/segaxbd.h +++ b/src/mame/includes/segaxbd.h @@ -22,7 +22,7 @@ class segaxbd_state : public device_t { public: // construction/destruction - segaxbd_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segaxbd_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // compare/timer chip callbacks void timer_ack_callback(); @@ -158,7 +158,7 @@ protected: class segaxbd_regular_state : public segaxbd_state { public: - segaxbd_regular_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segaxbd_regular_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -171,7 +171,7 @@ protected: class segaxbd_fd1094_state : public segaxbd_state { public: - segaxbd_fd1094_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segaxbd_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -182,7 +182,7 @@ protected: class segaxbd_lastsurv_fd1094_state : public segaxbd_state { public: - segaxbd_lastsurv_fd1094_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segaxbd_lastsurv_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -193,7 +193,7 @@ protected: class segaxbd_lastsurv_state : public segaxbd_state { public: - segaxbd_lastsurv_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segaxbd_lastsurv_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -205,7 +205,7 @@ protected: class segaxbd_smgp_fd1094_state : public segaxbd_state { public: - segaxbd_smgp_fd1094_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segaxbd_smgp_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -217,7 +217,7 @@ protected: class segaxbd_smgp_state : public segaxbd_state { public: - segaxbd_smgp_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segaxbd_smgp_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -229,7 +229,7 @@ protected: class segaxbd_rascot_state : public segaxbd_state { public: - segaxbd_rascot_state(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segaxbd_rascot_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/includes/segaybd.h b/src/mame/includes/segaybd.h index d8d2062e8e7..baf0b1d7c37 100644 --- a/src/mame/includes/segaybd.h +++ b/src/mame/includes/segaybd.h @@ -19,7 +19,7 @@ class segaybd_state : public sega_16bit_common_base { public: // construction/destruction - segaybd_state(const machine_config &mconfig, device_type type, std::string tag) + segaybd_state(const machine_config &mconfig, device_type type, const char *tag) : sega_16bit_common_base(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subx(*this, "subx"), diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index e6aa8f43b46..e3cd7d82f67 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -14,7 +14,7 @@ class seibuspi_state : public driver_device { public: - seibuspi_state(const machine_config &mconfig, device_type type, std::string tag) + seibuspi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index df64c838d5b..77b8e5a6708 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -5,7 +5,7 @@ class seicross_state : public driver_device { public: - seicross_state(const machine_config &mconfig, device_type type, std::string tag) + seicross_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index f54536d12d4..39d42ea5b01 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -8,7 +8,7 @@ class senjyo_state : public driver_device { public: - senjyo_state(const machine_config &mconfig, device_type type, std::string tag) + senjyo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pio(*this, "z80pio"), diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index ebb83ab522d..1f1c5d0a920 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -30,7 +30,7 @@ struct game_offset class seta_state : public driver_device { public: - seta_state(const machine_config &mconfig, device_type type, std::string tag) + seta_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index 7cc4aef598d..1c48610d9e9 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -8,7 +8,7 @@ class seta2_state : public driver_device { public: - seta2_state(const machine_config &mconfig, device_type type, std::string tag) + seta2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_tmp68301(*this, "tmp68301"), diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index 1e42b1f3ce8..b6964d9cf8f 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -11,7 +11,7 @@ class sf_state : public driver_device { public: - sf_state(const machine_config &mconfig, device_type type, std::string tag) + sf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/sg1000.h b/src/mame/includes/sg1000.h index 27f6104772f..6cfd014433f 100644 --- a/src/mame/includes/sg1000.h +++ b/src/mame/includes/sg1000.h @@ -43,7 +43,7 @@ public: TIMER_LIGHTGUN_TICK }; - sg1000_state(const machine_config &mconfig, device_type type, std::string tag) + sg1000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_ram(*this, RAM_TAG), @@ -73,7 +73,7 @@ public: class sc3000_state : public sg1000_state { public: - sc3000_state(const machine_config &mconfig, device_type type, std::string tag) + sc3000_state(const machine_config &mconfig, device_type type, const char *tag) : sg1000_state(mconfig, type, tag), m_cassette(*this, "cassette"), m_pa0(*this, "PA0"), @@ -124,7 +124,7 @@ public: class sf7000_state : public sc3000_state { public: - sf7000_state(const machine_config &mconfig, device_type type, std::string tag) + sf7000_state(const machine_config &mconfig, device_type type, const char *tag) : sc3000_state(mconfig, type, tag), m_fdc(*this, UPD765_TAG), m_centronics(*this, CENTRONICS_TAG), diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index 1c49ac5171b..82ce0cba31b 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -5,7 +5,7 @@ class shadfrce_state : public driver_device { public: - shadfrce_state(const machine_config &mconfig, device_type type, std::string tag) + shadfrce_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index 32ba9f72ee2..1a75aaa8cfb 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -5,7 +5,7 @@ class shangha3_state : public driver_device { public: - shangha3_state(const machine_config &mconfig, device_type type, std::string tag) + shangha3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index 2224e8a67cf..6680c6c1748 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -3,7 +3,7 @@ class shangkid_state : public driver_device { public: - shangkid_state(const machine_config &mconfig, device_type type, std::string tag) + shangkid_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h index 57b077cafa5..06c7a60df76 100644 --- a/src/mame/includes/shaolins.h +++ b/src/mame/includes/shaolins.h @@ -3,7 +3,7 @@ class shaolins_state : public driver_device { public: - shaolins_state(const machine_config &mconfig, device_type type, std::string tag) + shaolins_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h index 4c76c00af48..a77429e2798 100644 --- a/src/mame/includes/shisen.h +++ b/src/mame/includes/shisen.h @@ -5,7 +5,7 @@ class shisen_state : public driver_device { public: - shisen_state(const machine_config &mconfig, device_type type, std::string tag) + shisen_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audio (*this, "m72"), diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index 511a8745f35..8615df3be8b 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -3,7 +3,7 @@ class shootout_state : public driver_device { public: - shootout_state(const machine_config &mconfig, device_type type, std::string tag) + shootout_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h index 79b580c1aca..8f0e20ac876 100644 --- a/src/mame/includes/shuuz.h +++ b/src/mame/includes/shuuz.h @@ -12,7 +12,7 @@ class shuuz_state : public atarigen_state { public: - shuuz_state(const machine_config &mconfig, device_type type, std::string tag) + shuuz_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_vad(*this, "vad") { } diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index 4c2cb3f24bf..bd82050f486 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -5,7 +5,7 @@ class sidearms_state : public driver_device { public: - sidearms_state(const machine_config &mconfig, device_type type, std::string tag) + sidearms_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index d4237509d34..214521b87cc 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -9,7 +9,7 @@ class sidepckt_state : public driver_device { public: - sidepckt_state(const machine_config &mconfig, device_type type, std::string tag) + sidepckt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index f03450cea4f..12fee36f2e0 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -5,7 +5,7 @@ class silkroad_state : public driver_device { public: - silkroad_state(const machine_config &mconfig, device_type type, std::string tag) + silkroad_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki1(*this, "oki1"), diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h index 6de98cdff21..7fc91654160 100644 --- a/src/mame/includes/simpl156.h +++ b/src/mame/includes/simpl156.h @@ -14,7 +14,7 @@ class simpl156_state : public driver_device { public: - simpl156_state(const machine_config &mconfig, device_type type, std::string tag) + simpl156_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_deco_tilegen1(*this, "tilegen1"), diff --git a/src/mame/includes/simple_st0016.h b/src/mame/includes/simple_st0016.h index 3609d948b27..21c30ac560d 100644 --- a/src/mame/includes/simple_st0016.h +++ b/src/mame/includes/simple_st0016.h @@ -6,7 +6,7 @@ class st0016_state : public driver_device { public: - st0016_state(const machine_config &mconfig, device_type type, std::string tag) + st0016_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index b24edca6f4b..2762f4da138 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -15,7 +15,7 @@ public: TIMER_DMAEND }; - simpsons_state(const machine_config &mconfig, device_type type, std::string tag) + simpsons_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h index 72dba56a9bd..4cabfa061aa 100644 --- a/src/mame/includes/skullxbo.h +++ b/src/mame/includes/skullxbo.h @@ -13,7 +13,7 @@ class skullxbo_state : public atarigen_state { public: - skullxbo_state(const machine_config &mconfig, device_type type, std::string tag) + skullxbo_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_jsa(*this, "jsa"), m_scanline_timer(*this, "scan_timer"), diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h index b7163b8c35d..8e287c5b04f 100644 --- a/src/mame/includes/skydiver.h +++ b/src/mame/includes/skydiver.h @@ -24,7 +24,7 @@ class skydiver_state : public driver_device { public: - skydiver_state(const machine_config &mconfig, device_type type, std::string tag) + skydiver_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index a221001bb29..c45be86567e 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -9,7 +9,7 @@ class skyfox_state : public driver_device { public: - skyfox_state(const machine_config &mconfig, device_type type, std::string tag) + skyfox_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index f595370e3e6..929298e2ea6 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -5,7 +5,7 @@ class skykid_state : public driver_device { public: - skykid_state(const machine_config &mconfig, device_type type, std::string tag) + skykid_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_textram(*this, "textram"), diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h index e117a127e35..b4258ad37ef 100644 --- a/src/mame/includes/skyraid.h +++ b/src/mame/includes/skyraid.h @@ -5,7 +5,7 @@ class skyraid_state : public driver_device { public: - skyraid_state(const machine_config &mconfig, device_type type, std::string tag) + skyraid_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_pos_ram(*this, "pos_ram"), m_alpha_num_ram(*this, "alpha_num_ram"), diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index cda95c57914..32f14f281df 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -13,7 +13,7 @@ class slapfght_state : public driver_device { public: - slapfght_state(const machine_config &mconfig, device_type type, std::string tag) + slapfght_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h index 4aad8cc35e8..6a200b524ab 100644 --- a/src/mame/includes/slapshot.h +++ b/src/mame/includes/slapshot.h @@ -29,7 +29,7 @@ public: TIMER_SLAPSHOT_INTERRUPT6 }; - slapshot_state(const machine_config &mconfig, device_type type, std::string tag) + slapshot_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tc0140syt(*this, "tc0140syt"), diff --git a/src/mame/includes/slapstic.h b/src/mame/includes/slapstic.h index 0d3283fec7e..cfcfcce890e 100644 --- a/src/mame/includes/slapstic.h +++ b/src/mame/includes/slapstic.h @@ -132,7 +132,7 @@ class atari_slapstic_device : public device_t { public: // construction/destruction - atari_slapstic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_slapstic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void slapstic_init(running_machine &machine, int chip); void slapstic_reset(void); diff --git a/src/mame/includes/sms.h b/src/mame/includes/sms.h index e25e243515b..ec9ae688698 100644 --- a/src/mame/includes/sms.h +++ b/src/mame/includes/sms.h @@ -30,7 +30,7 @@ class sms_state : public driver_device { public: - sms_state(const machine_config &mconfig, device_type type, std::string tag) + sms_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_vdp(*this, "sms_vdp"), @@ -220,7 +220,7 @@ protected: class smssdisp_state : public sms_state { public: - smssdisp_state(const machine_config &mconfig, device_type type, std::string tag) + smssdisp_state(const machine_config &mconfig, device_type type, const char *tag) : sms_state(mconfig, type, tag), m_control_cpu(*this, "control") { } diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h index 76a58b73081..238ad7efcc9 100644 --- a/src/mame/includes/snes.h +++ b/src/mame/includes/snes.h @@ -309,7 +309,7 @@ public: TIMER_SNES_LAST }; - snes_state(const machine_config &mconfig, device_type type, std::string tag) + snes_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index d6fcc6a7939..7e6469d6f3b 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -10,7 +10,7 @@ class snk_state : public driver_device { public: - snk_state(const machine_config &mconfig, device_type type, std::string tag) + snk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index b01a5c400e3..2c66853510d 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -15,7 +15,7 @@ class snk6502_sound_device; class snk6502_state : public driver_device { public: - snk6502_state(const machine_config &mconfig, device_type type, std::string tag) + snk6502_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_sound(*this, "snk6502"), @@ -107,7 +107,7 @@ class snk6502_sound_device : public device_t, public device_sound_interface { public: - snk6502_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + snk6502_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~snk6502_sound_device() {} DECLARE_WRITE8_MEMBER( sasuke_sound_w ); diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index 7021488b02a..f9c8d59e71f 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -5,7 +5,7 @@ class snk68_state : public driver_device { public: - snk68_state(const machine_config &mconfig, device_type type, std::string tag) + snk68_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index 7441c7e2a2c..b15623e61d0 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -3,7 +3,7 @@ class snookr10_state : public driver_device { public: - snookr10_state(const machine_config &mconfig, device_type type, std::string tag) + snookr10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h index 135b413c37e..a1102dbd7a8 100644 --- a/src/mame/includes/snowbros.h +++ b/src/mame/includes/snowbros.h @@ -7,7 +7,7 @@ class snowbros_state : public driver_device { public: - snowbros_state(const machine_config &mconfig, device_type type, std::string tag) + snowbros_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/softbox.h b/src/mame/includes/softbox.h index 0f3df723cc8..1ebd857424c 100644 --- a/src/mame/includes/softbox.h +++ b/src/mame/includes/softbox.h @@ -26,7 +26,7 @@ class softbox_state : public driver_device { public: - softbox_state(const machine_config &mconfig, device_type type, std::string tag) + softbox_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_dbrg(*this, COM8116_TAG), diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h index 881d8b579ac..0d8ab74ce02 100644 --- a/src/mame/includes/solomon.h +++ b/src/mame/includes/solomon.h @@ -3,7 +3,7 @@ class solomon_state : public driver_device { public: - solomon_state(const machine_config &mconfig, device_type type, std::string tag) + solomon_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index bc81bb1a5f3..343ae432944 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -9,7 +9,7 @@ class sonson_state : public driver_device { public: - sonson_state(const machine_config &mconfig, device_type type, std::string tag) + sonson_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/sorcerer.h b/src/mame/includes/sorcerer.h index fde3950b749..9e49370b514 100644 --- a/src/mame/includes/sorcerer.h +++ b/src/mame/includes/sorcerer.h @@ -51,7 +51,7 @@ public: TIMER_RESET }; - sorcerer_state(const machine_config &mconfig, device_type type, std::string tag) + sorcerer_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_cassette1(*this, "cassette") diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index c43b55ab2e5..4bd39f33338 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -29,7 +29,7 @@ class spacefb_state : public driver_device { public: - spacefb_state(const machine_config &mconfig, device_type type, std::string tag) + spacefb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index 1dbaa6748c3..9924a0e46fe 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -7,7 +7,7 @@ class spbactn_state : public driver_device { public: - spbactn_state(const machine_config &mconfig, device_type type, std::string tag) + spbactn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h index b230fdfdc86..fc572a6dbfa 100644 --- a/src/mame/includes/spcforce.h +++ b/src/mame/includes/spcforce.h @@ -5,7 +5,7 @@ class spcforce_state : public driver_device { public: - spcforce_state(const machine_config &mconfig, device_type type, std::string tag) + spcforce_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index b2060ee4afd..04b6362c12a 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -11,7 +11,7 @@ class spdodgeb_state : public driver_device { public: - spdodgeb_state(const machine_config &mconfig, device_type type, std::string tag) + spdodgeb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/special.h b/src/mame/includes/special.h index ab1e671e184..6c9a369b922 100644 --- a/src/mame/includes/special.h +++ b/src/mame/includes/special.h @@ -33,7 +33,7 @@ public: TIMER_PIT8253_GATES }; - special_state(const machine_config &mconfig, device_type type, std::string tag) + special_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppi(*this, "ppi8255"), diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h index 41208d99e06..bd4d0511cab 100644 --- a/src/mame/includes/spectrum.h +++ b/src/mame/includes/spectrum.h @@ -84,7 +84,7 @@ enum class spectrum_state : public driver_device { public: - spectrum_state(const machine_config &mconfig, device_type type, std::string tag) + spectrum_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h index 6cf70ced45b..d0ed37db6da 100644 --- a/src/mame/includes/speedatk.h +++ b/src/mame/includes/speedatk.h @@ -5,7 +5,7 @@ class speedatk_state : public driver_device { public: - speedatk_state(const machine_config &mconfig, device_type type, std::string tag) + speedatk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_crtc(*this, "crtc"), diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h index 75d1ffadad5..c6cc7e5e4f9 100644 --- a/src/mame/includes/speedbal.h +++ b/src/mame/includes/speedbal.h @@ -3,7 +3,7 @@ class speedbal_state : public driver_device { public: - speedbal_state(const machine_config &mconfig, device_type type, std::string tag) + speedbal_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h index 4c7bfbfc5c2..9167d0192d4 100644 --- a/src/mame/includes/speedspn.h +++ b/src/mame/includes/speedspn.h @@ -5,7 +5,7 @@ class speedspn_state : public driver_device { public: - speedspn_state(const machine_config &mconfig, device_type type, std::string tag) + speedspn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/spiders.h b/src/mame/includes/spiders.h index 11e99d044c5..ba29815a7de 100644 --- a/src/mame/includes/spiders.h +++ b/src/mame/includes/spiders.h @@ -11,7 +11,7 @@ class spiders_state : public driver_device { public: - spiders_state(const machine_config &mconfig, device_type type, std::string tag) + spiders_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this, "ram"), m_discrete(*this, "discrete"), diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index a4201619f9e..872d52643a6 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -5,7 +5,7 @@ class splash_state : public driver_device { public: - splash_state(const machine_config &mconfig, device_type type, std::string tag) + splash_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h index e7c1149ea2e..bc3a468306c 100644 --- a/src/mame/includes/sprcros2.h +++ b/src/mame/includes/sprcros2.h @@ -3,7 +3,7 @@ class sprcros2_state : public driver_device { public: - sprcros2_state(const machine_config &mconfig, device_type type, std::string tag) + sprcros2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_master(*this,"master"), m_slave(*this,"slave"), diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index 47f0300429f..991ad99025c 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -26,7 +26,7 @@ class sprint2_state : public driver_device { public: - sprint2_state(const machine_config &mconfig, device_type type, std::string tag) + sprint2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index dccbb817743..79def94ada0 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -8,7 +8,7 @@ public: TIMER_NMI }; - sprint4_state(const machine_config &mconfig, device_type type, std::string tag) + sprint4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index 9228fcbb385..4db1fca0fa2 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -5,7 +5,7 @@ class sprint8_state : public driver_device { public: - sprint8_state(const machine_config &mconfig, device_type type, std::string tag) + sprint8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_pos_h_ram(*this, "pos_h_ram"), diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index 6f7f414025e..a77b8669af6 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -13,7 +13,7 @@ class spy_state : public driver_device { public: - spy_state(const machine_config &mconfig, device_type type, std::string tag) + spy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this, "ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h index 2447f113a20..d0cab87ce67 100644 --- a/src/mame/includes/srmp2.h +++ b/src/mame/includes/srmp2.h @@ -14,7 +14,7 @@ struct iox_t class srmp2_state : public driver_device { public: - srmp2_state(const machine_config &mconfig, device_type type, std::string tag) + srmp2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_seta001(*this, "spritegen"), diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h index 4fd7a43eaa5..0e6b320fcfc 100644 --- a/src/mame/includes/srumbler.h +++ b/src/mame/includes/srumbler.h @@ -5,7 +5,7 @@ class srumbler_state : public driver_device { public: - srumbler_state(const machine_config &mconfig, device_type type, std::string tag) + srumbler_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_spriteram(*this,"spriteram"), diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h index ed882bc2361..056dd91bf3a 100644 --- a/src/mame/includes/sshangha.h +++ b/src/mame/includes/sshangha.h @@ -7,7 +7,7 @@ class sshangha_state : public driver_device { public: - sshangha_state(const machine_config &mconfig, device_type type, std::string tag) + sshangha_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_deco146(*this, "ioprot"), m_deco_tilegen1(*this, "tilegen1"), diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index a86e9d1bdb8..c52ee6f3672 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -5,7 +5,7 @@ class sslam_state : public driver_device { public: - sslam_state(const machine_config &mconfig, device_type type, std::string tag) + sslam_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h index 7257a2b532a..eee0334c406 100644 --- a/src/mame/includes/ssozumo.h +++ b/src/mame/includes/ssozumo.h @@ -3,7 +3,7 @@ class ssozumo_state : public driver_device { public: - ssozumo_state(const machine_config &mconfig, device_type type, std::string tag) + ssozumo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h index a2d91c77fb5..54978416da1 100644 --- a/src/mame/includes/sspeedr.h +++ b/src/mame/includes/sspeedr.h @@ -3,7 +3,7 @@ class sspeedr_state : public driver_device { public: - sspeedr_state(const machine_config &mconfig, device_type type, std::string tag) + sspeedr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h index bc256b0c69a..f17223aca95 100644 --- a/src/mame/includes/ssrj.h +++ b/src/mame/includes/ssrj.h @@ -3,7 +3,7 @@ class ssrj_state : public driver_device { public: - ssrj_state(const machine_config &mconfig, device_type type, std::string tag) + ssrj_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index d0aa3ff0c64..611ff3b66ee 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -8,7 +8,7 @@ class ssv_state : public driver_device { public: - ssv_state(const machine_config &mconfig, device_type type, std::string tag) + ssv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ensoniq(*this, "ensoniq"), diff --git a/src/mame/includes/ssystem3.h b/src/mame/includes/ssystem3.h index ff8da0c6a60..79a5e7d4591 100644 --- a/src/mame/includes/ssystem3.h +++ b/src/mame/includes/ssystem3.h @@ -41,7 +41,7 @@ struct lcd_t class ssystem3_state : public driver_device { public: - ssystem3_state(const machine_config &mconfig, device_type type, std::string tag) + ssystem3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_palette(*this, "palette") diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h index 44ef3ee78ef..989f7f262fc 100644 --- a/src/mame/includes/stactics.h +++ b/src/mame/includes/stactics.h @@ -12,7 +12,7 @@ class stactics_state : public driver_device { public: - stactics_state(const machine_config &mconfig, device_type type, std::string tag) + stactics_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_palette_val(*this, "paletteram"), diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h index 0eba88cfb97..d9aa358e551 100644 --- a/src/mame/includes/stadhero.h +++ b/src/mame/includes/stadhero.h @@ -6,7 +6,7 @@ class stadhero_state : public driver_device { public: - stadhero_state(const machine_config &mconfig, device_type type, std::string tag) + stadhero_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h index e045d8234cf..3de1b75301f 100644 --- a/src/mame/includes/starcrus.h +++ b/src/mame/includes/starcrus.h @@ -4,7 +4,7 @@ class starcrus_state : public driver_device { public: - starcrus_state(const machine_config &mconfig, device_type type, std::string tag) + starcrus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index f7f2aeb10ff..66ed55ce031 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -24,7 +24,7 @@ class starfire_state : public driver_device { public: - starfire_state(const machine_config &mconfig, device_type type, std::string tag) + starfire_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_starfire_colorram(*this, "colorram"), m_starfire_videoram(*this, "videoram"), diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index d1c86b7172b..b4fa955bc80 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -35,7 +35,7 @@ class starshp1_state : public driver_device { public: - starshp1_state(const machine_config &mconfig, device_type type, std::string tag) + starshp1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_playfield_ram(*this, "playfield_ram"), m_hpos_ram(*this, "hpos_ram"), diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h index 08748127f9b..6baec75153a 100644 --- a/src/mame/includes/starwars.h +++ b/src/mame/includes/starwars.h @@ -13,7 +13,7 @@ class starwars_state : public driver_device { public: - starwars_state(const machine_config &mconfig, device_type type, std::string tag) + starwars_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_riot(*this, "riot"), m_mathram(*this, "mathram"), diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index 1ac79eb205f..31af9a7ac2e 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -10,7 +10,7 @@ public: TIMER_STFIGHT_INTERRUPT_1 }; - stfight_state(const machine_config &mconfig, device_type type, std::string tag) + stfight_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index 5ac160ffd1c..7c43ad56e93 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -6,7 +6,7 @@ class stlforce_state : public driver_device { public: - stlforce_state(const machine_config &mconfig, device_type type, std::string tag) + stlforce_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h index c2201809d0d..7f0e4699cad 100644 --- a/src/mame/includes/strnskil.h +++ b/src/mame/includes/strnskil.h @@ -3,7 +3,7 @@ class strnskil_state : public driver_device { public: - strnskil_state(const machine_config &mconfig, device_type type, std::string tag) + strnskil_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_subcpu(*this,"sub"), diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index 4457aae3b93..db8329f9ecc 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -21,7 +21,7 @@ class saturn_state : public driver_device { public: - saturn_state(const machine_config &mconfig, device_type type, std::string tag) + saturn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_rom(*this, "share6"), m_workram_l(*this, "workram_l"), @@ -699,7 +699,7 @@ public: class stv_state : public saturn_state { public: - stv_state(const machine_config &mconfig, device_type type, std::string tag) + stv_state(const machine_config &mconfig, device_type type, const char *tag) : saturn_state(mconfig, type, tag), m_adsp(*this, "adsp"), m_adsp_pram(*this, "adsp_pram"), diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h index 799992c42ef..853cb24d1e8 100644 --- a/src/mame/includes/subs.h +++ b/src/mame/includes/subs.h @@ -21,7 +21,7 @@ class subs_state : public driver_device { public: - subs_state(const machine_config &mconfig, device_type type, std::string tag) + subs_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index 5a0ab3dd0f8..d7f7ed7d029 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -5,7 +5,7 @@ class suna16_state : public driver_device { public: - suna16_state(const machine_config &mconfig, device_type type, std::string tag) + suna16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_dac1(*this, "dac1"), diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index 185892358ef..1ee773edb15 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -7,7 +7,7 @@ class suna8_state : public driver_device { public: - suna8_state(const machine_config &mconfig, device_type type, std::string tag) + suna8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_hardhead_ip(*this, "hardhead_ip"), diff --git a/src/mame/includes/supbtime.h b/src/mame/includes/supbtime.h index 8dfd7666bbb..2f067a11765 100644 --- a/src/mame/includes/supbtime.h +++ b/src/mame/includes/supbtime.h @@ -12,7 +12,7 @@ class supbtime_state : public driver_device { public: - supbtime_state(const machine_config &mconfig, device_type type, std::string tag) + supbtime_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_pf1_rowscroll(*this, "pf1_rowscroll"), diff --git a/src/mame/includes/super6.h b/src/mame/includes/super6.h index dae98735656..6edce116cb4 100644 --- a/src/mame/includes/super6.h +++ b/src/mame/includes/super6.h @@ -30,7 +30,7 @@ class super6_state : public driver_device { public: - super6_state(const machine_config &mconfig, device_type type, std::string tag) + super6_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_ctc(*this, Z80CTC_TAG), diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h index 4063aafc6f2..34b6a2c94eb 100644 --- a/src/mame/includes/super80.h +++ b/src/mame/includes/super80.h @@ -24,7 +24,7 @@ class super80_state : public driver_device { public: - super80_state(const machine_config &mconfig, device_type type, std::string tag) + super80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_palette(*this, "palette") , m_maincpu(*this, "maincpu") diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index 7fd559010be..a3d45791548 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -17,7 +17,7 @@ struct schs_tempsprite class superchs_state : public driver_device { public: - superchs_state(const machine_config &mconfig, device_type type, std::string tag) + superchs_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this,"ram"), m_spriteram(*this,"spriteram"), diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index 5ed88def28a..82729e52e86 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -5,7 +5,7 @@ class superqix_state : public driver_device { public: - superqix_state(const machine_config &mconfig, device_type type, std::string tag) + superqix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_mcu(*this,"mcu"), diff --git a/src/mame/includes/superslave.h b/src/mame/includes/superslave.h index 67f3a85493f..ef84899e5c4 100644 --- a/src/mame/includes/superslave.h +++ b/src/mame/includes/superslave.h @@ -28,7 +28,7 @@ class superslave_state : public driver_device { public: - superslave_state(const machine_config &mconfig, device_type type, std::string tag) + superslave_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_dart0(*this, Z80DART_0_TAG), diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h index 4e7b0631e89..4db13e5ea33 100644 --- a/src/mame/includes/suprloco.h +++ b/src/mame/includes/suprloco.h @@ -3,7 +3,7 @@ class suprloco_state : public driver_device { public: - suprloco_state(const machine_config &mconfig, device_type type, std::string tag) + suprloco_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index b3d163a91ce..672ceb3efd5 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -23,7 +23,7 @@ struct hit_t class skns_state : public driver_device { public: - skns_state(const machine_config &mconfig, device_type type, std::string tag) + skns_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_spritegen(*this, "spritegen"), diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h index ce3e11502da..74a32a47f07 100644 --- a/src/mame/includes/suprridr.h +++ b/src/mame/includes/suprridr.h @@ -9,7 +9,7 @@ class suprridr_state : public driver_device { public: - suprridr_state(const machine_config &mconfig, device_type type, std::string tag) + suprridr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 95ead745c10..ffe87dd36bf 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -11,7 +11,7 @@ class suprslam_state : public driver_device { public: - suprslam_state(const machine_config &mconfig, device_type type, std::string tag) + suprslam_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_screen_videoram(*this, "screen_videoram"), m_bg_videoram(*this, "bg_videoram"), diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index 3fceb25a4b8..021fa7bbd09 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -15,7 +15,7 @@ class surpratk_state : public driver_device { public: - surpratk_state(const machine_config &mconfig, device_type type, std::string tag) + surpratk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_bank0000(*this, "bank0000"), diff --git a/src/mame/includes/svi318.h b/src/mame/includes/svi318.h index 5eb96aedd27..1e0fc0d0d30 100644 --- a/src/mame/includes/svi318.h +++ b/src/mame/includes/svi318.h @@ -31,7 +31,7 @@ class svi318_state : public driver_device { public: - svi318_state(const machine_config &mconfig, device_type type, std::string tag) + svi318_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cassette(*this, "cassette"), diff --git a/src/mame/includes/svision.h b/src/mame/includes/svision.h index 9381e65667c..43292b36702 100644 --- a/src/mame/includes/svision.h +++ b/src/mame/includes/svision.h @@ -37,7 +37,7 @@ struct tvlink_t class svision_state : public driver_device { public: - svision_state(const machine_config &mconfig, device_type type, std::string tag) + svision_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_sound(*this, "custom"), diff --git a/src/mame/includes/swtpc09.h b/src/mame/includes/swtpc09.h index 9b71fe6d5e2..10667f44a34 100644 --- a/src/mame/includes/swtpc09.h +++ b/src/mame/includes/swtpc09.h @@ -29,7 +29,7 @@ class swtpc09_state : public driver_device { public: - swtpc09_state(const machine_config &mconfig, device_type type, std::string tag) + swtpc09_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pia(*this, "pia"), diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index 96869c4ede5..8f3cf559276 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -6,7 +6,7 @@ class system1_state : public driver_device { public: - system1_state(const machine_config &mconfig, device_type type, std::string tag) + system1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ppi8255(*this, "ppi8255"), m_ram(*this, "ram"), diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index b63a9b9e5b4..5173524b89e 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -11,7 +11,7 @@ class segas1x_bootleg_state : public sega_16bit_common_base { public: - segas1x_bootleg_state(const machine_config &mconfig, device_type type, std::string tag) + segas1x_bootleg_state(const machine_config &mconfig, device_type type, const char *tag) : sega_16bit_common_base(mconfig, type, tag) , m_textram(*this, "textram"), m_bg0_tileram(*this, "bg0_tileram"), diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h index e2702ed6f2a..a39e95dcc4f 100644 --- a/src/mame/includes/tagteam.h +++ b/src/mame/includes/tagteam.h @@ -3,7 +3,7 @@ class tagteam_state : public driver_device { public: - tagteam_state(const machine_config &mconfig, device_type type, std::string tag) + tagteam_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index ebc17b48451..f4eb8bb919f 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -11,7 +11,7 @@ class tail2nos_state : public driver_device { public: - tail2nos_state(const machine_config &mconfig, device_type type, std::string tag) + tail2nos_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_txvideoram(*this, "txvideoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 3b7bb963b03..9a317f2eea9 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -23,7 +23,7 @@ public: REALPUNC_INTERRUPT3 }; - taitob_state(const machine_config &mconfig, device_type type, std::string tag) + taitob_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_pixelram(*this, "pixelram"), diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index c2a30abb330..1d75ce57e28 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -25,7 +25,7 @@ public: TIMER_TAITOF2_INTERRUPT6 }; - taitof2_state(const machine_config &mconfig, device_type type, std::string tag) + taitof2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sprite_extension(*this, "sprite_ext"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index 9ce6338c18d..5b31c9db98c 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -52,7 +52,7 @@ public: TIMER_F3_INTERRUPT3 }; - taito_f3_state(const machine_config &mconfig, device_type type, std::string tag) + taito_f3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index a638937801f..d90434f5d24 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -12,7 +12,7 @@ class taitoh_state : public driver_device { public: - taitoh_state(const machine_config &mconfig, device_type type, std::string tag) + taitoh_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_m68000_mainram(*this, "m68000_mainram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index 1ef46ed0b4b..9ddecdb0c03 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -8,7 +8,7 @@ class taitol_state : public driver_device { public: - taitol_state(const machine_config &mconfig, device_type type, std::string tag) + taitol_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h index 53d76964852..249c83b158f 100644 --- a/src/mame/includes/taito_o.h +++ b/src/mame/includes/taito_o.h @@ -11,7 +11,7 @@ class taitoo_state : public driver_device { public: - taitoo_state(const machine_config &mconfig, device_type type, std::string tag) + taitoo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tc0080vco(*this, "tc0080vco"), diff --git a/src/mame/includes/taito_x.h b/src/mame/includes/taito_x.h index d9f2b9f394c..110777c878e 100644 --- a/src/mame/includes/taito_x.h +++ b/src/mame/includes/taito_x.h @@ -6,7 +6,7 @@ class taitox_state : public seta_state { public: - taitox_state(const machine_config &mconfig, device_type type, std::string tag) + taitox_state(const machine_config &mconfig, device_type type, const char *tag) : seta_state(mconfig, type, tag) { } DECLARE_READ16_MEMBER(superman_dsw_input_r); diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index e9847be2d22..f14335f4b7b 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -25,7 +25,7 @@ public: TIMER_TAITOZ_CPUB_INTERRUPT5 }; - taitoz_state(const machine_config &mconfig, device_type type, std::string tag) + taitoz_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index 285829b34f7..2a0bc94cd12 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -25,7 +25,7 @@ struct taitoair_poly { class taitoair_state : public driver_device { public: - taitoair_state(const machine_config &mconfig, device_type type, std::string tag) + taitoair_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_m68000_mainram(*this, "m68000_mainram"), m_line_ram(*this, "line_ram"), diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index 8668da0b928..f334077dddb 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -12,7 +12,7 @@ class taitojc_state : public driver_device { public: - taitojc_state(const machine_config &mconfig, device_type type, std::string tag) + taitojc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_dsp(*this,"dsp"), diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 2936218f93d..b99a071d025 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -5,7 +5,7 @@ class taitosj_state : public driver_device { public: - taitosj_state(const machine_config &mconfig, device_type type, std::string tag) + taitosj_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram_1(*this, "videoram_1"), m_videoram_2(*this, "videoram_2"), diff --git a/src/mame/includes/tandy2k.h b/src/mame/includes/tandy2k.h index c90ef642478..57a96efd607 100644 --- a/src/mame/includes/tandy2k.h +++ b/src/mame/includes/tandy2k.h @@ -42,7 +42,7 @@ class tandy2k_state : public driver_device { public: - tandy2k_state(const machine_config &mconfig, device_type type, std::string tag) : + tandy2k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I80186_TAG), m_uart(*this, I8251A_TAG), diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index 60fc2d87eb8..2f9eac715c4 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -33,7 +33,7 @@ public: TIMER_COLLISION }; - tank8_state(const machine_config &mconfig, device_type type, std::string tag) + tank8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index 92c57a2cb2d..2359153c3e6 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -4,7 +4,7 @@ class tankbatt_state : public driver_device { public: - tankbatt_state(const machine_config &mconfig, device_type type, std::string tag) + tankbatt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h index e252a6da119..aa1501e59d0 100644 --- a/src/mame/includes/tankbust.h +++ b/src/mame/includes/tankbust.h @@ -3,7 +3,7 @@ class tankbust_state : public driver_device { public: - tankbust_state(const machine_config &mconfig, device_type type, std::string tag) + tankbust_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index c33acd3ed3b..3c7e566469c 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -3,7 +3,7 @@ class taotaido_state : public driver_device { public: - taotaido_state(const machine_config &mconfig, device_type type, std::string tag) + taotaido_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h index ce2c9a8d0e8..946f95325c6 100644 --- a/src/mame/includes/targeth.h +++ b/src/mame/includes/targeth.h @@ -3,7 +3,7 @@ class targeth_state : public driver_device { public: - targeth_state(const machine_config &mconfig, device_type type, std::string tag) + targeth_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index 9ff7633953d..0b1aac7f23f 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -6,7 +6,7 @@ class tatsumi_state : public driver_device { public: - tatsumi_state(const machine_config &mconfig, device_type type, std::string tag) + tatsumi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/taxidriv.h b/src/mame/includes/taxidriv.h index 73e37bde51c..2884053df30 100644 --- a/src/mame/includes/taxidriv.h +++ b/src/mame/includes/taxidriv.h @@ -3,7 +3,7 @@ class taxidriv_state : public driver_device { public: - taxidriv_state(const machine_config &mconfig, device_type type, std::string tag) + taxidriv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index 1a37fde1b8d..523cf8c0595 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -6,7 +6,7 @@ class tbowl_state : public driver_device { public: - tbowl_state(const machine_config &mconfig, device_type type, std::string tag) + tbowl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index 47866949fd5..5ec6d58a36d 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -7,7 +7,7 @@ class tceptor_state : public driver_device { public: - tceptor_state(const machine_config &mconfig, device_type type, std::string tag) + tceptor_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cus30(*this, "namco"), diff --git a/src/mame/includes/tdv2324.h b/src/mame/includes/tdv2324.h index a4e82a79fa0..8e4ad412197 100644 --- a/src/mame/includes/tdv2324.h +++ b/src/mame/includes/tdv2324.h @@ -47,7 +47,7 @@ class tdv2324_state : public driver_device { public: - tdv2324_state(const machine_config &mconfig, device_type type, std::string tag) + tdv2324_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, P8085AH_0_TAG), m_subcpu(*this, P8085AH_1_TAG), diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index 4d42d3c8939..aed50ccd174 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -6,7 +6,7 @@ class tecmo_state : public driver_device { public: - tecmo_state(const machine_config &mconfig, device_type type, std::string tag) + tecmo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index 355eca5cdee..cfdbb55acf1 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -6,7 +6,7 @@ class tecmo16_state : public driver_device { public: - tecmo16_state(const machine_config &mconfig, device_type type, std::string tag) + tecmo16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index a99f341a9be..b2af39ab37a 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -10,7 +10,7 @@ class tecmosys_state : public driver_device { public: - tecmosys_state(const machine_config &mconfig, device_type type, std::string tag) + tecmosys_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index 8eec719c09d..22f98d76586 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -10,7 +10,7 @@ public: TIMER_RESET }; - tehkanwc_state(const machine_config &mconfig, device_type type, std::string tag) + tehkanwc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/tek405x.h b/src/mame/includes/tek405x.h index 6bee3736581..018c3835c65 100644 --- a/src/mame/includes/tek405x.h +++ b/src/mame/includes/tek405x.h @@ -34,7 +34,7 @@ class tek4051_state : public driver_device { public: - tek4051_state(const machine_config &mconfig, device_type type, std::string tag) : + tek4051_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, MC6800_TAG), m_gpib_pia(*this, MC6820_GPIB_TAG), @@ -145,7 +145,7 @@ public: class tek4052_state : public driver_device { public: - tek4052_state(const machine_config &mconfig, device_type type, std::string tag) + tek4052_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, AM2901A_TAG), m_ram(*this, RAM_TAG) diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index f61bcd1d5be..d055fa142a5 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -5,7 +5,7 @@ class terracre_state : public driver_device { public: - terracre_state(const machine_config &mconfig, device_type type, std::string tag) + terracre_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index ffdfe1367e4..9f65ee2fa19 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -3,7 +3,7 @@ class tetrisp2_state : public driver_device { public: - tetrisp2_state(const machine_config &mconfig, device_type type, std::string tag) + tetrisp2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), @@ -138,7 +138,7 @@ public: class stepstag_state : public tetrisp2_state { public: - stepstag_state(const machine_config &mconfig, device_type type, std::string tag) + stepstag_state(const machine_config &mconfig, device_type type, const char *tag) : tetrisp2_state(mconfig, type, tag), m_spriteram3(*this, "spriteram3") { } diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h index e07763ae2b7..c95574628b9 100644 --- a/src/mame/includes/thedeep.h +++ b/src/mame/includes/thedeep.h @@ -6,7 +6,7 @@ class thedeep_state : public driver_device { public: - thedeep_state(const machine_config &mconfig, device_type type, std::string tag) + thedeep_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index b21f82bd522..11852faab9e 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -3,7 +3,7 @@ class thepit_state : public driver_device { public: - thepit_state(const machine_config &mconfig, device_type type, std::string tag) + thepit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h index 8f57393af11..bc1d57ae8a8 100644 --- a/src/mame/includes/thief.h +++ b/src/mame/includes/thief.h @@ -13,7 +13,7 @@ struct coprocessor_t { class thief_state : public driver_device { public: - thief_state(const machine_config &mconfig, device_type type, std::string tag) + thief_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), diff --git a/src/mame/includes/thomson.h b/src/mame/includes/thomson.h index 33708d48d65..f8047501e7c 100644 --- a/src/mame/includes/thomson.h +++ b/src/mame/includes/thomson.h @@ -96,7 +96,7 @@ struct thom_vsignal { class thomson_state : public driver_device { public: - thomson_state(const machine_config &mconfig, device_type type, std::string tag) : + thomson_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mc6854(*this, "mc6854"), m_maincpu(*this, "maincpu"), @@ -674,7 +674,7 @@ class to7_io_line_device : public device_t { public: // construction/destruction - to7_io_line_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + to7_io_line_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); /* read data register */ DECLARE_READ8_MEMBER(porta_in); diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h index 3202ddd5229..066f4ffbde2 100644 --- a/src/mame/includes/thoop2.h +++ b/src/mame/includes/thoop2.h @@ -3,7 +3,7 @@ class thoop2_state : public driver_device { public: - thoop2_state(const machine_config &mconfig, device_type type, std::string tag) + thoop2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_vregs(*this, "vregs"), diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h index 7a8ea1ee72c..ebcaff632ed 100644 --- a/src/mame/includes/thunderj.h +++ b/src/mame/includes/thunderj.h @@ -13,7 +13,7 @@ class thunderj_state : public atarigen_state { public: - thunderj_state(const machine_config &mconfig, device_type type, std::string tag) + thunderj_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_jsa(*this, "jsa"), m_vad(*this, "vad"), diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h index e19f38e39fd..2ea60729e11 100644 --- a/src/mame/includes/thunderx.h +++ b/src/mame/includes/thunderx.h @@ -20,7 +20,7 @@ public: TIMER_THUNDERX_FIRQ }; - thunderx_state(const machine_config &mconfig, device_type type, std::string tag) + thunderx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/ti85.h b/src/mame/includes/ti85.h index bf60dbf5c95..4eff29fff9b 100644 --- a/src/mame/includes/ti85.h +++ b/src/mame/includes/ti85.h @@ -53,7 +53,7 @@ typedef enum TI83PSE_CTIMER class ti85_state : public driver_device { public: - ti85_state(const machine_config &mconfig, device_type type, std::string tag) + ti85_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/includes/ti89.h b/src/mame/includes/ti89.h index b7616d23042..67b1707e8bc 100644 --- a/src/mame/includes/ti89.h +++ b/src/mame/includes/ti89.h @@ -14,7 +14,7 @@ class ti68k_state : public driver_device { public: - ti68k_state(const machine_config &mconfig, device_type type, std::string tag) + ti68k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_flash(*this, "flash"), diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index 2eb976ebc55..a6a7096efb7 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -4,7 +4,7 @@ class tiamc1_state : public driver_device { public: - tiamc1_state(const machine_config &mconfig, device_type type, std::string tag) + tiamc1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), @@ -89,7 +89,7 @@ class tiamc1_sound_device : public device_t, public device_sound_interface { public: - tiamc1_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tiamc1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tiamc1_sound_device() { } protected: diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h index cca95a073c7..b54f8a6d2dd 100644 --- a/src/mame/includes/tigeroad.h +++ b/src/mame/includes/tigeroad.h @@ -12,7 +12,7 @@ class tigeroad_state : public driver_device { public: - tigeroad_state(const machine_config &mconfig, device_type type, std::string tag) + tigeroad_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram") , m_videoram(*this, "videoram"), diff --git a/src/mame/includes/tiki100.h b/src/mame/includes/tiki100.h index 78b7858eaac..b4e837adba3 100644 --- a/src/mame/includes/tiki100.h +++ b/src/mame/includes/tiki100.h @@ -42,7 +42,7 @@ class tiki100_state : public driver_device { public: - tiki100_state(const machine_config &mconfig, device_type type, std::string tag) : + tiki100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_ctc(*this, Z80CTC_TAG), diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index 2dc9aab9867..7b7af434c15 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -3,7 +3,7 @@ class timelimt_state : public driver_device { public: - timelimt_state(const machine_config &mconfig, device_type type, std::string tag) + timelimt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 07dd87c49af..3a9de0d64c1 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -11,7 +11,7 @@ class timeplt_state : public driver_device { public: - timeplt_state(const machine_config &mconfig, device_type type, std::string tag) + timeplt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tc8830f(*this, "tc8830f"), diff --git a/src/mame/includes/tmc1800.h b/src/mame/includes/tmc1800.h index 7b51cdfa295..6e7c80c1c03 100644 --- a/src/mame/includes/tmc1800.h +++ b/src/mame/includes/tmc1800.h @@ -26,7 +26,7 @@ class tmc1800_base_state : public driver_device { public: - tmc1800_base_state(const machine_config &mconfig, device_type type, std::string tag) + tmc1800_base_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, CDP1802_TAG), m_cassette(*this, "cassette"), @@ -55,7 +55,7 @@ public: TIMER_SETUP_BEEP }; - tmc1800_state(const machine_config &mconfig, device_type type, std::string tag) + tmc1800_state(const machine_config &mconfig, device_type type, const char *tag) : tmc1800_base_state(mconfig, type, tag), m_vdc(*this, CDP1861_TAG) { } @@ -84,7 +84,7 @@ protected: class osc1000b_state : public tmc1800_base_state { public: - osc1000b_state(const machine_config &mconfig, device_type type, std::string tag) + osc1000b_state(const machine_config &mconfig, device_type type, const char *tag) : tmc1800_base_state(mconfig, type, tag) { } @@ -107,7 +107,7 @@ public: class tmc2000_state : public tmc1800_base_state { public: - tmc2000_state(const machine_config &mconfig, device_type type, std::string tag) + tmc2000_state(const machine_config &mconfig, device_type type, const char *tag) : tmc1800_base_state(mconfig, type, tag), m_cti(*this, CDP1864_TAG), m_colorram(*this, "color_ram"), @@ -164,7 +164,7 @@ public: class nano_state : public tmc1800_base_state { public: - nano_state(const machine_config &mconfig, device_type type, std::string tag) + nano_state(const machine_config &mconfig, device_type type, const char *tag) : tmc1800_base_state(mconfig, type, tag), m_cti(*this, CDP1864_TAG), m_ny0(*this, "NY0"), diff --git a/src/mame/includes/tmc2000e.h b/src/mame/includes/tmc2000e.h index 8b1cb6f2837..29974e3a233 100644 --- a/src/mame/includes/tmc2000e.h +++ b/src/mame/includes/tmc2000e.h @@ -22,7 +22,7 @@ class tmc2000e_state : public driver_device { public: - tmc2000e_state(const machine_config &mconfig, device_type type, std::string tag) + tmc2000e_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, CDP1802_TAG), m_cti(*this, CDP1864_TAG), diff --git a/src/mame/includes/tmc600.h b/src/mame/includes/tmc600.h index ca7fc806b1c..9fa19ca227a 100644 --- a/src/mame/includes/tmc600.h +++ b/src/mame/includes/tmc600.h @@ -25,7 +25,7 @@ class tmc600_state : public driver_device { public: - tmc600_state(const machine_config &mconfig, device_type type, std::string tag) + tmc600_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, CDP1802_TAG), m_vis(*this, CDP1869_TAG), diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index 082a4f099d1..8b6d18a7c78 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -21,7 +21,7 @@ public: TIMER_NMI }; - tmnt_state(const machine_config &mconfig, device_type type, std::string tag) + tmnt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_tmnt2_rom(*this, "tmnt2_rom"), diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index ed5470d309c..9ac5c6688da 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -25,7 +25,7 @@ enum class tnzs_state : public driver_device { public: - tnzs_state(const machine_config &mconfig, device_type type, std::string tag) + tnzs_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index 9c0b12075b2..7c67523b40a 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -11,7 +11,7 @@ class toaplan1_state : public driver_device { public: - toaplan1_state(const machine_config &mconfig, device_type type, std::string tag) + toaplan1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bgpaletteram(*this, "bgpalette"), m_fgpaletteram(*this, "fgpalette"), @@ -164,7 +164,7 @@ public: class toaplan1_rallybik_state : public toaplan1_state { public: - toaplan1_rallybik_state(const machine_config &mconfig, device_type type, std::string tag) + toaplan1_rallybik_state(const machine_config &mconfig, device_type type, const char *tag) : toaplan1_state(mconfig, type, tag), m_spritegen(*this, "scu") { diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index 98b0a0beb8f..198cd1ce6ec 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -22,7 +22,7 @@ public: TIMER_RAISE_IRQ }; - toaplan2_state(const machine_config &mconfig, device_type type, std::string tag) + toaplan2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_shared_ram(*this, "shared_ram"), m_shared_ram16(*this, "shared_ram16"), diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index 842fb2d8bc1..23718749380 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -7,7 +7,7 @@ class toki_state : public driver_device { public: - toki_state(const machine_config &mconfig, device_type type, std::string tag) + toki_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h index e9c1604acd0..38d50d41c60 100644 --- a/src/mame/includes/toobin.h +++ b/src/mame/includes/toobin.h @@ -13,7 +13,7 @@ class toobin_state : public atarigen_state { public: - toobin_state(const machine_config &mconfig, device_type type, std::string tag) + toobin_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_jsa(*this, "jsa"), m_playfield_tilemap(*this, "playfield"), diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h index be73f58e8f0..139543e69b6 100644 --- a/src/mame/includes/topspeed.h +++ b/src/mame/includes/topspeed.h @@ -14,7 +14,7 @@ class topspeed_state : public driver_device { public: - topspeed_state(const machine_config &mconfig, device_type type, std::string tag) + topspeed_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spritemap(*this, "spritemap"), m_raster_ctrl(*this, "raster_ctrl"), diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index 969667fb3c3..7669fecd778 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -11,7 +11,7 @@ public: TIMER_NAMCOIO_RUN }; - toypop_state(const machine_config &mconfig, device_type type, std::string tag) + toypop_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index 60ce0a8a7a8..282f8287290 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -3,7 +3,7 @@ class tp84_state : public driver_device { public: - tp84_state(const machine_config &mconfig, device_type type, std::string tag) + tp84_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu"), m_palette_bank(*this, "palette_bank"), diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index c11de6b25db..bac83ad0c3e 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -12,7 +12,7 @@ class trackfld_state : public driver_device { public: - trackfld_state(const machine_config &mconfig, device_type type, std::string tag) + trackfld_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram2(*this, "spriteram2"), m_scroll(*this, "scroll"), diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index 72057146a90..58f36622450 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -4,7 +4,7 @@ class travrusa_state : public driver_device { public: - travrusa_state(const machine_config &mconfig, device_type type, std::string tag) + travrusa_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index 8f0dfee3004..9d145c591a9 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -26,7 +26,7 @@ public: TIMER_HIT }; - triplhnt_state(const machine_config &mconfig, device_type type, std::string tag) + triplhnt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_playfield_ram(*this, "playfield_ram"), m_vpos_ram(*this, "vpos_ram"), diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h index d43e2a01f3b..d6868eb2fca 100644 --- a/src/mame/includes/trs80.h +++ b/src/mame/includes/trs80.h @@ -26,7 +26,7 @@ class trs80_state : public driver_device { public: - trs80_state(const machine_config &mconfig, device_type type, std::string tag) + trs80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_centronics(*this, "centronics"), diff --git a/src/mame/includes/trs80m2.h b/src/mame/includes/trs80m2.h index 1bfbbc82047..305fd2bab49 100644 --- a/src/mame/includes/trs80m2.h +++ b/src/mame/includes/trs80m2.h @@ -38,7 +38,7 @@ class trs80m2_state : public driver_device { public: - trs80m2_state(const machine_config &mconfig, device_type type, std::string tag) + trs80m2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_ctc(*this, Z80CTC_TAG), @@ -142,7 +142,7 @@ public: class trs80m16_state : public trs80m2_state { public: - trs80m16_state(const machine_config &mconfig, device_type type, std::string tag) + trs80m16_state(const machine_config &mconfig, device_type type, const char *tag) : trs80m2_state(mconfig, type, tag), m_subcpu(*this, M68000_TAG), m_pic(*this, AM9519A_TAG) diff --git a/src/mame/includes/truco.h b/src/mame/includes/truco.h index cce6429cb87..c79319efbb9 100644 --- a/src/mame/includes/truco.h +++ b/src/mame/includes/truco.h @@ -5,7 +5,7 @@ class truco_state : public driver_device { public: - truco_state(const machine_config &mconfig, device_type type, std::string tag) + truco_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac(*this, "dac"), diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h index 81b51471923..f851f627130 100644 --- a/src/mame/includes/trucocl.h +++ b/src/mame/includes/trucocl.h @@ -10,7 +10,7 @@ public: TIMER_DAC_IRQ }; - trucocl_state(const machine_config &mconfig, device_type type, std::string tag) + trucocl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index e5ee84df31d..e2ef35ded3e 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -3,7 +3,7 @@ class tryout_state : public driver_device { public: - tryout_state(const machine_config &mconfig, device_type type, std::string tag) + tryout_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index db646323640..2db05642d68 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -3,7 +3,7 @@ class tsamurai_state : public driver_device { public: - tsamurai_state(const machine_config &mconfig, device_type type, std::string tag) + tsamurai_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/tsispch.h b/src/mame/includes/tsispch.h index 35f1a7b94b6..797eca02687 100644 --- a/src/mame/includes/tsispch.h +++ b/src/mame/includes/tsispch.h @@ -20,7 +20,7 @@ class tsispch_state : public driver_device { public: - tsispch_state(const machine_config &mconfig, device_type type, std::string tag) + tsispch_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dsp(*this, "dsp"), diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index 4f80f077222..5e86965aac6 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -12,7 +12,7 @@ public: TIMER_SPRITE }; - tubep_state(const machine_config &mconfig, device_type type, std::string tag) + tubep_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_textram(*this, "textram"), m_backgroundram(*this, "backgroundram"), diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index f8d16b7b584..a3b528310d6 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -7,7 +7,7 @@ class tumbleb_state : public driver_device { public: - tumbleb_state(const machine_config &mconfig, device_type type, std::string tag) + tumbleb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mainram(*this, "mainram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/tumblep.h b/src/mame/includes/tumblep.h index 2a125dddd99..291fdffcbe2 100644 --- a/src/mame/includes/tumblep.h +++ b/src/mame/includes/tumblep.h @@ -12,7 +12,7 @@ class tumblep_state : public driver_device { public: - tumblep_state(const machine_config &mconfig, device_type type, std::string tag) + tumblep_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_pf1_rowscroll(*this, "pf1_rowscroll"), diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index e0cdd158772..5ac558adead 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -3,7 +3,7 @@ class tunhunt_state : public driver_device { public: - tunhunt_state(const machine_config &mconfig, device_type type, std::string tag) + tunhunt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index 921fd9e6d70..e2d0ea2ab2d 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -19,7 +19,7 @@ class turbo_state : public driver_device { public: - turbo_state(const machine_config &mconfig, device_type type, std::string tag) + turbo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), diff --git a/src/mame/includes/turrett.h b/src/mame/includes/turrett.h index 1ff3486f482..f883913f695 100644 --- a/src/mame/includes/turrett.h +++ b/src/mame/includes/turrett.h @@ -12,7 +12,7 @@ class turrett_state : public driver_device { public: - turrett_state(const machine_config &mconfig, device_type type, std::string tag) + turrett_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ata(*this, "ata"), @@ -94,7 +94,7 @@ class turrett_device : public device_t, public: // construction/destruction - turrett_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + turrett_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ32_MEMBER(read); DECLARE_WRITE32_MEMBER(write); diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h index 6540178d98d..b5748db47b0 100644 --- a/src/mame/includes/tutankhm.h +++ b/src/mame/includes/tutankhm.h @@ -3,7 +3,7 @@ class tutankhm_state : public driver_device { public: - tutankhm_state(const machine_config &mconfig, device_type type, std::string tag) + tutankhm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_scroll(*this, "scroll"), diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index 077b49b61d5..1a3bc02fd73 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -7,7 +7,7 @@ class twin16_state : public driver_device { public: - twin16_state(const machine_config &mconfig, device_type type, std::string tag) + twin16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), @@ -97,7 +97,7 @@ private: class fround_state : public twin16_state { public: - fround_state(const machine_config &mconfig, device_type type, std::string tag) + fround_state(const machine_config &mconfig, device_type type, const char *tag) : twin16_state(mconfig, type, tag) {} @@ -116,7 +116,7 @@ private: class cuebrickj_state : public twin16_state { public: - cuebrickj_state(const machine_config &mconfig, device_type type, std::string tag) + cuebrickj_state(const machine_config &mconfig, device_type type, const char *tag) : twin16_state(mconfig, type, tag) {} diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index c0ad03da365..6f6c603af24 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -12,7 +12,7 @@ class twincobr_state : public driver_device { public: - twincobr_state(const machine_config &mconfig, device_type type, std::string tag) + twincobr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sharedram(*this, "sharedram"), m_spriteram8(*this, "spriteram8"), diff --git a/src/mame/includes/tx0.h b/src/mame/includes/tx0.h index 2ed82d147d8..8b96e52ff65 100644 --- a/src/mame/includes/tx0.h +++ b/src/mame/includes/tx0.h @@ -132,7 +132,7 @@ struct magtape_t class tx0_state : public driver_device { public: - tx0_state(const machine_config &mconfig, device_type type, std::string tag) + tx0_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index e4b6c70c96c..68f9a37739d 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -99,7 +99,7 @@ struct vregs_t class tx1_state : public driver_device { public: - tx1_state(const machine_config &mconfig, device_type type, std::string tag) + tx1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "main_cpu"), m_mathcpu(*this, "math_cpu"), @@ -255,8 +255,8 @@ class tx1_sound_device : public device_t, public device_sound_interface { public: - tx1_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tx1_sound_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + tx1_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~tx1_sound_device() {} DECLARE_READ8_MEMBER( pit8253_r ); @@ -312,7 +312,7 @@ extern const device_type TX1; class buggyboy_sound_device : public tx1_sound_device { public: - buggyboy_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( ym1_a_w ); DECLARE_WRITE8_MEMBER( ym2_a_w ); diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h index 285bc486593..9e6e2853275 100644 --- a/src/mame/includes/ultraman.h +++ b/src/mame/includes/ultraman.h @@ -13,7 +13,7 @@ class ultraman_state : public driver_device { public: - ultraman_state(const machine_config &mconfig, device_type type, std::string tag) + ultraman_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index 203fa7e07a4..09bc0408fdd 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -16,7 +16,7 @@ public: TIMER_NMI }; - ultratnk_state(const machine_config &mconfig, device_type type, std::string tag) + ultratnk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index a22b49e94d9..b2cf973f6b2 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -22,7 +22,7 @@ public: TIMER_INTERRUPT5 }; - undrfire_state(const machine_config &mconfig, device_type type, std::string tag) + undrfire_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index 0a988d4ea75..26ac4e35f26 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -6,7 +6,7 @@ class unico_state : public driver_device { public: - unico_state(const machine_config &mconfig, device_type type, std::string tag) + unico_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_oki(*this, "oki"), diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h index 4514519bace..1de018636cc 100644 --- a/src/mame/includes/usgames.h +++ b/src/mame/includes/usgames.h @@ -3,7 +3,7 @@ class usgames_state : public driver_device { public: - usgames_state(const machine_config &mconfig, device_type type, std::string tag) + usgames_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/ut88.h b/src/mame/includes/ut88.h index e0b6374e18c..a394965f096 100644 --- a/src/mame/includes/ut88.h +++ b/src/mame/includes/ut88.h @@ -26,7 +26,7 @@ public: TIMER_UPDATE_DISPLAY }; - ut88_state(const machine_config &mconfig, device_type type, std::string tag) + ut88_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_cassette(*this, "cassette"), m_ppi(*this, "ppi8255"), diff --git a/src/mame/includes/v1050.h b/src/mame/includes/v1050.h index 6151b2eca69..deecd9cf61b 100644 --- a/src/mame/includes/v1050.h +++ b/src/mame/includes/v1050.h @@ -61,7 +61,7 @@ class v1050_state : public driver_device { public: - v1050_state(const machine_config &mconfig, device_type type, std::string tag) + v1050_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_subcpu(*this, M6502_TAG), diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index 8894c49502d..3ea7e4568db 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -13,7 +13,7 @@ class vaportra_state : public driver_device { public: - vaportra_state(const machine_config &mconfig, device_type type, std::string tag) + vaportra_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index e0bdc234185..b12600180b6 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -3,7 +3,7 @@ class vastar_state : public driver_device { public: - vastar_state(const machine_config &mconfig, device_type type, std::string tag) + vastar_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index 1a924055232..ad1c41d9a07 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -3,7 +3,7 @@ class vball_state : public driver_device { public: - vball_state(const machine_config &mconfig, device_type type, std::string tag) + vball_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/vc4000.h b/src/mame/includes/vc4000.h index 27d83802c7b..ca19737872f 100644 --- a/src/mame/includes/vc4000.h +++ b/src/mame/includes/vc4000.h @@ -77,7 +77,7 @@ struct vc4000_video_t class vc4000_state : public driver_device { public: - vc4000_state(const machine_config &mconfig, device_type type, std::string tag) + vc4000_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_screen(*this, "screen"), diff --git a/src/mame/includes/vcs80.h b/src/mame/includes/vcs80.h index d54ed82b82a..19cd0b18c7a 100644 --- a/src/mame/includes/vcs80.h +++ b/src/mame/includes/vcs80.h @@ -19,7 +19,7 @@ class vcs80_state : public driver_device { public: - vcs80_state(const machine_config &mconfig, device_type type, std::string tag) + vcs80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_pio(*this, Z80PIO_TAG), diff --git a/src/mame/includes/vector06.h b/src/mame/includes/vector06.h index 23d0f0fadc8..e6bf99fa7da 100644 --- a/src/mame/includes/vector06.h +++ b/src/mame/includes/vector06.h @@ -25,7 +25,7 @@ class vector06_state : public driver_device { public: - vector06_state(const machine_config &mconfig, device_type type, std::string tag) + vector06_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_cassette(*this, "cassette"), diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h index 838406c93eb..a79b893a996 100644 --- a/src/mame/includes/vectrex.h +++ b/src/mame/includes/vectrex.h @@ -40,7 +40,7 @@ public: TIMER_UPDATE_SIGNAL }; - vectrex_state(const machine_config &mconfig, device_type type, std::string tag) + vectrex_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_gce_vectorram(*this, "gce_vectorram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index 9374808b23d..f32c7cc9f61 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -20,7 +20,7 @@ public: TIMER_Z80_NMI }; - vendetta_state(const machine_config &mconfig, device_type type, std::string tag) + vendetta_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/vertigo.h b/src/mame/includes/vertigo.h index bea0725dbd1..25d88a6ce72 100644 --- a/src/mame/includes/vertigo.h +++ b/src/mame/includes/vertigo.h @@ -85,7 +85,7 @@ struct vproc class vertigo_state : public driver_device { public: - vertigo_state(const machine_config &mconfig, device_type type, std::string tag) + vertigo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/vic10.h b/src/mame/includes/vic10.h index 17d48040300..efcaeeaded0 100644 --- a/src/mame/includes/vic10.h +++ b/src/mame/includes/vic10.h @@ -28,7 +28,7 @@ class vic10_state : public driver_device { public: - vic10_state(const machine_config &mconfig, device_type type, std::string tag) + vic10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M6510_TAG), m_vic(*this, MOS6566_TAG), diff --git a/src/mame/includes/vic20.h b/src/mame/includes/vic20.h index 9cb800557ea..f90108165aa 100644 --- a/src/mame/includes/vic20.h +++ b/src/mame/includes/vic20.h @@ -31,7 +31,7 @@ class vic20_state : public driver_device { public: - vic20_state(const machine_config &mconfig, device_type type, std::string tag) + vic20_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, M6502_TAG), m_via1(*this, M6522_1_TAG), diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index 78a937da480..c0ae21c289a 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -14,7 +14,7 @@ class vicdual_state : public driver_device { public: - vicdual_state(const machine_config &mconfig, device_type type, std::string tag) + vicdual_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/victor9k.h b/src/mame/includes/victor9k.h index 2f0f4f62745..c37b5a78d70 100644 --- a/src/mame/includes/victor9k.h +++ b/src/mame/includes/victor9k.h @@ -51,7 +51,7 @@ class victor9k_state : public driver_device { public: - victor9k_state(const machine_config &mconfig, device_type type, std::string tag) : + victor9k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I8088_TAG), m_ieee488(*this, IEEE488_TAG), diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h index 006a9d08ea4..499432ec87f 100644 --- a/src/mame/includes/victory.h +++ b/src/mame/includes/victory.h @@ -34,7 +34,7 @@ struct micro_t class victory_state : public driver_device { public: - victory_state(const machine_config &mconfig, device_type type, std::string tag) + victory_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_screen(*this, "screen"), diff --git a/src/mame/includes/vidbrain.h b/src/mame/includes/vidbrain.h index bd4abc362d2..cb3905ff674 100644 --- a/src/mame/includes/vidbrain.h +++ b/src/mame/includes/vidbrain.h @@ -25,7 +25,7 @@ class vidbrain_state : public driver_device { public: - vidbrain_state(const machine_config &mconfig, device_type type, std::string tag) + vidbrain_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, F3850_TAG), m_smi(*this, F3853_TAG), diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index b5ce3f448f1..93831beddad 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -25,7 +25,7 @@ public: TIMER_INTERRUPT }; - videopin_state(const machine_config &mconfig, device_type type, std::string tag) + videopin_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h index 74af1295f7b..a83bea427eb 100644 --- a/src/mame/includes/vigilant.h +++ b/src/mame/includes/vigilant.h @@ -5,7 +5,7 @@ class vigilant_state : public driver_device { public: - vigilant_state(const machine_config &mconfig, device_type type, std::string tag) + vigilant_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audio(*this, "m72"), diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h index 23ee6702e81..1a12da72cce 100644 --- a/src/mame/includes/vindictr.h +++ b/src/mame/includes/vindictr.h @@ -13,7 +13,7 @@ class vindictr_state : public atarigen_state { public: - vindictr_state(const machine_config &mconfig, device_type type, std::string tag) + vindictr_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_playfield_tilemap(*this, "playfield"), m_alpha_tilemap(*this, "alpha"), diff --git a/src/mame/includes/vip.h b/src/mame/includes/vip.h index 74a6b27db1b..eed5c690285 100644 --- a/src/mame/includes/vip.h +++ b/src/mame/includes/vip.h @@ -24,7 +24,7 @@ class vip_state : public driver_device { public: - vip_state(const machine_config &mconfig, device_type type, std::string tag) + vip_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, CDP1802_TAG), m_vdc(*this, CDP1861_TAG), diff --git a/src/mame/includes/vixen.h b/src/mame/includes/vixen.h index e7bc78c58fc..0091d3ee9d8 100644 --- a/src/mame/includes/vixen.h +++ b/src/mame/includes/vixen.h @@ -26,7 +26,7 @@ class vixen_state : public driver_device { public: - vixen_state(const machine_config &mconfig, device_type type, std::string tag) + vixen_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z8400A_TAG), m_fdc(*this, FDC1797_TAG), diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index 7fac0492e5e..b809e001d8c 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -16,7 +16,7 @@ public: TIMER_VOLFIED }; - volfied_state(const machine_config &mconfig, device_type type, std::string tag) + volfied_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h index 305ae626ce2..064919f66ff 100644 --- a/src/mame/includes/vsnes.h +++ b/src/mame/includes/vsnes.h @@ -5,7 +5,7 @@ class vsnes_state : public driver_device { public: - vsnes_state(const machine_config &mconfig, device_type type, std::string tag) + vsnes_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/vtech2.h b/src/mame/includes/vtech2.h index a36751c650a..abec6288158 100644 --- a/src/mame/includes/vtech2.h +++ b/src/mame/includes/vtech2.h @@ -18,7 +18,7 @@ class vtech2_state : public driver_device { public: - vtech2_state(const machine_config &mconfig, device_type type, std::string tag) + vtech2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index 6b2731a34d8..a6152923ec7 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -9,7 +9,7 @@ class vulgus_state : public driver_device { public: - vulgus_state(const machine_config &mconfig, device_type type, std::string tag) + vulgus_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/wangpc.h b/src/mame/includes/wangpc.h index 2f872285eee..05278e32671 100644 --- a/src/mame/includes/wangpc.h +++ b/src/mame/includes/wangpc.h @@ -36,7 +36,7 @@ class wangpc_state : public driver_device { public: // constructor - wangpc_state(const machine_config &mconfig, device_type type, std::string tag) : + wangpc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, I8086_TAG), m_dmac(*this, AM9517A_TAG), diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h index 7e2e184173d..62e8cde7937 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -5,7 +5,7 @@ class warpwarp_state : public driver_device { public: - warpwarp_state(const machine_config &mconfig, device_type type, std::string tag) + warpwarp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h index 8fa1f057900..aedbd75704b 100644 --- a/src/mame/includes/warriorb.h +++ b/src/mame/includes/warriorb.h @@ -16,7 +16,7 @@ class warriorb_state : public driver_device { public: - warriorb_state(const machine_config &mconfig, device_type type, std::string tag) + warriorb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tc0140syt(*this, "tc0140syt"), diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index 03ac90ee525..46944d5da83 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -5,7 +5,7 @@ class wc90_state : public driver_device { public: - wc90_state(const machine_config &mconfig, device_type type, std::string tag) + wc90_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h index 9bb6b04a6e4..c4c81289a3a 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -5,7 +5,7 @@ class wc90b_state : public driver_device { public: - wc90b_state(const machine_config &mconfig, device_type type, std::string tag) + wc90b_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index 792a7c4d35f..80acb529dcb 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -6,7 +6,7 @@ class wecleman_state : public driver_device { public: - wecleman_state(const machine_config &mconfig, device_type type, std::string tag) + wecleman_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videostatus(*this, "videostatus"), m_protection_ram(*this, "protection_ram"), diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index 6558f158157..cedd5ab7385 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -5,7 +5,7 @@ class welltris_state : public driver_device { public: - welltris_state(const machine_config &mconfig, device_type type, std::string tag) + welltris_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index c2a026eb945..d5298b6eaac 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -21,7 +21,7 @@ public: TIMER_WGP_CPUB_INTERRUPT6 }; - wgp_state(const machine_config &mconfig, device_type type, std::string tag) + wgp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spritemap(*this, "spritemap"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index 520de63c651..ad211654cd6 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -14,7 +14,7 @@ class williams_state : public driver_device { public: - williams_state(const machine_config &mconfig, device_type type, std::string tag) + williams_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_nvram(*this, "nvram"), m_videoram(*this, "videoram"), @@ -118,7 +118,7 @@ public: class blaster_state : public williams_state { public: - blaster_state(const machine_config &mconfig, device_type type, std::string tag) + blaster_state(const machine_config &mconfig, device_type type, const char *tag) : williams_state(mconfig, type, tag), m_soundcpu_b(*this, "soundcpu_b"), m_blaster_palette_0(*this, "blaster_pal0"), @@ -154,7 +154,7 @@ public: class williams2_state : public williams_state { public: - williams2_state(const machine_config &mconfig, device_type type, std::string tag) + williams2_state(const machine_config &mconfig, device_type type, const char *tag) : williams_state(mconfig, type, tag), m_bank8000(*this, "bank8000"), m_gfxdecode(*this, "gfxdecode"), @@ -204,7 +204,7 @@ public: class joust2_state : public williams2_state { public: - joust2_state(const machine_config &mconfig, device_type type, std::string tag) + joust2_state(const machine_config &mconfig, device_type type, const char *tag) : williams2_state(mconfig, type, tag), m_cvsd_sound(*this, "cvsd") { } diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h index bd5e679b233..59cabdcf27d 100644 --- a/src/mame/includes/wiping.h +++ b/src/mame/includes/wiping.h @@ -3,7 +3,7 @@ class wiping_state : public driver_device { public: - wiping_state(const machine_config &mconfig, device_type type, std::string tag) + wiping_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index 75297a39453..d4cb1f39f36 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -11,7 +11,7 @@ class wiz_state : public driver_device { public: - wiz_state(const machine_config &mconfig, device_type type, std::string tag) + wiz_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index 6dba675e732..012fd47d9b0 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -16,7 +16,7 @@ public: TIMER_PERIODIC }; - wolfpack_state(const machine_config &mconfig, device_type type, std::string tag) + wolfpack_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_alpha_num_ram(*this, "alpha_num_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/wpc_pin.h b/src/mame/includes/wpc_pin.h index f4002879e96..27cf5cfc588 100644 --- a/src/mame/includes/wpc_pin.h +++ b/src/mame/includes/wpc_pin.h @@ -20,7 +20,7 @@ class wpc_dot_state : public driver_device { public: - wpc_dot_state(const machine_config &mconfig, device_type type, std::string tag) + wpc_dot_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_wpcsnd(*this,"wpcsnd"), @@ -84,7 +84,7 @@ private: class wpc_flip1_state : public wpc_dot_state { public: - wpc_flip1_state(const machine_config &mconfig, device_type type, std::string tag) + wpc_flip1_state(const machine_config &mconfig, device_type type, const char *tag) : wpc_dot_state(mconfig, type, tag) { } public: @@ -95,7 +95,7 @@ public: class wpc_flip2_state : public wpc_flip1_state { public: - wpc_flip2_state(const machine_config &mconfig, device_type type, std::string tag) + wpc_flip2_state(const machine_config &mconfig, device_type type, const char *tag) : wpc_flip1_state(mconfig, type, tag) { } public: @@ -105,7 +105,7 @@ public: class wpc_dcs_state : public wpc_flip2_state { public: - wpc_dcs_state(const machine_config &mconfig, device_type type, std::string tag) + wpc_dcs_state(const machine_config &mconfig, device_type type, const char *tag) : wpc_flip2_state(mconfig, type, tag), m_dcs(*this, "dcs") { } diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index 0099494f29a..641ec7c4b11 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -3,7 +3,7 @@ class wrally_state : public driver_device { public: - wrally_state(const machine_config &mconfig, device_type type, std::string tag) + wrally_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/wswan.h b/src/mame/includes/wswan.h index c83c7ad8bc1..5cdc8336f04 100644 --- a/src/mame/includes/wswan.h +++ b/src/mame/includes/wswan.h @@ -34,7 +34,7 @@ struct SoundDMA class wswan_state : public driver_device { public: - wswan_state(const machine_config &mconfig, device_type type, std::string tag) + wswan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_vdp(*this, "vdp"), diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index b8bb6ead7b3..70fdd5dfab3 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -3,7 +3,7 @@ class wwfsstar_state : public driver_device { public: - wwfsstar_state(const machine_config &mconfig, device_type type, std::string tag) + wwfsstar_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/x07.h b/src/mame/includes/x07.h index c081fdc6d51..acea6f55260 100644 --- a/src/mame/includes/x07.h +++ b/src/mame/includes/x07.h @@ -92,7 +92,7 @@ static const UINT8 t6834_cmd_len[0x47] = struct x07_kb { - std::string tag; //input port tag + const char *tag; //input port tag UINT8 mask; //bit mask UINT8 codes[7]; //port codes }; @@ -160,7 +160,7 @@ static const x07_kb x07_keycodes[56] = class x07_state : public driver_device { public: - x07_state(const machine_config &mconfig, device_type type, std::string tag) + x07_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_printer(*this, "printer"), diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h index 1453a6fb4fe..eb8d63182cd 100644 --- a/src/mame/includes/x1.h +++ b/src/mame/includes/x1.h @@ -35,7 +35,7 @@ class x1_keyboard_device : public device_t, { public: // construction/destruction - x1_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + x1_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); private: virtual void device_start() override; @@ -74,7 +74,7 @@ struct x1_rtc_t class x1_state : public driver_device { public: - x1_state(const machine_config &mconfig, device_type type, std::string tag) + x1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"x1_cpu"), m_cassette(*this, "cassette"), diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h index b80dfa5d88a..f1aee48d2f0 100644 --- a/src/mame/includes/x68k.h +++ b/src/mame/includes/x68k.h @@ -48,7 +48,7 @@ public: TIMER_X68K_ADPCM }; - x68k_state(const machine_config &mconfig, device_type type, std::string tag) + x68k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_okim6258(*this, "okim6258"), diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index 4bfda55531a..ad7c14cfdb9 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -3,7 +3,7 @@ class xain_state : public driver_device { public: - xain_state(const machine_config &mconfig, device_type type, std::string tag) + xain_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/xbox.h b/src/mame/includes/xbox.h index 30e2d41e3e1..ea4db5c7db4 100644 --- a/src/mame/includes/xbox.h +++ b/src/mame/includes/xbox.h @@ -207,7 +207,7 @@ private: class xbox_base_state : public driver_device { public: - xbox_base_state(const machine_config &mconfig, device_type type, std::string tag) : + xbox_base_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), nvidia_nv2a(nullptr), debug_irq_active(false), diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h index 90e3ec79a60..cbac30d79da 100644 --- a/src/mame/includes/xerox820.h +++ b/src/mame/includes/xerox820.h @@ -44,7 +44,7 @@ class xerox820_state : public driver_device { public: - xerox820_state(const machine_config &mconfig, device_type type, std::string tag) : + xerox820_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_kbpio(*this, Z80PIO_KB_TAG), @@ -118,7 +118,7 @@ public: class bigboard_state : public xerox820_state { public: - bigboard_state(const machine_config &mconfig, device_type type, std::string tag) + bigboard_state(const machine_config &mconfig, device_type type, const char *tag) : xerox820_state(mconfig, type, tag), m_beeper(*this, "beeper") { } @@ -137,7 +137,7 @@ public: class xerox820ii_state : public xerox820_state { public: - xerox820ii_state(const machine_config &mconfig, device_type type, std::string tag) : + xerox820ii_state(const machine_config &mconfig, device_type type, const char *tag) : xerox820_state(mconfig, type, tag), m_speaker(*this, "speaker"), m_sasibus(*this, SASIBUS_TAG) diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index 588a863d4c7..9cf2b53ae37 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -19,7 +19,7 @@ class xexex_state : public driver_device { public: - xexex_state(const machine_config &mconfig, device_type type, std::string tag) + xexex_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_workram(*this, "workram"), m_spriteram(*this, "spriteram"), diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index f285eed9bde..d7bdceb6a65 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -9,7 +9,7 @@ class xmen_state : public driver_device { public: - xmen_state(const machine_config &mconfig, device_type type, std::string tag) + xmen_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_xmen6p_spriteramleft(*this, "spriteramleft"), m_xmen6p_spriteramright(*this, "spriteramright"), diff --git a/src/mame/includes/xor100.h b/src/mame/includes/xor100.h index 384d312d1e4..8229a479044 100644 --- a/src/mame/includes/xor100.h +++ b/src/mame/includes/xor100.h @@ -31,7 +31,7 @@ class xor100_state : public driver_device { public: - xor100_state(const machine_config &mconfig, device_type type, std::string tag) + xor100_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_dbrg(*this, COM5016_TAG), diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index 75a6b53030f..bccde997aeb 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -5,7 +5,7 @@ class xorworld_state : public driver_device { public: - xorworld_state(const machine_config &mconfig, device_type type, std::string tag) + xorworld_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h index 60a6298cba3..0ef1763792e 100644 --- a/src/mame/includes/xxmissio.h +++ b/src/mame/includes/xxmissio.h @@ -3,7 +3,7 @@ class xxmissio_state : public driver_device { public: - xxmissio_state(const machine_config &mconfig, device_type type, std::string tag) + xxmissio_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h index c7f2cb27106..7a039c8805d 100644 --- a/src/mame/includes/xybots.h +++ b/src/mame/includes/xybots.h @@ -13,7 +13,7 @@ class xybots_state : public atarigen_state { public: - xybots_state(const machine_config &mconfig, device_type type, std::string tag) + xybots_state(const machine_config &mconfig, device_type type, const char *tag) : atarigen_state(mconfig, type, tag), m_jsa(*this, "jsa"), m_playfield_tilemap(*this, "playfield"), diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index 35bd02f89ba..8fd3aa576c1 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -3,7 +3,7 @@ class xyonix_state : public driver_device { public: - xyonix_state(const machine_config &mconfig, device_type type, std::string tag) + xyonix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h index 8ec25e449e6..1c495709603 100644 --- a/src/mame/includes/yiear.h +++ b/src/mame/includes/yiear.h @@ -6,7 +6,7 @@ class yiear_state : public driver_device { public: - yiear_state(const machine_config &mconfig, device_type type, std::string tag) + yiear_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index d6497417ad1..0e21a85b962 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -9,7 +9,7 @@ class yunsun16_state : public driver_device { public: - yunsun16_state(const machine_config &mconfig, device_type type, std::string tag) + yunsun16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index f45698d4e35..9fb440e8d9a 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -10,7 +10,7 @@ class yunsung8_state : public driver_device { public: - yunsung8_state(const machine_config &mconfig, device_type type, std::string tag) + yunsung8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu") , m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h index 7ba2d826ece..b6d77971981 100644 --- a/src/mame/includes/z80ne.h +++ b/src/mame/includes/z80ne.h @@ -67,7 +67,7 @@ struct wd17xx_state_t { class z80ne_state : public driver_device { public: - z80ne_state(const machine_config &mconfig, device_type type, std::string tag) + z80ne_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vdg(*this, "mc6847"), m_videoram(*this, "videoram"), diff --git a/src/mame/includes/z88.h b/src/mame/includes/z88.h index 20d3942eaaa..7ce8cbd7e75 100644 --- a/src/mame/includes/z88.h +++ b/src/mame/includes/z88.h @@ -45,7 +45,7 @@ enum class z88_state : public driver_device { public: - z88_state(const machine_config &mconfig, device_type type, std::string tag) + z88_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index 74152c79a21..e4d91c83f90 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -5,7 +5,7 @@ class zac2650_state : public driver_device { public: - zac2650_state(const machine_config &mconfig, device_type type, std::string tag) + zac2650_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_s2636(*this, "s2636"), diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h index c35151091a6..8371e6b6fb0 100644 --- a/src/mame/includes/zaccaria.h +++ b/src/mame/includes/zaccaria.h @@ -7,7 +7,7 @@ class zaccaria_state : public driver_device { public: - zaccaria_state(const machine_config &mconfig, device_type type, std::string tag) + zaccaria_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audio2(*this, "audio2"), diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index c7f34e6ea75..e5942968e44 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -10,7 +10,7 @@ class zaxxon_state : public driver_device { public: - zaxxon_state(const machine_config &mconfig, device_type type, std::string tag) + zaxxon_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h index a0686927722..b6f51039a7f 100644 --- a/src/mame/includes/zerozone.h +++ b/src/mame/includes/zerozone.h @@ -12,7 +12,7 @@ class zerozone_state : public driver_device { public: - zerozone_state(const machine_config &mconfig, device_type type, std::string tag) + zerozone_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h index 4675c99dc48..2497ecb3651 100644 --- a/src/mame/includes/zodiack.h +++ b/src/mame/includes/zodiack.h @@ -6,7 +6,7 @@ class zodiack_state : public driver_device { public: - zodiack_state(const machine_config &mconfig, device_type type, std::string tag) + zodiack_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/includes/zx.h b/src/mame/includes/zx.h index 52d48a0858c..20ccaa5d1c6 100644 --- a/src/mame/includes/zx.h +++ b/src/mame/includes/zx.h @@ -21,7 +21,7 @@ class zx_state : public driver_device { public: - zx_state(const machine_config &mconfig, device_type type, std::string tag) + zx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), diff --git a/src/mame/machine/315-5838_317-0229_comp.cpp b/src/mame/machine/315-5838_317-0229_comp.cpp index 5f19de4fd55..cfd38aa7c88 100644 --- a/src/mame/machine/315-5838_317-0229_comp.cpp +++ b/src/mame/machine/315-5838_317-0229_comp.cpp @@ -40,7 +40,7 @@ extern const device_type SEGA315_5838_COMP = &device_creator; -sega_315_5881_crypt_device::sega_315_5881_crypt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega_315_5881_crypt_device::sega_315_5881_crypt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA315_5881_CRYPT, "Sega 315-5881 Encryption", tag, owner, clock, "sega315_5881", __FILE__) { } @@ -52,7 +52,7 @@ void sega_315_5881_crypt_device::device_start() key = strtoll(skey.c_str(), nullptr, 16); else { - logerror("%s: Warning: key not provided\n", tag().c_str()); + logerror("%s: Warning: key not provided\n", tag()); key = 0; } } diff --git a/src/mame/machine/315-5881_crypt.h b/src/mame/machine/315-5881_crypt.h index d91ee802def..8c8c4739af1 100644 --- a/src/mame/machine/315-5881_crypt.h +++ b/src/mame/machine/315-5881_crypt.h @@ -18,7 +18,7 @@ class sega_315_5881_crypt_device : public device_t { public: // construction/destruction - sega_315_5881_crypt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_315_5881_crypt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); UINT16 do_decrypt(UINT8 *&base); diff --git a/src/mame/machine/315_5296.cpp b/src/mame/machine/315_5296.cpp index 6588c2c17e9..34aa0da1d22 100644 --- a/src/mame/machine/315_5296.cpp +++ b/src/mame/machine/315_5296.cpp @@ -31,7 +31,7 @@ const device_type SEGA_315_5296 = &device_creator; // sega_315_5296_device - constructor //------------------------------------------------- -sega_315_5296_device::sega_315_5296_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega_315_5296_device::sega_315_5296_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGA_315_5296, "Sega 315-5296 I/O", tag, owner, clock, "315_5296", __FILE__), m_in_pa_cb(*this), m_in_pb_cb(*this), diff --git a/src/mame/machine/315_5296.h b/src/mame/machine/315_5296.h index 2dacf1122c4..b28b465b573 100644 --- a/src/mame/machine/315_5296.h +++ b/src/mame/machine/315_5296.h @@ -72,7 +72,7 @@ class sega_315_5296_device : public device_t { public: - sega_315_5296_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_315_5296_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast(device).m_in_pa_cb.set_callback(object); } diff --git a/src/mame/machine/6883sam.cpp b/src/mame/machine/6883sam.cpp index b6e92371182..c3ce94e0fc6 100644 --- a/src/mame/machine/6883sam.cpp +++ b/src/mame/machine/6883sam.cpp @@ -70,8 +70,9 @@ const device_type SAM6883 = &device_creator; // ctor //------------------------------------------------- -sam6883_device::sam6883_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sam6883_device::sam6883_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SAM6883, "SAM6883", tag, owner, clock, "sam6883", __FILE__), + m_cpu_tag(nullptr), m_cpu_space_ref(AS_PROGRAM), m_read_res(*this), m_space_0000(*this), diff --git a/src/mame/machine/6883sam.h b/src/mame/machine/6883sam.h index f29b24b73b2..c0089c2bcb3 100644 --- a/src/mame/machine/6883sam.h +++ b/src/mame/machine/6883sam.h @@ -87,11 +87,11 @@ protected: class sam6883_device : public device_t, public sam6883_friend_device { public: - sam6883_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sam6883_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_res_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_res.set_callback(object); } - static void configure_cpu(device_t &device, std::string tag, address_spacenum space) + static void configure_cpu(device_t &device, const char *tag, address_spacenum space) { sam6883_device &dev = downcast(device); dev.m_cpu_tag = tag; @@ -169,7 +169,7 @@ private: void point_specific_bank(const sam_bank *bank, UINT16 offset, UINT16 mask, memory_bank *&memory_bank, INT32 addrstart, INT32 addrend, bool is_write); }; - std::string m_cpu_tag; + const char * m_cpu_tag; address_spacenum m_cpu_space_ref; // incidentals diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp index cd6ca08ec59..07cc653fc2e 100644 --- a/src/mame/machine/abc1600mac.cpp +++ b/src/mame/machine/abc1600mac.cpp @@ -105,7 +105,7 @@ const rom_entry *abc1600_mac_device::device_rom_region() const // abc1600_mac_device - constructor //------------------------------------------------- -abc1600_mac_device::abc1600_mac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +abc1600_mac_device::abc1600_mac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC1600_MAC, "ABC 1600 MAC", tag, owner, clock, "abc1600mac", __FILE__), device_memory_interface(mconfig, *this), m_space_config("program", ENDIANNESS_LITTLE, 8, 22, 0, *ADDRESS_MAP_NAME(program_map)), diff --git a/src/mame/machine/abc1600mac.h b/src/mame/machine/abc1600mac.h index 089f44d019e..2489d8744d9 100644 --- a/src/mame/machine/abc1600mac.h +++ b/src/mame/machine/abc1600mac.h @@ -45,7 +45,7 @@ class abc1600_mac_device : public device_t, public device_memory_interface { public: - abc1600_mac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + abc1600_mac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/mame/machine/abc80kb.cpp b/src/mame/machine/abc80kb.cpp index 4c48edb2fa1..dd9471f5ee4 100644 --- a/src/mame/machine/abc80kb.cpp +++ b/src/mame/machine/abc80kb.cpp @@ -167,7 +167,7 @@ ioport_constructor abc80_keyboard_device::device_input_ports() const // abc80_keyboard_device - constructor //------------------------------------------------- -abc80_keyboard_device::abc80_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +abc80_keyboard_device::abc80_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC80_KEYBOARD, "ABC-80 Keyboard", tag, owner, clock, "abc80kb", __FILE__), m_write_keydown(*this), m_maincpu(*this, I8048_TAG) diff --git a/src/mame/machine/abc80kb.h b/src/mame/machine/abc80kb.h index a884f5a9987..7de08733a35 100644 --- a/src/mame/machine/abc80kb.h +++ b/src/mame/machine/abc80kb.h @@ -43,7 +43,7 @@ class abc80_keyboard_device : public device_t { public: // construction/destruction - abc80_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + abc80_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_keydown_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_keydown.set_callback(object); } diff --git a/src/mame/machine/alpha8201.cpp b/src/mame/machine/alpha8201.cpp index f510355d321..88813b1be9f 100644 --- a/src/mame/machine/alpha8201.cpp +++ b/src/mame/machine/alpha8201.cpp @@ -282,7 +282,7 @@ const device_type ALPHA_8201 = &device_creator; // alpha_8201_device - constructor //------------------------------------------------- -alpha_8201_device::alpha_8201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +alpha_8201_device::alpha_8201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ALPHA_8201, "ALPHA-8201", tag, owner, clock, "alpha8201", __FILE__), m_mcu(*this, "mcu") { @@ -369,7 +369,7 @@ READ8_MEMBER(alpha_8201_device::mcu_data_r) if (m_bus && ~m_mcu_d & 4) ret = m_shared_ram[m_mcu_address]; else - logerror("%s: MCU side invalid read\n", tag().c_str()); + logerror("%s: MCU side invalid read\n", tag()); if (offset == HMCS40_PORT_R0X) ret >>= 4; diff --git a/src/mame/machine/alpha8201.h b/src/mame/machine/alpha8201.h index 18dac686ce0..1db8eb64a3a 100644 --- a/src/mame/machine/alpha8201.h +++ b/src/mame/machine/alpha8201.h @@ -14,7 +14,7 @@ class alpha_8201_device : public device_t { public: - alpha_8201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + alpha_8201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~alpha_8201_device() {} DECLARE_READ8_MEMBER(mcu_data_r); diff --git a/src/mame/machine/amigakbd.cpp b/src/mame/machine/amigakbd.cpp index b0c76a69925..e760cb7de47 100644 --- a/src/mame/machine/amigakbd.cpp +++ b/src/mame/machine/amigakbd.cpp @@ -260,7 +260,7 @@ ioport_constructor amigakbd_device::device_input_ports() const // amigakbd_device - constructor //------------------------------------------------- -amigakbd_device::amigakbd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +amigakbd_device::amigakbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, AMIGAKBD, "Amiga 500 Keyboard with 6570-036 MPU", tag, owner, clock, "amigakbd", __FILE__), m_write_kclk(*this), m_write_kdat(*this), diff --git a/src/mame/machine/amigakbd.h b/src/mame/machine/amigakbd.h index 09ef4835bb9..ae7f7f633cb 100644 --- a/src/mame/machine/amigakbd.h +++ b/src/mame/machine/amigakbd.h @@ -42,7 +42,7 @@ class amigakbd_device : public device_t { public: // construction/destruction - amigakbd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + amigakbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_kclk_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_kclk.set_callback(object); } diff --git a/src/mame/machine/amstrad.cpp b/src/mame/machine/amstrad.cpp index 7db2f7aef59..3e89d234271 100644 --- a/src/mame/machine/amstrad.cpp +++ b/src/mame/machine/amstrad.cpp @@ -1101,7 +1101,7 @@ UINT32 amstrad_state::screen_update_amstrad(screen_device &screen, bitmap_ind16 /* traverses the daisy-chain of expansion devices, looking for the specified device */ -static device_t* get_expansion_device(running_machine &machine, std::string tag) +static device_t* get_expansion_device(running_machine &machine, const char* tag) { amstrad_state *state = machine.driver_data(); cpc_expansion_slot_device* exp_port = state->m_exp; diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp index b7dd555b6bd..68e6e53b75c 100644 --- a/src/mame/machine/apollo.cpp +++ b/src/mame/machine/apollo.cpp @@ -127,7 +127,7 @@ INPUT_PORTS_END class apollo_config_device : public device_t { public: - apollo_config_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + apollo_config_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_config_complete() override; @@ -141,7 +141,7 @@ extern const device_type APOLLO_CONF; const device_type APOLLO_CONF = &device_creator; -apollo_config_device::apollo_config_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +apollo_config_device::apollo_config_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, APOLLO_CONF, "Apollo Configuration", tag, owner, clock, "apollo_config", __FILE__) { } @@ -724,7 +724,7 @@ TIMER_CALLBACK_MEMBER( apollo_state::apollo_rtc_timer ) #undef VERBOSE #define VERBOSE 0 -apollo_sio::apollo_sio(const machine_config &mconfig, std::string tag, +apollo_sio::apollo_sio(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : mc68681_device(mconfig, tag, owner, clock), m_csrb(0), @@ -880,7 +880,7 @@ const device_type APOLLO_NI = &device_creator ; // apollo_ni - constructor //------------------------------------------------- -apollo_ni::apollo_ni(const machine_config &mconfig, std::string tag, +apollo_ni::apollo_ni(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, APOLLO_NI, "Node ID", tag, owner, clock, "node_id", __FILE__), device_image_interface(mconfig, *this) @@ -1288,7 +1288,7 @@ const device_type APOLLO_STDIO = &device_creator ; //------------------------------------------------- apollo_stdio_device::apollo_stdio_device(const machine_config &mconfig, - std::string tag, device_t *owner, UINT32 clock) : + const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, APOLLO_STDIO, "Apollo STDIO", tag, owner, clock, "apollo_stdio", __FILE__), device_serial_interface(mconfig, *this), m_tx_w(*this) diff --git a/src/mame/machine/apollo_kbd.cpp b/src/mame/machine/apollo_kbd.cpp index dfbd46300c5..b6cbef1d429 100644 --- a/src/mame/machine/apollo_kbd.cpp +++ b/src/mame/machine/apollo_kbd.cpp @@ -61,7 +61,7 @@ const device_type APOLLO_KBD = &device_creator; // apollo_kbd_device - constructor //------------------------------------------------- -apollo_kbd_device::apollo_kbd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +apollo_kbd_device::apollo_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, APOLLO_KBD, "Apollo Keyboard", tag, owner, clock, "apollo_kbd", __FILE__), device_serial_interface(mconfig, *this), m_tx_w(*this), @@ -148,8 +148,8 @@ const char *apollo_kbd_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().c_str(), - cpu->safe_pcbase(), tag().c_str()); + sprintf(statebuf, "%d.%03d %s pc=%08x - %s", s, ms, cpu->tag(), + cpu->safe_pcbase(), tag()); } else { diff --git a/src/mame/machine/apollo_kbd.h b/src/mame/machine/apollo_kbd.h index 16ad535c2aa..4b5cc91a9af 100644 --- a/src/mame/machine/apollo_kbd.h +++ b/src/mame/machine/apollo_kbd.h @@ -47,7 +47,7 @@ class apollo_kbd_device : public device_t, public device_serial_interface { public: // construction/destruction - apollo_kbd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + apollo_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_tx_cb(device_t &device, _Object object) { return downcast(device).m_tx_w.set_callback(object); } template static devcb_base &set_german_cb(device_t &device, _Object object) { return downcast(device).m_german_r.set_callback(object); } diff --git a/src/mame/machine/appldriv.cpp b/src/mame/machine/appldriv.cpp index a5a574a7e36..139da446140 100644 --- a/src/mame/machine/appldriv.cpp +++ b/src/mame/machine/appldriv.cpp @@ -297,7 +297,7 @@ const device_type FLOPPY_APPLE = &device_creator; // apple525_floppy_image_device - constructor //------------------------------------------------- -apple525_floppy_image_device::apple525_floppy_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +apple525_floppy_image_device::apple525_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : legacy_floppy_image_device(mconfig, FLOPPY_APPLE, "Apple Disk II", tag, owner, clock, "floppy_apple", __FILE__) { } diff --git a/src/mame/machine/appldriv.h b/src/mame/machine/appldriv.h index 73da8d85af2..4ab7ea18479 100644 --- a/src/mame/machine/appldriv.h +++ b/src/mame/machine/appldriv.h @@ -27,7 +27,7 @@ class apple525_floppy_image_device : public legacy_floppy_image_device { public: // construction/destruction - apple525_floppy_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + apple525_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual bool call_load() override; virtual void call_unload() override; diff --git a/src/mame/machine/applefdc.cpp b/src/mame/machine/applefdc.cpp index 399a951ea25..014546b0f85 100644 --- a/src/mame/machine/applefdc.cpp +++ b/src/mame/machine/applefdc.cpp @@ -105,7 +105,7 @@ enum // ctor //------------------------------------------------- -applefdc_base_device::applefdc_base_device(applefdc_base_device::applefdc_t fdc_type, const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +applefdc_base_device::applefdc_base_device(applefdc_base_device::applefdc_t fdc_type, const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { m_type = fdc_type; @@ -567,7 +567,7 @@ UINT8 applefdc_base_device::get_lines() const device_type APPLEFDC = &device_creator; -applefdc_device::applefdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +applefdc_device::applefdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : applefdc_base_device(APPLEFDC_APPLE2, mconfig, APPLEFDC, "Apple FDC", tag, owner, clock, "apple_fdc", __FILE__) { } @@ -580,7 +580,7 @@ applefdc_device::applefdc_device(const machine_config &mconfig, std::string tag, const device_type IWM = &device_creator; -iwm_device::iwm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iwm_device::iwm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : applefdc_base_device(APPLEFDC_IWM, mconfig, IWM, "Apple IWM (Integrated Woz Machine)", tag, owner, clock, "iwm", __FILE__) { } diff --git a/src/mame/machine/applefdc.h b/src/mame/machine/applefdc.h index b027c904bc8..6e02ddc87b2 100644 --- a/src/mame/machine/applefdc.h +++ b/src/mame/machine/applefdc.h @@ -81,7 +81,7 @@ protected: }; // constructor - applefdc_base_device(applefdc_t fdc_type, const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + applefdc_base_device(applefdc_t fdc_type, const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; @@ -122,7 +122,7 @@ private: class applefdc_device : public applefdc_base_device { public: - applefdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + applefdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; @@ -134,7 +134,7 @@ public: class iwm_device : public applefdc_base_device { public: - iwm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + iwm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/mame/machine/apricotkb.cpp b/src/mame/machine/apricotkb.cpp index de72cb013bc..6ceb0d6ba4d 100644 --- a/src/mame/machine/apricotkb.cpp +++ b/src/mame/machine/apricotkb.cpp @@ -245,7 +245,7 @@ ioport_constructor apricot_keyboard_device::device_input_ports() const // apricot_keyboard_device - constructor //------------------------------------------------- -apricot_keyboard_device::apricot_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +apricot_keyboard_device::apricot_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, APRICOT_KEYBOARD, "Apricot Keyboard", tag, owner, clock, "aprikb", __FILE__), m_write_txd(*this), m_y0(*this, "Y0"), diff --git a/src/mame/machine/apricotkb.h b/src/mame/machine/apricotkb.h index 23ceba403ec..01f5a7f451f 100644 --- a/src/mame/machine/apricotkb.h +++ b/src/mame/machine/apricotkb.h @@ -42,7 +42,7 @@ class apricot_keyboard_device : public device_t { public: // construction/destruction - apricot_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + apricot_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_txd_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_txd.set_callback(object); } diff --git a/src/mame/machine/apricotkb_hle.cpp b/src/mame/machine/apricotkb_hle.cpp index 691fed14007..7bf5531454c 100644 --- a/src/mame/machine/apricotkb_hle.cpp +++ b/src/mame/machine/apricotkb_hle.cpp @@ -188,7 +188,7 @@ ioport_constructor apricot_keyboard_hle_device::device_input_ports() const // apricot_keyboard_hle_device - constructor //------------------------------------------------- -apricot_keyboard_hle_device::apricot_keyboard_hle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +apricot_keyboard_hle_device::apricot_keyboard_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, APRICOT_KEYBOARD_HLE, "Apricot Keyboard (HLE)", tag, owner, clock, "apricotkb_hle", __FILE__), device_serial_interface(mconfig, *this), m_txd_handler(*this), diff --git a/src/mame/machine/apricotkb_hle.h b/src/mame/machine/apricotkb_hle.h index 841dba516e8..5a5189c9247 100644 --- a/src/mame/machine/apricotkb_hle.h +++ b/src/mame/machine/apricotkb_hle.h @@ -34,7 +34,7 @@ class apricot_keyboard_hle_device : public device_t, public device_serial_interf { public: // construction/destruction - apricot_keyboard_hle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + apricot_keyboard_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast(device).m_txd_handler.set_callback(object); } diff --git a/src/mame/machine/arkanoid.cpp b/src/mame/machine/arkanoid.cpp index 217d96b6e74..323c183cb90 100644 --- a/src/mame/machine/arkanoid.cpp +++ b/src/mame/machine/arkanoid.cpp @@ -223,8 +223,8 @@ CUSTOM_INPUT_MEMBER(arkanoid_state::arkanoid_68705_input_r) CUSTOM_INPUT_MEMBER(arkanoid_state::arkanoid_input_mux) { - const char * tag1 = (const char *)param; - const char * tag2 = tag1 + strlen(tag1) + 1; + const char *tag1 = (const char *)param; + const char *tag2 = tag1 + strlen(tag1) + 1; return ioport((m_paddle_select == 0) ? tag1 : tag2)->read(); } diff --git a/src/mame/machine/asic65.cpp b/src/mame/machine/asic65.cpp index 391ee6a462d..3ad34f5e32a 100644 --- a/src/mame/machine/asic65.cpp +++ b/src/mame/machine/asic65.cpp @@ -84,7 +84,7 @@ static const UINT8 command_map[3][MAX_COMMANDS] = const device_type ASIC65 = &device_creator; -asic65_device::asic65_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +asic65_device::asic65_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASIC65, "Atari ASIC65", tag, owner, clock, "asic65", __FILE__), m_asic65_type(0), m_command(0), diff --git a/src/mame/machine/asic65.h b/src/mame/machine/asic65.h index 78a5944e7c5..c5f094461a2 100644 --- a/src/mame/machine/asic65.h +++ b/src/mame/machine/asic65.h @@ -18,7 +18,7 @@ class asic65_device : public device_t { public: - asic65_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + asic65_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // (static) configuration helpers static void set_type(device_t &device, int type) { downcast(device).m_asic65_type = type; } diff --git a/src/mame/machine/atari_vg.cpp b/src/mame/machine/atari_vg.cpp index 6eec0d6a87c..c7d8d514817 100644 --- a/src/mame/machine/atari_vg.cpp +++ b/src/mame/machine/atari_vg.cpp @@ -41,7 +41,7 @@ const device_type ATARIVGEAROM = &device_creator; // atari_vg_earom_device - constructor //------------------------------------------------- -atari_vg_earom_device::atari_vg_earom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_vg_earom_device::atari_vg_earom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ATARIVGEAROM, "Atari VG EAROM", tag, owner, clock, "atari_vg_earom", __FILE__), device_nvram_interface(mconfig, *this) { diff --git a/src/mame/machine/atari_vg.h b/src/mame/machine/atari_vg.h index c1a3e90e160..3d7aba7b440 100644 --- a/src/mame/machine/atari_vg.h +++ b/src/mame/machine/atari_vg.h @@ -26,7 +26,7 @@ class atari_vg_earom_device : public device_t, { public: // construction/destruction - atari_vg_earom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_vg_earom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; diff --git a/src/mame/machine/atarifdc.cpp b/src/mame/machine/atarifdc.cpp index 246db4a4d43..13505910f30 100644 --- a/src/mame/machine/atarifdc.cpp +++ b/src/mame/machine/atarifdc.cpp @@ -754,7 +754,7 @@ legacy_floppy_image_device *atari_fdc_device::atari_floppy_get_device_child(int const device_type ATARI_FDC = &device_creator; -atari_fdc_device::atari_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_fdc_device::atari_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ATARI_FDC, "Atari FDC", tag, owner, clock, "atari_fdc", __FILE__), m_serout_count(0), m_serout_offs(0), diff --git a/src/mame/machine/atarifdc.h b/src/mame/machine/atarifdc.h index 14ac20eaa1d..4c41c7b745a 100644 --- a/src/mame/machine/atarifdc.h +++ b/src/mame/machine/atarifdc.h @@ -13,7 +13,7 @@ class atari_fdc_device : public device_t { public: - atari_fdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER( serin_r ); DECLARE_WRITE8_MEMBER( serout_w ); diff --git a/src/mame/machine/atarigen.cpp b/src/mame/machine/atarigen.cpp index 653f88b2f82..05127cb1edd 100644 --- a/src/mame/machine/atarigen.cpp +++ b/src/mame/machine/atarigen.cpp @@ -43,7 +43,7 @@ inline const atarigen_screen_timer *get_screen_timer(screen_device &screen) if (state->m_screen_timer[i].screen == &screen) return &state->m_screen_timer[i]; - fatalerror("Unexpected: no atarivc_eof_update_timer for screen '%s'\n", screen.tag().c_str()); + fatalerror("Unexpected: no atarivc_eof_update_timer for screen '%s'\n", screen.tag()); return nullptr; } @@ -60,8 +60,9 @@ const device_type ATARI_SOUND_COMM = &device_creator; // atari_sound_comm_device - constructor //------------------------------------------------- -atari_sound_comm_device::atari_sound_comm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_sound_comm_device::atari_sound_comm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ATARI_SOUND_COMM, "Atari Sound Communications", tag, owner, clock, "atarscom", __FILE__), + m_sound_cpu_tag(nullptr), m_main_int_cb(*this), m_sound_cpu(nullptr), m_main_to_sound_ready(false), @@ -352,7 +353,7 @@ const device_type ATARI_VAD = &device_creator; // atari_vad_device - constructor //------------------------------------------------- -atari_vad_device::atari_vad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_vad_device::atari_vad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ATARI_VAD, "Atari VAD", tag, owner, clock, "atarivad", __FILE__), device_video_interface(mconfig, *this), m_scanline_int_cb(*this), @@ -830,7 +831,7 @@ const device_type ATARI_EEPROM_2816 = &device_creator; // atari_eeprom_device - constructor //------------------------------------------------- -atari_eeprom_device::atari_eeprom_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file) +atari_eeprom_device::atari_eeprom_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file) : device_t(mconfig, devtype, name, tag, owner, 0, shortname, file), m_eeprom(*this, "eeprom"), m_unlocked(false) @@ -897,7 +898,7 @@ void atari_eeprom_device::device_reset() // atari_eeprom_2804_device - constructor //------------------------------------------------- -atari_eeprom_2804_device::atari_eeprom_2804_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_eeprom_2804_device::atari_eeprom_2804_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : atari_eeprom_device(mconfig, ATARI_EEPROM_2804, "Atari EEPROM Interface (2804)", tag, owner, "atari2804", __FILE__) { } @@ -922,7 +923,7 @@ machine_config_constructor atari_eeprom_2804_device::device_mconfig_additions() // atari_eeprom_2816_device - constructor //------------------------------------------------- -atari_eeprom_2816_device::atari_eeprom_2816_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_eeprom_2816_device::atari_eeprom_2816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : atari_eeprom_device(mconfig, ATARI_EEPROM_2816, "Atari EEPROM Interface (2816)", tag, owner, "atari2816", __FILE__) { } @@ -948,7 +949,7 @@ machine_config_constructor atari_eeprom_2816_device::device_mconfig_additions() OVERALL INIT ***************************************************************************/ -atarigen_state::atarigen_state(const machine_config &mconfig, device_type type, std::string tag) +atarigen_state::atarigen_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_earom(*this, "earom"), m_earom_data(0), diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index 072d0a8f925..5010057ca00 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -111,7 +111,7 @@ class atari_sound_comm_device : public device_t { public: // construction/destruction - atari_sound_comm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_sound_comm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers static void static_set_sound_cpu(device_t &device, const char *cputag); @@ -184,7 +184,7 @@ class atari_vad_device : public device_t, { public: // construction/destruction - atari_vad_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_vad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &static_set_scanline_int_cb(device_t &device, _Object object) { return downcast(device).m_scanline_int_cb.set_callback(object); } @@ -265,7 +265,7 @@ class atari_eeprom_device : public device_t { protected: // construction/destruction - atari_eeprom_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file); + atari_eeprom_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file); public: // unlock controls @@ -296,7 +296,7 @@ class atari_eeprom_2804_device : public atari_eeprom_device { public: // construction/destruction - atari_eeprom_2804_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_eeprom_2804_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides @@ -307,7 +307,7 @@ class atari_eeprom_2816_device : public atari_eeprom_device { public: // construction/destruction - atari_eeprom_2816_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_eeprom_2816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides @@ -332,7 +332,7 @@ class atarigen_state : public driver_device { public: // construction/destruction - atarigen_state(const machine_config &mconfig, device_type type, std::string tag); + atarigen_state(const machine_config &mconfig, device_type type, const char *tag); // users must call through to these virtual void machine_start() override; diff --git a/src/mame/machine/awboard.cpp b/src/mame/machine/awboard.cpp index 29c2bd44960..2e80cb8bf04 100644 --- a/src/mame/machine/awboard.cpp +++ b/src/mame/machine/awboard.cpp @@ -164,7 +164,7 @@ DEVICE_ADDRESS_MAP_START(submap, 16, aw_rom_board) AM_RANGE(0x40, 0x41) AM_READWRITE(pio_r, pio_w) ADDRESS_MAP_END -aw_rom_board::aw_rom_board(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +aw_rom_board::aw_rom_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : naomi_g1_device(mconfig, AW_ROM_BOARD, "Sammy Atomiswave ROM Board", tag, owner, clock, "aw_rom_board", __FILE__) { keyregion = nullptr; @@ -256,7 +256,7 @@ UINT16 aw_rom_board::decrypt(UINT16 cipherText, UINT32 address, const UINT32 key void aw_rom_board::set_key() { if(!m_region) - throw emu_fatalerror("AW-ROM-BOARD: region %s is missing\n", tag().c_str()); + throw emu_fatalerror("AW-ROM-BOARD: region %s is missing\n", tag()); if(!keyregion) return; diff --git a/src/mame/machine/awboard.h b/src/mame/machine/awboard.h index 12f1968ea60..4e531523856 100644 --- a/src/mame/machine/awboard.h +++ b/src/mame/machine/awboard.h @@ -12,7 +12,7 @@ class aw_rom_board : public naomi_g1_device { public: - aw_rom_board(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + aw_rom_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_keyregion(device_t &device, const char *_keyregion); diff --git a/src/mame/machine/bbc.cpp b/src/mame/machine/bbc.cpp index 79e63346e5b..d82f4fdd827 100644 --- a/src/mame/machine/bbc.cpp +++ b/src/mame/machine/bbc.cpp @@ -1661,7 +1661,7 @@ DRIVER_INIT_MEMBER(bbc_state,bbc) void bbc_state::bbc_setup_banks(memory_bank *membank, int banks, UINT32 shift, UINT32 size) { std::string region_tag; - memory_region *tmp_reg = nullptr; + memory_region *tmp_reg; UINT8 *eprom[4]; if (m_exp1 && (tmp_reg = memregion(region_tag.assign(m_exp1->tag()).append(GENERIC_ROM_REGION_TAG).c_str()))) eprom[0] = tmp_reg->base() + shift; @@ -1695,7 +1695,7 @@ void bbc_state::bbc_setup_banks(memory_bank *membank, int banks, UINT32 shift, U void bbc_state::bbcm_setup_banks(memory_bank *membank, int banks, UINT32 shift, UINT32 size) { std::string region_tag; - memory_region *tmp_reg = nullptr; + memory_region *tmp_reg; UINT8 *eprom[2]; if (m_exp1 && (tmp_reg = memregion(region_tag.assign(m_exp1->tag()).append(GENERIC_ROM_REGION_TAG).c_str()))) eprom[0] = tmp_reg->base() + shift; diff --git a/src/mame/machine/beta.cpp b/src/mame/machine/beta.cpp index a8f787e98dd..ef9ec771805 100644 --- a/src/mame/machine/beta.cpp +++ b/src/mame/machine/beta.cpp @@ -26,7 +26,7 @@ BUGS: const device_type BETA_DISK = &device_creator; -beta_disk_device::beta_disk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +beta_disk_device::beta_disk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BETA_DISK, "Beta Disk Interface", tag, owner, clock, "betadisk", __FILE__) , m_betadisk_active(0) , m_wd179x(*this, "wd179x") diff --git a/src/mame/machine/beta.h b/src/mame/machine/beta.h index fcd8ddf11d8..af5b2132e14 100644 --- a/src/mame/machine/beta.h +++ b/src/mame/machine/beta.h @@ -20,7 +20,7 @@ class beta_disk_device : public device_t { public: - beta_disk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + beta_disk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~beta_disk_device() {} DECLARE_READ8_MEMBER(status_r); diff --git a/src/mame/machine/bfm_bd1.cpp b/src/mame/machine/bfm_bd1.cpp index e4398d66ac6..78132ae5acf 100644 --- a/src/mame/machine/bfm_bd1.cpp +++ b/src/mame/machine/bfm_bd1.cpp @@ -101,7 +101,7 @@ static const UINT16 BD1charset[]= 0x4406, // 0100 0100 0000 0110 ? }; -bfm_bd1_t::bfm_bd1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +bfm_bd1_t::bfm_bd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BFM_BD1, "BFM BD1 VFD controller", tag, owner, clock, "bfm_bd1", __FILE__), m_port_val(0) { diff --git a/src/mame/machine/bfm_bd1.h b/src/mame/machine/bfm_bd1.h index cce0eaf8289..70742e807f9 100644 --- a/src/mame/machine/bfm_bd1.h +++ b/src/mame/machine/bfm_bd1.h @@ -15,7 +15,7 @@ class bfm_bd1_t : public device_t { public: - bfm_bd1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + bfm_bd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers static void static_set_value(device_t &device, int val); diff --git a/src/mame/machine/bfm_bda.cpp b/src/mame/machine/bfm_bda.cpp index a2c5ca9b931..0984bf7ecab 100644 --- a/src/mame/machine/bfm_bda.cpp +++ b/src/mame/machine/bfm_bda.cpp @@ -83,7 +83,7 @@ static const UINT16 BDAcharset[]= 0x4406, // 0100 0100 0000 0110 ? }; -bfm_bda_t::bfm_bda_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +bfm_bda_t::bfm_bda_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BFM_BDA, "BFM BDA VFD controller", tag, owner, clock, "bfm_bda", __FILE__), m_port_val(0) { diff --git a/src/mame/machine/bfm_bda.h b/src/mame/machine/bfm_bda.h index 0b09548c60b..3570c478f81 100644 --- a/src/mame/machine/bfm_bda.h +++ b/src/mame/machine/bfm_bda.h @@ -15,7 +15,7 @@ class bfm_bda_t : public device_t { public: - bfm_bda_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + bfm_bda_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers static void static_set_value(device_t &device, int val); diff --git a/src/mame/machine/buggychl.cpp b/src/mame/machine/buggychl.cpp index a06bf0bf4ed..608189588f2 100644 --- a/src/mame/machine/buggychl.cpp +++ b/src/mame/machine/buggychl.cpp @@ -7,7 +7,7 @@ const device_type BUGGYCHL_MCU = &device_creator; -buggychl_mcu_device::buggychl_mcu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +buggychl_mcu_device::buggychl_mcu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BUGGYCHL_MCU, "M68705 MCU Simulation (Buggy Challenge)", tag, owner, clock, "buggychl_mcu", __FILE__), m_port_a_in(0), m_port_a_out(0), diff --git a/src/mame/machine/buggychl.h b/src/mame/machine/buggychl.h index cc4855527c6..7f7a3e7c1e8 100644 --- a/src/mame/machine/buggychl.h +++ b/src/mame/machine/buggychl.h @@ -3,7 +3,7 @@ class buggychl_mcu_device : public device_t { public: - buggychl_mcu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + buggychl_mcu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~buggychl_mcu_device() {} DECLARE_WRITE8_MEMBER( buggychl_mcu_w ); diff --git a/src/mame/machine/c117.cpp b/src/mame/machine/c117.cpp index 2527789a029..018fd21689b 100644 --- a/src/mame/machine/c117.cpp +++ b/src/mame/machine/c117.cpp @@ -33,11 +33,13 @@ const device_type NAMCO_C117 = &device_creator; // namco_c117_device - constructor //------------------------------------------------- -namco_c117_device::namco_c117_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_c117_device::namco_c117_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_C117, "Namco C117 MMU", tag, owner, clock, "namco_c117", __FILE__), device_memory_interface(mconfig, *this), m_subres_cb(*this), - m_program_config("program", ENDIANNESS_BIG, 8, 23) + m_program_config("program", ENDIANNESS_BIG, 8, 23), + m_maincpu_tag(nullptr), + m_subcpu_tag(nullptr) { } diff --git a/src/mame/machine/c117.h b/src/mame/machine/c117.h index 396211646b0..cc1b7aefc95 100644 --- a/src/mame/machine/c117.h +++ b/src/mame/machine/c117.h @@ -28,7 +28,7 @@ class namco_c117_device : { public: //construction/destruction - namco_c117_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_c117_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration static void set_cpu_tags(device_t &device, const char *maintag, const char *subtag); diff --git a/src/mame/machine/cat702.cpp b/src/mame/machine/cat702.cpp index c0c85f84be1..c02c4394ce1 100644 --- a/src/mame/machine/cat702.cpp +++ b/src/mame/machine/cat702.cpp @@ -88,7 +88,7 @@ const device_type CAT702 = &device_creator; -cat702_device::cat702_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +cat702_device::cat702_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CAT702, "CAT702", tag, owner, clock, "cat702", __FILE__), m_dataout_handler(*this) { diff --git a/src/mame/machine/cat702.h b/src/mame/machine/cat702.h index d7fa867142a..4b93865239f 100644 --- a/src/mame/machine/cat702.h +++ b/src/mame/machine/cat702.h @@ -17,7 +17,7 @@ extern const device_type CAT702; class cat702_device : public device_t { public: - cat702_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cat702_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_dataout_handler(device_t &device, _Object object) { return downcast(device).m_dataout_handler.set_callback(object); } diff --git a/src/mame/machine/cdi070.cpp b/src/mame/machine/cdi070.cpp index f6b410914aa..4bbb0e26aa5 100644 --- a/src/mame/machine/cdi070.cpp +++ b/src/mame/machine/cdi070.cpp @@ -54,7 +54,7 @@ static inline void ATTR_PRINTF(3,4) verboselog(device_t& device, int n_level, co // cdi68070_device - constructor //------------------------------------------------- -cdi68070_device::cdi68070_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cdi68070_device::cdi68070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MACHINE_CDI68070, "CDI68070", tag, owner, clock, "cdi68070", __FILE__) { } diff --git a/src/mame/machine/cdi070.h b/src/mame/machine/cdi070.h index 84dd18e9cfa..7f3cff2d905 100644 --- a/src/mame/machine/cdi070.h +++ b/src/mame/machine/cdi070.h @@ -140,7 +140,7 @@ class cdi68070_device : public device_t { public: // construction/destruction - cdi68070_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cdi68070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // external callbacks void uart_rx(UINT8 data); diff --git a/src/mame/machine/cdicdic.cpp b/src/mame/machine/cdicdic.cpp index 69c23a67c03..bc01d5a6164 100644 --- a/src/mame/machine/cdicdic.cpp +++ b/src/mame/machine/cdicdic.cpp @@ -1161,7 +1161,7 @@ WRITE16_MEMBER( cdicdic_device::regs_w ) // cdicdic_device - constructor //------------------------------------------------- -cdicdic_device::cdicdic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cdicdic_device::cdicdic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MACHINE_CDICDIC, "CDICDIC", tag, owner, clock, "cdicdic", __FILE__) { } diff --git a/src/mame/machine/cdicdic.h b/src/mame/machine/cdicdic.h index 4715ee6aac2..33ca053e066 100644 --- a/src/mame/machine/cdicdic.h +++ b/src/mame/machine/cdicdic.h @@ -51,7 +51,7 @@ class cdicdic_device : public device_t { public: // construction/destruction - cdicdic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cdicdic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // non-static internal members void sample_trigger(); diff --git a/src/mame/machine/cdislave.cpp b/src/mame/machine/cdislave.cpp index 109022b53b4..fbf21c839c8 100644 --- a/src/mame/machine/cdislave.cpp +++ b/src/mame/machine/cdislave.cpp @@ -418,7 +418,7 @@ WRITE16_MEMBER( cdislave_device::slave_w ) // cdislave_device - constructor //------------------------------------------------- -cdislave_device::cdislave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cdislave_device::cdislave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MACHINE_CDISLAVE, "CDISLAVE", tag, owner, clock, "cdislave", __FILE__) { } diff --git a/src/mame/machine/cdislave.h b/src/mame/machine/cdislave.h index 5ce85b36b00..4211574c018 100644 --- a/src/mame/machine/cdislave.h +++ b/src/mame/machine/cdislave.h @@ -46,7 +46,7 @@ class cdislave_device : public device_t { public: // construction/destruction - cdislave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cdislave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // external callbacks DECLARE_INPUT_CHANGED_MEMBER( mouse_update ); diff --git a/src/mame/machine/coco.cpp b/src/mame/machine/coco.cpp index 5a992dd97cd..ba88b004762 100644 --- a/src/mame/machine/coco.cpp +++ b/src/mame/machine/coco.cpp @@ -79,7 +79,7 @@ DAC and bitbanger values written should be reflected in the read. // ctor //------------------------------------------------- -coco_state::coco_state(const machine_config &mconfig, device_type type, std::string tag) +coco_state::coco_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, MAINCPU_TAG), m_pia_0(*this, PIA0_TAG), diff --git a/src/mame/machine/coco3.cpp b/src/mame/machine/coco3.cpp index d86d7665cff..40624853dec 100644 --- a/src/mame/machine/coco3.cpp +++ b/src/mame/machine/coco3.cpp @@ -149,19 +149,19 @@ void coco3_state::update_cart_base(UINT8 *cart_base) UINT32 coco3_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { bool result; - if (screen.tag() == ":" COMPOSITE_SCREEN_TAG) + if (!strcmp(screen.tag(), ":" COMPOSITE_SCREEN_TAG)) { /* composite screen */ result = m_gime->update_composite(bitmap, cliprect); } - else if (screen.tag() == ":" RGB_SCREEN_TAG) + else if (!strcmp(screen.tag(), ":" RGB_SCREEN_TAG)) { /* rgb screen */ result = m_gime->update_rgb(bitmap, cliprect); } else { - fatalerror("Called screen_update() with invalid tag '%s'\n", screen.tag().c_str()); + fatalerror("Called screen_update() with invalid tag '%s'\n", screen.tag()); } return result; } diff --git a/src/mame/machine/coco_vhd.cpp b/src/mame/machine/coco_vhd.cpp index 0288a2b4000..0510ce469ff 100644 --- a/src/mame/machine/coco_vhd.cpp +++ b/src/mame/machine/coco_vhd.cpp @@ -71,7 +71,7 @@ const device_type COCO_VHD = &device_creator; // coco_vhd_image_device - constructor //------------------------------------------------- -coco_vhd_image_device::coco_vhd_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +coco_vhd_image_device::coco_vhd_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COCO_VHD, "Virtual Hard Disk", tag, owner, clock, "coco_vhd_image", __FILE__), device_image_interface(mconfig, *this) { diff --git a/src/mame/machine/coco_vhd.h b/src/mame/machine/coco_vhd.h index 8c195fff4a7..45f9f5fb224 100644 --- a/src/mame/machine/coco_vhd.h +++ b/src/mame/machine/coco_vhd.h @@ -23,7 +23,7 @@ class coco_vhd_image_device : public device_t, { public: // construction/destruction - coco_vhd_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + coco_vhd_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~coco_vhd_image_device(); // image-level overrides diff --git a/src/mame/machine/compiskb.cpp b/src/mame/machine/compiskb.cpp index 92ce8b365f2..91709ad925e 100644 --- a/src/mame/machine/compiskb.cpp +++ b/src/mame/machine/compiskb.cpp @@ -235,7 +235,7 @@ ioport_constructor compis_keyboard_device::device_input_ports() const // compis_keyboard_device - constructor //------------------------------------------------- -compis_keyboard_device::compis_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +compis_keyboard_device::compis_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COMPIS_KEYBOARD, "Compis Keyboard", tag, owner, clock, "compiskb", __FILE__), m_maincpu(*this, I8748_TAG), m_speaker(*this, SPEAKER_TAG), diff --git a/src/mame/machine/compiskb.h b/src/mame/machine/compiskb.h index 9a926fc4031..64a71c1b405 100644 --- a/src/mame/machine/compiskb.h +++ b/src/mame/machine/compiskb.h @@ -37,7 +37,7 @@ class compis_keyboard_device : public device_t { public: // construction/destruction - compis_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + compis_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_tx_handler(device_t &device, _Object object) { return downcast(device).m_out_tx_handler.set_callback(object); } diff --git a/src/mame/machine/cuda.cpp b/src/mame/machine/cuda.cpp index 718cde4d5d6..fc79fc6b32e 100644 --- a/src/mame/machine/cuda.cpp +++ b/src/mame/machine/cuda.cpp @@ -382,7 +382,7 @@ WRITE8_MEMBER( cuda_device::pram_w ) // cuda_device - constructor //------------------------------------------------- -cuda_device::cuda_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cuda_device::cuda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CUDA, "Apple Cuda", tag, owner, clock, "cuda", __FILE__), device_nvram_interface(mconfig, *this), write_reset(*this), diff --git a/src/mame/machine/cuda.h b/src/mame/machine/cuda.h index c1370afa6e0..3623200e7ab 100644 --- a/src/mame/machine/cuda.h +++ b/src/mame/machine/cuda.h @@ -60,7 +60,7 @@ class cuda_device : public device_t, public device_nvram_interface { public: // construction/destruction - cuda_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cuda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers static void static_set_type(device_t &device, int type); diff --git a/src/mame/machine/dc-ctrl.cpp b/src/mame/machine/dc-ctrl.cpp index 3cc6ae7cd8d..f2b5531b64a 100644 --- a/src/mame/machine/dc-ctrl.cpp +++ b/src/mame/machine/dc-ctrl.cpp @@ -5,7 +5,7 @@ const device_type DC_CONTROLLER = &device_creator; -void dc_controller_device::static_set_port_tag(device_t &device, int port, std::string tag) +void dc_controller_device::static_set_port_tag(device_t &device, int port, const char *tag) { dc_controller_device &ctrl = downcast(device); ctrl.port_tag[port] = tag; @@ -29,9 +29,11 @@ void dc_controller_device::static_set_versions(device_t &device, const char *ver ctrl.versions = versions; } -dc_controller_device::dc_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dc_controller_device::dc_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : maple_device(mconfig, DC_CONTROLLER, "Dreamcast Controller", tag, owner, clock, "dcctrl", __FILE__) { + memset(port_tag, 0, sizeof(port_tag)); + id = "Dreamcast Controller"; license = "Produced By or Under License From SEGA ENTERPRISES,LTD."; versions = "Version 1.010,1998/09/28,315-6211-AB ,Analog Module : The 4th Edition.5/8 +DF"; diff --git a/src/mame/machine/dc-ctrl.h b/src/mame/machine/dc-ctrl.h index 9d245462863..ed408ea7885 100644 --- a/src/mame/machine/dc-ctrl.h +++ b/src/mame/machine/dc-ctrl.h @@ -29,9 +29,9 @@ class dc_controller_device : public maple_device { public: // construction/destruction - dc_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dc_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void static_set_port_tag(device_t &device, int port, std::string tag); + static void static_set_port_tag(device_t &device, int port, const char *tag); static void static_set_id(device_t &device, const char *id); static void static_set_license(device_t &device, const char *license); static void static_set_versions(device_t &device, const char *versions); @@ -47,7 +47,7 @@ private: void free_status(UINT32 *dest); void read(UINT32 *dest); - std::string port_tag[8]; + const char *port_tag[8]; const char *id, *license, *versions; ioport_port *port[8]; diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp index 5c5be3b37a4..1c2c4fdf552 100644 --- a/src/mame/machine/dec_lk201.cpp +++ b/src/mame/machine/dec_lk201.cpp @@ -461,7 +461,7 @@ ioport_constructor lk201_device::device_input_ports() const // lk201_device - constructor //------------------------------------------------- -lk201_device::lk201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +lk201_device::lk201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, LK201, "DEC LK201 keyboard", tag, owner, clock, "lk201", __FILE__), device_serial_interface(mconfig, *this), m_maincpu(*this, LK201_CPU_TAG), diff --git a/src/mame/machine/dec_lk201.h b/src/mame/machine/dec_lk201.h index 1a4c01ddddf..88271331523 100644 --- a/src/mame/machine/dec_lk201.h +++ b/src/mame/machine/dec_lk201.h @@ -43,7 +43,7 @@ class lk201_device : public device_t, public device_serial_interface { public: // construction/destruction - lk201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + lk201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER( ddr_r ); DECLARE_WRITE8_MEMBER( ddr_w ); diff --git a/src/mame/machine/deco104.cpp b/src/mame/machine/deco104.cpp index 4ee6f3fa96d..554ad3ac47f 100644 --- a/src/mame/machine/deco104.cpp +++ b/src/mame/machine/deco104.cpp @@ -1055,7 +1055,7 @@ const device_type DECO104PROT = &device_creator; -deco104_device::deco104_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +deco104_device::deco104_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : deco_146_base_device(mconfig, DECO104PROT, "DECO 104 Protection", tag, owner, clock, "deco104", __FILE__) { m_bankswitch_swap_read_address = 0x66; diff --git a/src/mame/machine/deco104.h b/src/mame/machine/deco104.h index cee2448a4be..5576f7fd6b2 100644 --- a/src/mame/machine/deco104.h +++ b/src/mame/machine/deco104.h @@ -13,7 +13,7 @@ class deco104_device : public deco_146_base_device { public: - deco104_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + deco104_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mame/machine/deco146.cpp b/src/mame/machine/deco146.cpp index d17f554c02e..d0ba7bd27e3 100644 --- a/src/mame/machine/deco146.cpp +++ b/src/mame/machine/deco146.cpp @@ -1319,7 +1319,7 @@ UINT16 deco_146_base_device::read_data(UINT16 address, UINT16 mem_mask, UINT8 &c -deco_146_base_device::deco_146_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +deco_146_base_device::deco_146_base_device(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_port_a_r = deco146_port_read_cb(FUNC(deco_146_base_device::port_a_default), this); @@ -1505,7 +1505,7 @@ UINT16 deco_146_base_device::read_data_getloc(UINT16 address, int& location) } -deco146_device::deco146_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +deco146_device::deco146_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : deco_146_base_device(mconfig, DECO146PROT, "DECO 146 Protection", tag, owner, clock, "deco146", __FILE__) { m_bankswitch_swap_read_address = 0x78; diff --git a/src/mame/machine/deco146.h b/src/mame/machine/deco146.h index c5a15becf46..1f9fff545b1 100644 --- a/src/mame/machine/deco146.h +++ b/src/mame/machine/deco146.h @@ -80,8 +80,8 @@ struct deco146port_xx class deco_146_base_device : public device_t { public: - //deco_146_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - deco_146_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + //deco_146_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + deco_146_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); void write_data(address_space &space, UINT16 address, UINT16 data, UINT16 mem_mask, UINT8 &csflags); UINT16 read_data(UINT16 address, UINT16 mem_mask, UINT8 &csflags); @@ -164,7 +164,7 @@ extern const device_type DECO146BASE; class deco146_device : public deco_146_base_device { public: - deco146_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + deco146_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type DECO146PROT; diff --git a/src/mame/machine/deco222.cpp b/src/mame/machine/deco222.cpp index 3bf15399e8e..1df8a720dd2 100644 --- a/src/mame/machine/deco222.cpp +++ b/src/mame/machine/deco222.cpp @@ -8,7 +8,7 @@ #include "deco222.h" -deco_222_device::deco_222_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +deco_222_device::deco_222_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m6502_device(mconfig, DECO_222, "DECO 222", tag, owner, clock, "deco222", __FILE__) { } @@ -32,7 +32,7 @@ UINT8 deco_222_device::mi_decrypt::read_sync(UINT16 adr) -deco_c10707_device::deco_c10707_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +deco_c10707_device::deco_c10707_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m6502_device(mconfig, DECO_C10707, "DECO C10707", tag, owner, clock, "decoc10707", __FILE__) { } diff --git a/src/mame/machine/deco222.h b/src/mame/machine/deco222.h index d4511ee9f71..9a7c8ba8822 100644 --- a/src/mame/machine/deco222.h +++ b/src/mame/machine/deco222.h @@ -6,7 +6,7 @@ class deco_222_device : public m6502_device { public: - deco_222_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + deco_222_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: class mi_decrypt : public mi_default_normal { @@ -28,7 +28,7 @@ static const device_type DECO_222 = &device_creator; class deco_c10707_device : public m6502_device { public: - deco_c10707_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + deco_c10707_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: class mi_decrypt : public mi_default_normal { diff --git a/src/mame/machine/decocass.cpp b/src/mame/machine/decocass.cpp index c0ebd6382c6..926f40918a3 100644 --- a/src/mame/machine/decocass.cpp +++ b/src/mame/machine/decocass.cpp @@ -56,7 +56,7 @@ READ8_MEMBER( decocass_state::decocass_sound_command_main_r) WRITE8_MEMBER(decocass_state::decocass_sound_command_w) { - LOG(2,("CPU %s sound command -> $%02x\n", space.device().tag().c_str(), data)); + LOG(2,("CPU %s sound command -> $%02x\n", space.device().tag(), data)); soundlatch_byte_w(space, 0, data); m_sound_ack |= 0x80; /* remove snd cpu data ack bit. i don't see it in the schems, but... */ @@ -67,20 +67,20 @@ WRITE8_MEMBER(decocass_state::decocass_sound_command_w) READ8_MEMBER(decocass_state::decocass_sound_data_r) { UINT8 data = soundlatch2_byte_r(space, 0); - LOG(2,("CPU %s sound data <- $%02x\n", space.device().tag().c_str(), data)); + LOG(2,("CPU %s sound data <- $%02x\n", space.device().tag(), data)); return data; } READ8_MEMBER(decocass_state::decocass_sound_ack_r) { UINT8 data = m_sound_ack; /* D6+D7 */ - LOG(4,("CPU %s sound ack <- $%02x\n", space.device().tag().c_str(), data)); + LOG(4,("CPU %s sound ack <- $%02x\n", space.device().tag(), data)); return data; } WRITE8_MEMBER(decocass_state::decocass_sound_data_w) { - LOG(2,("CPU %s sound data -> $%02x\n", space.device().tag().c_str(), data)); + LOG(2,("CPU %s sound data -> $%02x\n", space.device().tag(), data)); soundlatch2_byte_w(space, 0, data); m_sound_ack |= 0x40; } @@ -88,7 +88,7 @@ WRITE8_MEMBER(decocass_state::decocass_sound_data_w) READ8_MEMBER(decocass_state::decocass_sound_command_r) { UINT8 data = soundlatch_byte_r(space, 0); - LOG(4,("CPU %s sound command <- $%02x\n", space.device().tag().c_str(), data)); + LOG(4,("CPU %s sound command <- $%02x\n", space.device().tag(), data)); m_audiocpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); m_sound_ack &= ~0x80; return data; @@ -117,14 +117,14 @@ READ8_MEMBER(decocass_state::decocass_sound_nmi_enable_r) READ8_MEMBER(decocass_state::decocass_sound_data_ack_reset_r) { UINT8 data = 0xff; - LOG(2,("CPU %s sound ack rst <- $%02x\n", space.device().tag().c_str(), data)); + LOG(2,("CPU %s sound ack rst <- $%02x\n", space.device().tag(), data)); m_sound_ack &= ~0x40; return data; } WRITE8_MEMBER(decocass_state::decocass_sound_data_ack_reset_w) { - LOG(2,("CPU %s sound ack rst -> $%02x\n", space.device().tag().c_str(), data)); + LOG(2,("CPU %s sound ack rst -> $%02x\n", space.device().tag(), data)); m_sound_ack &= ~0x40; } diff --git a/src/mame/machine/decocass_tape.cpp b/src/mame/machine/decocass_tape.cpp index 9ee10e8095e..8b3f2785032 100644 --- a/src/mame/machine/decocass_tape.cpp +++ b/src/mame/machine/decocass_tape.cpp @@ -58,7 +58,7 @@ static UINT16 tape_crc16_byte(UINT16 crc, UINT8 data); const device_type DECOCASS_TAPE = &device_creator; -decocass_tape_device::decocass_tape_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +decocass_tape_device::decocass_tape_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECOCASS_TAPE, "DECO Cassette Tape", tag, owner, clock, "decocass_tape", __FILE__), m_tape_timer(nullptr), m_speed(0), diff --git a/src/mame/machine/decocass_tape.h b/src/mame/machine/decocass_tape.h index fc6b63ff387..0b4909f34bd 100644 --- a/src/mame/machine/decocass_tape.h +++ b/src/mame/machine/decocass_tape.h @@ -6,7 +6,7 @@ class decocass_tape_device : public device_t { public: - decocass_tape_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + decocass_tape_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~decocass_tape_device() {} UINT8 get_status_bits(); diff --git a/src/mame/machine/decocpu6.cpp b/src/mame/machine/decocpu6.cpp index aba8321a08b..957c602976f 100644 --- a/src/mame/machine/decocpu6.cpp +++ b/src/mame/machine/decocpu6.cpp @@ -8,7 +8,7 @@ #include "decocpu6.h" -deco_cpu6_device::deco_cpu6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +deco_cpu6_device::deco_cpu6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m6502_device(mconfig, DECO_CPU6, "DECO CPU-6", tag, owner, clock, "decocpu6", __FILE__) { } diff --git a/src/mame/machine/decocpu6.h b/src/mame/machine/decocpu6.h index 77b8924061c..27279a6cbe1 100644 --- a/src/mame/machine/decocpu6.h +++ b/src/mame/machine/decocpu6.h @@ -7,7 +7,7 @@ class deco_cpu6_device : public m6502_device { public: - deco_cpu6_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + deco_cpu6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: class mi_decrypt : public mi_default_normal { diff --git a/src/mame/machine/decocpu7.cpp b/src/mame/machine/decocpu7.cpp index 511d5d0d080..dc6bb85dff8 100644 --- a/src/mame/machine/decocpu7.cpp +++ b/src/mame/machine/decocpu7.cpp @@ -3,7 +3,7 @@ #include "decocpu7.h" -deco_cpu7_device::deco_cpu7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +deco_cpu7_device::deco_cpu7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m6502_device(mconfig, DECO_CPU7, "DECO CPU-7", tag, owner, clock, "decocpu7", __FILE__) { } diff --git a/src/mame/machine/decocpu7.h b/src/mame/machine/decocpu7.h index 167560ba065..2f2490ed46c 100644 --- a/src/mame/machine/decocpu7.h +++ b/src/mame/machine/decocpu7.h @@ -6,7 +6,7 @@ class deco_cpu7_device : public m6502_device { public: - deco_cpu7_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + deco_cpu7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: class mi_decrypt : public mi_default_normal { diff --git a/src/mame/machine/decocrpt.cpp b/src/mame/machine/decocrpt.cpp index 758bb8dfd2a..dc31db80fdf 100644 --- a/src/mame/machine/decocrpt.cpp +++ b/src/mame/machine/decocrpt.cpp @@ -600,7 +600,7 @@ static const UINT8 deco74_swap_table[0x800] = 4,7,2,2,1,3,4,4,1,7,0,2,5,4,7,3,7,6,1,5,6,0,7,4,1,1,5,2,2,6,7,2, }; -static void deco_decrypt(running_machine &machine,std::string rgntag,const UINT8 *xor_table,const UINT16 *address_table,const UINT8 *swap_table,int remap_only) +static void deco_decrypt(running_machine &machine,const char *rgntag,const UINT8 *xor_table,const UINT16 *address_table,const UINT8 *swap_table,int remap_only) { UINT16 *rom = (UINT16 *)machine.root_device().memregion(rgntag)->base(); int len = machine.root_device().memregion(rgntag)->bytes()/2; @@ -647,17 +647,17 @@ static void deco_decrypt(running_machine &machine,std::string rgntag,const UINT8 rom[i] = BIG_ENDIANIZE_INT16(rom[i]); } -void deco56_decrypt_gfx(running_machine &machine, std::string tag) +void deco56_decrypt_gfx(running_machine &machine, const char *tag) { deco_decrypt(machine,tag,deco56_xor_table,deco56_address_table,deco56_swap_table, 0); } -void deco74_decrypt_gfx(running_machine &machine, std::string tag) +void deco74_decrypt_gfx(running_machine &machine, const char *tag) { deco_decrypt(machine,tag,deco74_xor_table,deco74_address_table,deco74_swap_table, 0); } -void deco56_remap_gfx(running_machine &machine, std::string tag) +void deco56_remap_gfx(running_machine &machine, const char *tag) { // Apply address remap, but not XOR/shift deco_decrypt(machine,tag,deco56_xor_table,deco56_address_table,deco56_swap_table, 1); diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp index ef15c5cc624..4e748670071 100644 --- a/src/mame/machine/decopincpu.cpp +++ b/src/mame/machine/decopincpu.cpp @@ -262,7 +262,7 @@ ioport_constructor decocpu_type1_device::device_input_ports() const return INPUT_PORTS_NAME( decocpu1 ); } -decocpu_type1_device::decocpu_type1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +decocpu_type1_device::decocpu_type1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECOCPU1, "Data East Pinball CPU Board Type 1", tag, owner, clock, "decocpu1", __FILE__), m_cpu(*this,"maincpu"), m_pia21(*this, "pia21"), @@ -281,7 +281,7 @@ decocpu_type1_device::decocpu_type1_device(const machine_config &mconfig, std::s m_write_solenoid(*this) {} -decocpu_type1_device::decocpu_type1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +decocpu_type1_device::decocpu_type1_device(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_cpu(*this,"maincpu"), m_pia21(*this, "pia21"), @@ -321,17 +321,17 @@ void decocpu_type1_device::device_start() m_cpu->space(AS_PROGRAM).install_rom(0x4000,0xffff,ROM+0x4000); } -void decocpu_type1_device::static_set_cpuregion(device_t &device, std::string tag) +void decocpu_type1_device::static_set_cpuregion(device_t &device, const char *tag) { decocpu_type1_device &cpuboard = downcast(device); cpuboard.m_cputag = tag; } -decocpu_type2_device::decocpu_type2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +decocpu_type2_device::decocpu_type2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : decocpu_type1_device(mconfig, DECOCPU2, "Data East Pinball CPU Board Type 2", tag, owner, clock, "decocpu2", __FILE__) {} -decocpu_type2_device::decocpu_type2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +decocpu_type2_device::decocpu_type2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : decocpu_type1_device(mconfig, type, name, tag, owner, clock, shortname, source) {} @@ -345,11 +345,11 @@ void decocpu_type2_device::device_start() decocpu_type1_device::device_start(); } -decocpu_type3_device::decocpu_type3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +decocpu_type3_device::decocpu_type3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : decocpu_type2_device(mconfig, DECOCPU3, "Data East Pinball CPU Board Type 3", tag, owner, clock, "decocpu3", __FILE__) {} -decocpu_type3_device::decocpu_type3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +decocpu_type3_device::decocpu_type3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : decocpu_type2_device(mconfig, type, name, tag, owner, clock, shortname, source) {} @@ -358,7 +358,7 @@ void decocpu_type3_device::device_start() decocpu_type1_device::device_start(); } -decocpu_type3b_device::decocpu_type3b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +decocpu_type3b_device::decocpu_type3b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : decocpu_type3_device(mconfig, DECOCPU3, "Data East Pinball CPU Board Type 3B", tag, owner, clock, "decocpu3b", __FILE__) {} diff --git a/src/mame/machine/decopincpu.h b/src/mame/machine/decopincpu.h index 62990faa210..7a8264e8508 100644 --- a/src/mame/machine/decopincpu.h +++ b/src/mame/machine/decopincpu.h @@ -64,8 +64,8 @@ class decocpu_type1_device : public device_t { public: - decocpu_type1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - decocpu_type1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + decocpu_type1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + decocpu_type1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); required_device m_cpu; required_device m_pia21; required_device m_pia24; @@ -104,7 +104,7 @@ public: INPUT_CHANGED_MEMBER(main_nmi); INPUT_CHANGED_MEMBER(audio_nmi); - static void static_set_cpuregion(device_t &device, std::string tag); + static void static_set_cpuregion(device_t &device, const char *tag); protected: // overrides @@ -115,7 +115,7 @@ protected: static const device_timer_id TIMER_IRQ = 0; private: - std::string m_cputag; // region for cpu board code and data + const char* m_cputag; // region for cpu board code and data emu_timer* m_irq_timer; bool m_irq_active; bool m_ca2; @@ -134,8 +134,8 @@ private: class decocpu_type2_device : public decocpu_type1_device { public: - decocpu_type2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - decocpu_type2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + decocpu_type2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + decocpu_type2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: // overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -145,8 +145,8 @@ protected: class decocpu_type3_device : public decocpu_type2_device { public: - decocpu_type3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - decocpu_type3_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + decocpu_type3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + decocpu_type3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: // overrides @@ -156,7 +156,7 @@ protected: class decocpu_type3b_device : public decocpu_type3_device { public: - decocpu_type3b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + decocpu_type3b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // overrides diff --git a/src/mame/machine/dmv_keyb.cpp b/src/mame/machine/dmv_keyb.cpp index b0e139048f1..1fe0f2f8f43 100644 --- a/src/mame/machine/dmv_keyb.cpp +++ b/src/mame/machine/dmv_keyb.cpp @@ -207,7 +207,7 @@ ioport_constructor dmv_keyboard_device::device_input_ports() const // dmv_keyboard_device - constructor //------------------------------------------------- -dmv_keyboard_device::dmv_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmv_keyboard_device::dmv_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DMV_KEYBOARD, "Decision Mate V Keyboard", tag, owner, clock, "dmv_keyboard", __FILE__), m_maincpu(*this, "mcu"), m_keyboard(*this, "COL") diff --git a/src/mame/machine/dmv_keyb.h b/src/mame/machine/dmv_keyb.h index 870f911dad6..0f42fef728a 100644 --- a/src/mame/machine/dmv_keyb.h +++ b/src/mame/machine/dmv_keyb.h @@ -34,7 +34,7 @@ class dmv_keyboard_device : public device_t { public: // construction/destruction - dmv_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dmv_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/mame/machine/docg3.cpp b/src/mame/machine/docg3.cpp index 2303ee3fb27..1d6fee6c0c6 100644 --- a/src/mame/machine/docg3.cpp +++ b/src/mame/machine/docg3.cpp @@ -38,7 +38,7 @@ const device_type DISKONCHIP_G3 = &device_creator; // diskonchip_g3_device - constructor //------------------------------------------------- -diskonchip_g3_device::diskonchip_g3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +diskonchip_g3_device::diskonchip_g3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DISKONCHIP_G3, "DiskOnChip G3", tag, owner, clock, "diskonchip_g3", __FILE__), device_nvram_interface(mconfig, *this) { diff --git a/src/mame/machine/docg3.h b/src/mame/machine/docg3.h index 7703c9acfd9..36423f12641 100644 --- a/src/mame/machine/docg3.h +++ b/src/mame/machine/docg3.h @@ -22,7 +22,7 @@ class diskonchip_g3_device : public device_t, { public: // construction/destruction - diskonchip_g3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + diskonchip_g3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void set_size(int _size) { m_size = _size; } protected: diff --git a/src/mame/machine/egret.cpp b/src/mame/machine/egret.cpp index ff7050ab926..736cdfd3471 100644 --- a/src/mame/machine/egret.cpp +++ b/src/mame/machine/egret.cpp @@ -333,7 +333,7 @@ WRITE8_MEMBER( egret_device::pram_w ) // egret_device - constructor //------------------------------------------------- -egret_device::egret_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +egret_device::egret_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, EGRET, "Apple Egret", tag, owner, clock, "egret", __FILE__), device_nvram_interface(mconfig, *this), write_reset(*this), diff --git a/src/mame/machine/egret.h b/src/mame/machine/egret.h index b39826712e2..f9b881cd540 100644 --- a/src/mame/machine/egret.h +++ b/src/mame/machine/egret.h @@ -59,7 +59,7 @@ class egret_device : public device_t, public device_nvram_interface { public: // construction/destruction - egret_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + egret_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers static void static_set_type(device_t &device, int type); diff --git a/src/mame/machine/einstein.cpp b/src/mame/machine/einstein.cpp index 727fbdff0ae..a2582ee93e3 100644 --- a/src/mame/machine/einstein.cpp +++ b/src/mame/machine/einstein.cpp @@ -26,7 +26,7 @@ const device_type EINSTEIN_KEYBOARD_DAISY = &device_creator; // esqpanel_device - constructor //------------------------------------------------- -esqpanel_device::esqpanel_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +esqpanel_device::esqpanel_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_serial_interface(mconfig, *this), m_write_tx(*this), @@ -209,7 +209,7 @@ machine_config_constructor esqpanel1x22_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( esqpanel1x22 ); } -esqpanel1x22_device::esqpanel1x22_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +esqpanel1x22_device::esqpanel1x22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : esqpanel_device(mconfig, ESQPANEL1x22, "Ensoniq front panel with 1x22 VFD", tag, owner, clock, "esqpanel122", __FILE__), m_vfd(*this, "vfd") { @@ -227,7 +227,7 @@ machine_config_constructor esqpanel2x40_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( esqpanel2x40 ); } -esqpanel2x40_device::esqpanel2x40_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +esqpanel2x40_device::esqpanel2x40_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : esqpanel_device(mconfig, ESQPANEL2x40, "Ensoniq front panel with 2x40 VFD", tag, owner, clock, "esqpanel240", __FILE__), m_vfd(*this, "vfd") { @@ -245,7 +245,7 @@ machine_config_constructor esqpanel2x40_sq1_device::device_mconfig_additions() c return MACHINE_CONFIG_NAME( esqpanel2x40_sq1 ); } -esqpanel2x40_sq1_device::esqpanel2x40_sq1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +esqpanel2x40_sq1_device::esqpanel2x40_sq1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : esqpanel_device(mconfig, ESQPANEL2x40, "Ensoniq front panel with 2x16 LCD", tag, owner, clock, "esqpanel240_sq1", __FILE__), m_vfd(*this, "vfd") { diff --git a/src/mame/machine/esqpanel.h b/src/mame/machine/esqpanel.h index 40117250346..5de704f1375 100644 --- a/src/mame/machine/esqpanel.h +++ b/src/mame/machine/esqpanel.h @@ -55,7 +55,7 @@ class esqpanel_device : public device_t, public device_serial_interface { public: // construction/destruction - esqpanel_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + esqpanel_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template static devcb_base &set_tx_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_tx.set_callback(object); } template static devcb_base &set_analog_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_analog.set_callback(object); } @@ -93,7 +93,7 @@ private: class esqpanel1x22_device : public esqpanel_device { public: - esqpanel1x22_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + esqpanel1x22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_vfd; @@ -107,7 +107,7 @@ private: class esqpanel2x40_device : public esqpanel_device { public: - esqpanel2x40_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + esqpanel2x40_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_vfd; @@ -121,7 +121,7 @@ private: class esqpanel2x40_sq1_device : public esqpanel_device { public: - esqpanel2x40_sq1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + esqpanel2x40_sq1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_vfd; diff --git a/src/mame/machine/esqvfd.cpp b/src/mame/machine/esqvfd.cpp index d07b9d0394e..a1379238673 100644 --- a/src/mame/machine/esqvfd.cpp +++ b/src/mame/machine/esqvfd.cpp @@ -114,7 +114,7 @@ static const UINT16 font[]= 0x0000, // 0000 0000 0000 0000 (DEL) }; -esqvfd_t::esqvfd_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) : +esqvfd_t::esqvfd_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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -279,7 +279,7 @@ void esq2x40_t::write_char(int data) update_display(); } -esq2x40_t::esq2x40_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : esqvfd_t(mconfig, ESQ2x40, "Ensoniq 2x40 VFD", tag, owner, clock, "esq2x40", __FILE__) +esq2x40_t::esq2x40_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : esqvfd_t(mconfig, ESQ2x40, "Ensoniq 2x40 VFD", tag, owner, clock, "esq2x40", __FILE__) { m_rows = 2; m_cols = 40; @@ -332,7 +332,7 @@ void esq1x22_t::write_char(int data) update_display(); } -esq1x22_t::esq1x22_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : esqvfd_t(mconfig, ESQ1x22, "Ensoniq 1x22 VFD", tag, owner, clock, "esq1x22", __FILE__) +esq1x22_t::esq1x22_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : esqvfd_t(mconfig, ESQ1x22, "Ensoniq 1x22 VFD", tag, owner, clock, "esq1x22", __FILE__) { m_rows = 1; m_cols = 22; @@ -396,7 +396,7 @@ void esq2x40_sq1_t::write_char(int data) } } -esq2x40_sq1_t::esq2x40_sq1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : esqvfd_t(mconfig, ESQ2x40_SQ1, "Ensoniq 2x40 VFD (SQ-1 variant)", tag, owner, clock, "esq2x40_sq1", __FILE__) +esq2x40_sq1_t::esq2x40_sq1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : esqvfd_t(mconfig, ESQ2x40_SQ1, "Ensoniq 2x40 VFD (SQ-1 variant)", tag, owner, clock, "esq2x40_sq1", __FILE__) { m_rows = 2; m_cols = 40; diff --git a/src/mame/machine/esqvfd.h b/src/mame/machine/esqvfd.h index 4d1bb68b70f..174ea5157d7 100644 --- a/src/mame/machine/esqvfd.h +++ b/src/mame/machine/esqvfd.h @@ -25,7 +25,7 @@ class esqvfd_t : public device_t { public: - esqvfd_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); + esqvfd_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); DECLARE_WRITE8_MEMBER( write ) { write_char(data); } @@ -57,7 +57,7 @@ protected: class esq1x22_t : public esqvfd_t { public: - esq1x22_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + esq1x22_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void write_char(int data) override; @@ -69,7 +69,7 @@ private: class esq2x40_t : public esqvfd_t { public: - esq2x40_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + esq2x40_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void write_char(int data) override; @@ -81,7 +81,7 @@ private: class esq2x40_sq1_t : public esqvfd_t { public: - esq2x40_sq1_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + esq2x40_sq1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void write_char(int data) override; diff --git a/src/mame/machine/fd1089.cpp b/src/mame/machine/fd1089.cpp index 4c4f2b399bd..5f8df8b0b3d 100644 --- a/src/mame/machine/fd1089.cpp +++ b/src/mame/machine/fd1089.cpp @@ -221,7 +221,7 @@ ADDRESS_MAP_END // fd1089_base_device - constructor //------------------------------------------------- -fd1089_base_device::fd1089_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +fd1089_base_device::fd1089_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : m68000_device(mconfig, tag, owner, clock, shortname, source), m_decrypted_opcodes(*this, ":fd1089_decrypted_opcodes") { @@ -232,12 +232,12 @@ fd1089_base_device::fd1089_base_device(const machine_config &mconfig, device_typ m_address_map[AS_DECRYPTED_OPCODES] = ADDRESS_MAP_NAME(decrypted_opcodes_map); } -fd1089a_device::fd1089a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +fd1089a_device::fd1089a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : fd1089_base_device(mconfig, FD1089A, "FD1089A", tag, owner, clock, "fd1089a", __FILE__) { } -fd1089b_device::fd1089b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +fd1089b_device::fd1089b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : fd1089_base_device(mconfig, FD1089B, "FD1089B", tag, owner, clock, "fd1089b", __FILE__) { } diff --git a/src/mame/machine/fd1089.h b/src/mame/machine/fd1089.h index 7bb12936db6..71fcc361d7a 100644 --- a/src/mame/machine/fd1089.h +++ b/src/mame/machine/fd1089.h @@ -39,7 +39,7 @@ class fd1089_base_device : public m68000_device { public: // construction/destruction - fd1089_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + fd1089_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // explicit decryption helpers void decrypt(offs_t baseaddr, UINT32 size, offs_t regionoffs, UINT16 *opcodesptr, UINT16 *dataptr) { decrypt(baseaddr, size, &m_plaintext[regionoffs/2], opcodesptr, dataptr); } @@ -80,7 +80,7 @@ class fd1089a_device : public fd1089_base_device { public: // construction/destruction - fd1089a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fd1089a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual UINT8 decode(UINT8 val, UINT8 key, bool opcode) override; @@ -94,7 +94,7 @@ class fd1089b_device : public fd1089_base_device { public: // construction/destruction - fd1089b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fd1089b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual UINT8 decode(UINT8 val, UINT8 key, bool opcode) override; diff --git a/src/mame/machine/fd1094.cpp b/src/mame/machine/fd1094.cpp index 81624767864..9dc3009cd31 100644 --- a/src/mame/machine/fd1094.cpp +++ b/src/mame/machine/fd1094.cpp @@ -552,7 +552,7 @@ UINT16 *fd1094_decryption_cache::decrypted_opcodes(UINT8 state) //------------------------------------------------- -fd1094_device::fd1094_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +fd1094_device::fd1094_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m68000_device(mconfig, tag, owner, clock, "fd1094", __FILE__), m_decrypted_opcodes_bank(*this, "^fd1094_decrypted_opcodes"), m_state(0x00), diff --git a/src/mame/machine/fd1094.h b/src/mame/machine/fd1094.h index 92d6f2b2730..737f3b81e1c 100644 --- a/src/mame/machine/fd1094.h +++ b/src/mame/machine/fd1094.h @@ -69,7 +69,7 @@ public: typedef delegate state_change_delegate; // construction/destruction - fd1094_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fd1094_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // explicit decryption helpers void decrypt(offs_t baseaddr, UINT32 size, offs_t regionoffs, UINT16 *opcodesptr, UINT8 state) { decrypt(baseaddr, size, m_srcbase + regionoffs/2, opcodesptr, state); } diff --git a/src/mame/machine/fm_scsi.cpp b/src/mame/machine/fm_scsi.cpp index bbb985c1541..a63795db0c2 100644 --- a/src/mame/machine/fm_scsi.cpp +++ b/src/mame/machine/fm_scsi.cpp @@ -38,7 +38,7 @@ const device_type FMSCSI = &device_creator; * Device */ -fmscsi_device::fmscsi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +fmscsi_device::fmscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : legacy_scsi_host_adapter(mconfig, FMSCSI, "FM-SCSI", tag, owner, clock, "fmscsi", __FILE__), m_irq_handler(*this), m_drq_handler(*this) diff --git a/src/mame/machine/fm_scsi.h b/src/mame/machine/fm_scsi.h index 46bb59a37dc..cc7c1ab1fc8 100644 --- a/src/mame/machine/fm_scsi.h +++ b/src/mame/machine/fm_scsi.h @@ -44,7 +44,7 @@ class fmscsi_device : public legacy_scsi_host_adapter { public: // construction/destruction - fmscsi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fmscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/mame/machine/gaelco3d.cpp b/src/mame/machine/gaelco3d.cpp index 48ba74e7637..d4f9c58383a 100644 --- a/src/mame/machine/gaelco3d.cpp +++ b/src/mame/machine/gaelco3d.cpp @@ -186,7 +186,7 @@ static void buf_reset(buf_t *buf) const device_type GAELCO_SERIAL = &device_creator; -gaelco_serial_device::gaelco_serial_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gaelco_serial_device::gaelco_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GAELCO_SERIAL, "Gaelco 3D Serial Hardware", tag, owner, clock, "gaelco_serial", __FILE__), m_irq_handler(*this), m_status(0), @@ -207,7 +207,7 @@ gaelco_serial_device::gaelco_serial_device(const machine_config &mconfig, std::s void gaelco_serial_device::device_start() { /* validate arguments */ - assert(tag().length() < 20); + assert(strlen(tag()) < 20); m_irq_handler.resolve_safe(); m_sync_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gaelco_serial_device::link_cb), this)); diff --git a/src/mame/machine/gaelco3d.h b/src/mame/machine/gaelco3d.h index 4ce06668b5a..36ab65082f1 100644 --- a/src/mame/machine/gaelco3d.h +++ b/src/mame/machine/gaelco3d.h @@ -62,7 +62,7 @@ struct osd_shared_mem class gaelco_serial_device : public device_t { public: - gaelco_serial_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gaelco_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~gaelco_serial_device() {} template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/mame/machine/gdrom.cpp b/src/mame/machine/gdrom.cpp index 87ed9f47e08..5aead47aae1 100644 --- a/src/mame/machine/gdrom.cpp +++ b/src/mame/machine/gdrom.cpp @@ -435,7 +435,7 @@ void gdrom_device::WriteData( UINT8 *data, int dataLength ) // device type definition const device_type GDROM = &device_creator; -gdrom_device::gdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +gdrom_device::gdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : atapi_cdrom_device(mconfig, GDROM, "GDROM", tag, owner, clock, "gdrom", __FILE__) { } diff --git a/src/mame/machine/gdrom.h b/src/mame/machine/gdrom.h index f1090ef292b..f96a5fcea28 100644 --- a/src/mame/machine/gdrom.h +++ b/src/mame/machine/gdrom.h @@ -14,7 +14,7 @@ class gdrom_device : public atapi_cdrom_device { public: - gdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // Sega GD-ROM handler diff --git a/src/mame/machine/genpc.cpp b/src/mame/machine/genpc.cpp index 0af77b30cda..44dbcd00d20 100644 --- a/src/mame/machine/genpc.cpp +++ b/src/mame/machine/genpc.cpp @@ -500,7 +500,7 @@ ioport_constructor ibm5160_mb_device::device_input_ports() const } -void ibm5160_mb_device::static_set_cputag(device_t &device, std::string tag) +void ibm5160_mb_device::static_set_cputag(device_t &device, const char *tag) { ibm5160_mb_device &board = downcast(device); board.m_cputag = tag; @@ -514,7 +514,7 @@ void ibm5160_mb_device::static_set_cputag(device_t &device, std::string tag) // ibm5160_mb_device - constructor //------------------------------------------------- -ibm5160_mb_device::ibm5160_mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ibm5160_mb_device::ibm5160_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IBM5160_MOTHERBOARD, "IBM5160_MOTHERBOARD", tag, owner, clock, "ibm5160_mb", __FILE__), m_maincpu(*owner, "maincpu"), m_pic8259(*this, "pic8259"), @@ -630,7 +630,7 @@ machine_config_constructor ibm5150_mb_device::device_mconfig_additions() const // ibm5150_mb_device - constructor //------------------------------------------------- -ibm5150_mb_device::ibm5150_mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ibm5150_mb_device::ibm5150_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ibm5160_mb_device(mconfig, tag, owner, clock), m_cassette(*this, "cassette") { @@ -850,7 +850,7 @@ ioport_constructor ec1841_mb_device::device_input_ports() const // ec1841_mb_device - constructor //------------------------------------------------- -ec1841_mb_device::ec1841_mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ec1841_mb_device::ec1841_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ibm5160_mb_device(mconfig, tag, owner, clock) { } @@ -905,7 +905,7 @@ READ8_MEMBER ( ec1841_mb_device::pc_ppi_portc_r ) return data; } -pc_noppi_mb_device::pc_noppi_mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pc_noppi_mb_device::pc_noppi_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ibm5160_mb_device(mconfig, tag, owner, clock) { } diff --git a/src/mame/machine/genpin.h b/src/mame/machine/genpin.h index 2c072c04710..5b72d09ff53 100644 --- a/src/mame/machine/genpin.h +++ b/src/mame/machine/genpin.h @@ -39,7 +39,7 @@ MACHINE_CONFIG_EXTERN( genpin_audio ); class genpin_class : public driver_device { public: - genpin_class(const machine_config &mconfig, device_type type, std::string tag) + genpin_class(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_samples(*this, "samples") { } diff --git a/src/mame/machine/hp48.cpp b/src/mame/machine/hp48.cpp index 0f25fb9ed86..71bb4b656ff 100644 --- a/src/mame/machine/hp48.cpp +++ b/src/mame/machine/hp48.cpp @@ -921,7 +921,7 @@ void hp48_port_image_device::hp48_fill_port() { hp48_state *state = machine().driver_data(); int size = state->m_port_size[m_port]; - LOG(( "hp48_fill_port: %s module=%i size=%i rw=%i\n", tag().c_str(), m_module, size, state->m_port_write[m_port] )); + LOG(( "hp48_fill_port: %s module=%i size=%i rw=%i\n", tag(), m_module, size, state->m_port_write[m_port] )); state->m_port_data[m_port] = make_unique_clear(2 * size); state->m_modules[m_module].off_mask = 2 * (( size > 128 * 1024 ) ? 128 * 1024 : size) - 1; state->m_modules[m_module].read = read8_delegate(); @@ -955,7 +955,7 @@ bool hp48_port_image_device::call_load() /* check size */ if ( (size < 32*1024) || (size > m_max_size) || (size & (size-1)) ) { - logerror( "hp48: image size for %s should be a power of two between %i and %i\n", tag().c_str(), 32*1024, m_max_size ); + logerror( "hp48: image size for %s should be a power of two between %i and %i\n", tag(), 32*1024, m_max_size ); return IMAGE_INIT_FAIL; } @@ -978,7 +978,7 @@ bool hp48_port_image_device::call_create(int format_type, option_resolution *for /* size must be a power of 2 between 32K and max_size */ if ( (size < 32*1024) || (size > m_max_size) || (size & (size-1)) ) { - logerror( "hp48: image size for %s should be a power of two between %i and %i\n", tag().c_str(), 32*1024, m_max_size ); + logerror( "hp48: image size for %s should be a power of two between %i and %i\n", tag(), 32*1024, m_max_size ); return IMAGE_INIT_FAIL; } @@ -992,7 +992,7 @@ void hp48_port_image_device::call_unload() { hp48_state *state = machine().driver_data(); LOG(( "hp48_port image unload: %s size=%i rw=%i\n", - tag().c_str(), state->m_port_size[m_port], state->m_port_write[m_port] )); + tag(), state->m_port_size[m_port], state->m_port_write[m_port] )); if ( state->m_port_write[m_port] ) { state->hp48_encode_nibble( state->m_port_data[m_port].get(), state->m_port_data[m_port].get(), state->m_port_size[m_port] ); @@ -1010,7 +1010,7 @@ void hp48_port_image_device::device_start() hp48_unfill_port(); } -hp48_port_image_device::hp48_port_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +hp48_port_image_device::hp48_port_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, HP48_PORT, "HP48 memory card", tag, owner, clock, "hp48_port_image", __FILE__), device_image_interface(mconfig, *this) { diff --git a/src/mame/machine/ie15_kbd.cpp b/src/mame/machine/ie15_kbd.cpp index 478df314d42..f98eb316092 100644 --- a/src/mame/machine/ie15_kbd.cpp +++ b/src/mame/machine/ie15_kbd.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ -ie15_keyboard_device::ie15_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) +ie15_keyboard_device::ie15_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , m_io_kbd0(*this, "TERM_LINE0") , m_io_kbd1(*this, "TERM_LINE1") @@ -25,7 +25,7 @@ ie15_keyboard_device::ie15_keyboard_device(const machine_config &mconfig, device { } -ie15_keyboard_device::ie15_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ie15_keyboard_device::ie15_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IE15_KEYBOARD, "15WWW-97-006 Keyboard", tag, owner, clock, "ie15_keyboard", __FILE__) , m_io_kbd0(*this, "TERM_LINE0") , m_io_kbd1(*this, "TERM_LINE1") diff --git a/src/mame/machine/ie15_kbd.h b/src/mame/machine/ie15_kbd.h index 95d51775c85..42eca22403d 100644 --- a/src/mame/machine/ie15_kbd.h +++ b/src/mame/machine/ie15_kbd.h @@ -42,8 +42,8 @@ class ie15_keyboard_device : public device_t { public: - ie15_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); - ie15_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ie15_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); + ie15_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast(device).m_keyboard_cb.set_callback(object); } diff --git a/src/mame/machine/igs022.cpp b/src/mame/machine/igs022.cpp index d4daf5c29a2..6a6e45b5c79 100644 --- a/src/mame/machine/igs022.cpp +++ b/src/mame/machine/igs022.cpp @@ -12,7 +12,7 @@ #include "igs022.h" -igs022_device::igs022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +igs022_device::igs022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IGS022, "IGS022", tag, owner, clock, "igs022", __FILE__) { } diff --git a/src/mame/machine/igs022.h b/src/mame/machine/igs022.h index 851deece33c..8b5ca3a8b62 100644 --- a/src/mame/machine/igs022.h +++ b/src/mame/machine/igs022.h @@ -6,7 +6,7 @@ class igs022_device : public device_t { public: - igs022_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + igs022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); UINT16* m_sharedprotram; void IGS022_handle_command(); diff --git a/src/mame/machine/igs025.cpp b/src/mame/machine/igs025.cpp index e3eaa5c652c..e7ac5803c58 100644 --- a/src/mame/machine/igs025.cpp +++ b/src/mame/machine/igs025.cpp @@ -16,7 +16,7 @@ #include "igs025.h" -igs025_device::igs025_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +igs025_device::igs025_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IGS025, "IGS025", tag, owner, clock, "igs_025_022", __FILE__) { m_execute_external = igs025_execute_external(FUNC(igs025_device::no_callback_setup), this); diff --git a/src/mame/machine/igs025.h b/src/mame/machine/igs025.h index ff9e22e380f..aa57a2ac8fa 100644 --- a/src/mame/machine/igs025.h +++ b/src/mame/machine/igs025.h @@ -13,7 +13,7 @@ typedef device_delegate igs025_execute_external; class igs025_device : public device_t { public: - igs025_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + igs025_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ16_MEMBER( killbld_igs025_prot_r ); // use setters instead of making public? diff --git a/src/mame/machine/igs028.cpp b/src/mame/machine/igs028.cpp index b5faf34e348..5e71c2bff64 100644 --- a/src/mame/machine/igs028.cpp +++ b/src/mame/machine/igs028.cpp @@ -11,7 +11,7 @@ #include "igs028.h" -igs028_device::igs028_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +igs028_device::igs028_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IGS028, "IGS028", tag, owner, clock, "igs028", __FILE__) { } diff --git a/src/mame/machine/igs028.h b/src/mame/machine/igs028.h index 637a7beca9d..42269cabc0f 100644 --- a/src/mame/machine/igs028.h +++ b/src/mame/machine/igs028.h @@ -7,7 +7,7 @@ class igs028_device : public device_t { public: - igs028_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + igs028_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); UINT16* m_sharedprotram; diff --git a/src/mame/machine/inder_sb.cpp b/src/mame/machine/inder_sb.cpp index 649ca4893d3..bad2b30d279 100644 --- a/src/mame/machine/inder_sb.cpp +++ b/src/mame/machine/inder_sb.cpp @@ -11,7 +11,7 @@ extern const device_type INDER_AUDIO = &device_creator; -inder_sb_device::inder_sb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +inder_sb_device::inder_sb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, INDER_AUDIO, "Inder 4xDAC Sound Board", tag, owner, clock, "indersb", __FILE__), device_mixer_interface(mconfig, *this, 2), m_audiocpu(*this, "audiocpu"), diff --git a/src/mame/machine/inder_sb.h b/src/mame/machine/inder_sb.h index 26f44367363..83cf035c652 100644 --- a/src/mame/machine/inder_sb.h +++ b/src/mame/machine/inder_sb.h @@ -25,7 +25,7 @@ class inder_sb_device : public device_t, { public: // construction/destruction - inder_sb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + inder_sb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_audiocpu; required_device m_ctc; diff --git a/src/mame/machine/inder_vid.cpp b/src/mame/machine/inder_vid.cpp index f1e25b72bc9..5d4ee0b79f9 100644 --- a/src/mame/machine/inder_vid.cpp +++ b/src/mame/machine/inder_vid.cpp @@ -13,7 +13,7 @@ extern const device_type INDER_VIDEO = &device_creator; -inder_vid_device::inder_vid_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +inder_vid_device::inder_vid_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, INDER_VIDEO, "Inder / Dinamic TMS Video", tag, owner, clock, "indervd", __FILE__), /* device_video_interface(mconfig, *this, false), */ m_vram(*this, "vram"), diff --git a/src/mame/machine/inder_vid.h b/src/mame/machine/inder_vid.h index cb452f449f3..f8c850ed9c1 100644 --- a/src/mame/machine/inder_vid.h +++ b/src/mame/machine/inder_vid.h @@ -26,7 +26,7 @@ class inder_vid_device : public device_t { public: // construction/destruction - inder_vid_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + inder_vid_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_shared_ptr m_vram; required_device m_palette; diff --git a/src/mame/machine/isbc_215g.cpp b/src/mame/machine/isbc_215g.cpp index acec7caf154..e49818ee4d6 100644 --- a/src/mame/machine/isbc_215g.cpp +++ b/src/mame/machine/isbc_215g.cpp @@ -10,7 +10,7 @@ const device_type ISBC_215G = &device_creator; -isbc_215g_device::isbc_215g_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +isbc_215g_device::isbc_215g_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISBC_215G, "ISBC 215G Winchester Disk Controller", tag, owner, clock, "isbc_215g", __FILE__), m_dmac(*this, "u84"), m_hdd0(*this, "drive0"), diff --git a/src/mame/machine/isbc_215g.h b/src/mame/machine/isbc_215g.h index 7b76bd4ae8d..86c795d0306 100644 --- a/src/mame/machine/isbc_215g.h +++ b/src/mame/machine/isbc_215g.h @@ -12,7 +12,7 @@ class isbc_215g_device : public device_t { public: - isbc_215g_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + isbc_215g_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual machine_config_constructor device_mconfig_additions() const override; const rom_entry *device_rom_region() const override; diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp index 1f00565118b..9fa7cef6da8 100644 --- a/src/mame/machine/iteagle_fpga.cpp +++ b/src/mame/machine/iteagle_fpga.cpp @@ -25,7 +25,7 @@ DEVICE_ADDRESS_MAP_START(ram_map, 32, iteagle_fpga_device) AM_RANGE(0x00000, 0x1ffff) AM_READWRITE(ram_r, ram_w) ADDRESS_MAP_END -iteagle_fpga_device::iteagle_fpga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iteagle_fpga_device::iteagle_fpga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pci_device(mconfig, ITEAGLE_FPGA, "ITEagle FPGA", tag, owner, clock, "iteagle_fpga", __FILE__), device_nvram_interface(mconfig, *this), m_version(0), m_seq_init(0) { @@ -487,7 +487,7 @@ machine_config_constructor iteagle_eeprom_device::device_mconfig_additions() con return MACHINE_CONFIG_NAME( iteagle_eeprom ); } -iteagle_eeprom_device::iteagle_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iteagle_eeprom_device::iteagle_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pci_device(mconfig, ITEAGLE_EEPROM, "ITEagle EEPROM AT93C46", tag, owner, clock, "eeprom", __FILE__), m_eeprom(*this, "eeprom"), m_sw_version(0) { @@ -612,7 +612,7 @@ machine_config_constructor iteagle_ide_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( iteagle_ide ); } -iteagle_ide_device::iteagle_ide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iteagle_ide_device::iteagle_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pci_device(mconfig, ITEAGLE_IDE, "ITEagle IDE Controller", tag, owner, clock, "ide", __FILE__), m_ide(*this, "ide"), m_ide2(*this, "ide2"), @@ -620,7 +620,7 @@ iteagle_ide_device::iteagle_ide_device(const machine_config &mconfig, std::strin { } -void iteagle_ide_device::set_irq_info(std::string tag, const int irq_num) +void iteagle_ide_device::set_irq_info(const char *tag, const int irq_num) { m_cpu_tag = tag; m_irq_num = irq_num; diff --git a/src/mame/machine/iteagle_fpga.h b/src/mame/machine/iteagle_fpga.h index 66d871040f5..5d150e66116 100644 --- a/src/mame/machine/iteagle_fpga.h +++ b/src/mame/machine/iteagle_fpga.h @@ -34,9 +34,9 @@ class iteagle_fpga_device : public pci_device, public device_nvram_interface { public: - iteagle_fpga_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + iteagle_fpga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void set_init_info(int version, int seq_init) {m_version=version; m_seq_init=seq_init;} - void set_irq_info(std::string tag, const int irq_num) {m_cpu_tag = tag; m_irq_num = irq_num;} + void set_irq_info(const char *tag, const int irq_num) {m_cpu_tag = tag; m_irq_num = irq_num;} protected: @@ -51,7 +51,7 @@ protected: private: emu_timer * m_timer; - std::string m_cpu_tag; + const char *m_cpu_tag; cpu_device *m_cpu; int m_irq_num; @@ -90,7 +90,7 @@ private: class iteagle_eeprom_device : public pci_device { public: - iteagle_eeprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + iteagle_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, @@ -115,10 +115,10 @@ private: class iteagle_ide_device : public pci_device { public: - iteagle_ide_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + iteagle_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; - void set_irq_info(std::string tag, const int irq_num); + void set_irq_info(const char *tag, const int irq_num); required_device m_ide; required_device m_ide2; @@ -130,7 +130,7 @@ protected: virtual void device_reset() override; private: - std::string m_cpu_tag; + const char *m_cpu_tag; cpu_device *m_cpu; int m_irq_num; int m_irq_status; diff --git a/src/mame/machine/jvs13551.cpp b/src/mame/machine/jvs13551.cpp index 7fb89e1f68a..fa0350e60a0 100644 --- a/src/mame/machine/jvs13551.cpp +++ b/src/mame/machine/jvs13551.cpp @@ -40,7 +40,7 @@ const rom_entry *sega_837_13551::device_rom_region() const return ROM_NAME(jvs13551); } -void sega_837_13551::static_set_port_tag(device_t &device, int port, std::string tag) +void sega_837_13551::static_set_port_tag(device_t &device, int port, const char *tag) { sega_837_13551 &ctrl = downcast(device); ctrl.port_tag[port] = tag; @@ -51,8 +51,9 @@ ioport_constructor sega_837_13551::device_input_ports() const return INPUT_PORTS_NAME(sega_837_13551_coins); } -sega_837_13551::sega_837_13551(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : jvs_device(mconfig, SEGA_837_13551, "Sega 837-13551 I/O Board", tag, owner, clock, "jvs13551", __FILE__) +sega_837_13551::sega_837_13551(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : jvs_device(mconfig, SEGA_837_13551, "Sega 837-13551 I/O Board", tag, owner, clock, "jvs13551", __FILE__) { + memset(port_tag, 0, sizeof(port_tag)); } const char *sega_837_13551::device_id() diff --git a/src/mame/machine/jvs13551.h b/src/mame/machine/jvs13551.h index 5e6c7e0ddb7..2a84e9b9d24 100644 --- a/src/mame/machine/jvs13551.h +++ b/src/mame/machine/jvs13551.h @@ -26,8 +26,8 @@ class jvs_host; class sega_837_13551 : public jvs_device { public: - sega_837_13551(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - static void static_set_port_tag(device_t &device, int port, std::string tag); + sega_837_13551(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + static void static_set_port_tag(device_t &device, int port, const char *tag); virtual const rom_entry *device_rom_region() const override; @@ -55,7 +55,7 @@ protected: virtual bool swoutputs(UINT8 id, UINT8 val) override; private: - std::string port_tag[12]; + const char *port_tag[12]; ioport_port *port[12]; UINT16 coin_counter[2]; }; diff --git a/src/mame/machine/k573cass.cpp b/src/mame/machine/k573cass.cpp index c27109c26ce..4f6c8769d6e 100644 --- a/src/mame/machine/k573cass.cpp +++ b/src/mame/machine/k573cass.cpp @@ -63,14 +63,14 @@ READ_LINE_MEMBER(konami573_cassette_interface::read_line_adc083x_sars) const device_type KONAMI573_CASSETTE_X = &device_creator; -konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KONAMI573_CASSETTE_X, "Konami 573 Cassette X", tag, owner, clock, "k573cassx", __FILE__), konami573_cassette_interface(mconfig, *this), m_x76f041(*this, "eeprom") { } -konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &mconfig, const device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &mconfig, const 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, __FILE__), konami573_cassette_interface(mconfig, *this), m_x76f041(*this, "eeprom") @@ -119,7 +119,7 @@ READ_LINE_MEMBER(konami573_cassette_x_device::read_line_secflash_sda) const device_type KONAMI573_CASSETTE_XI = &device_creator; -konami573_cassette_xi_device::konami573_cassette_xi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +konami573_cassette_xi_device::konami573_cassette_xi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : konami573_cassette_x_device(mconfig, KONAMI573_CASSETTE_XI, "Konami 573 Cassette XI", tag, owner, clock, "k573cassxi", __FILE__), m_ds2401(*this, "id"), m_adc0838(*this, "adc0838") @@ -179,7 +179,7 @@ READ_LINE_MEMBER(konami573_cassette_xi_device::read_line_adc083x_sars) const device_type KONAMI573_CASSETTE_Y = &device_creator; -konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KONAMI573_CASSETTE_Y, "Konami 573 Cassette Y", tag, owner, clock, "k573cassy", __FILE__), konami573_cassette_interface(mconfig, *this), m_x76f100(*this, "eeprom"), @@ -194,7 +194,7 @@ konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &m { } -konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &mconfig, const device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &mconfig, const 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, __FILE__), konami573_cassette_interface(mconfig, *this), m_x76f100(*this, "eeprom"), @@ -284,7 +284,7 @@ WRITE_LINE_MEMBER(konami573_cassette_y_device::write_line_d7) const device_type KONAMI573_CASSETTE_YI = &device_creator; -konami573_cassette_yi_device::konami573_cassette_yi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +konami573_cassette_yi_device::konami573_cassette_yi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : konami573_cassette_y_device(mconfig, KONAMI573_CASSETTE_YI, "Konami 573 Cassette YI", tag, owner, clock, "k573cassyi", __FILE__), m_ds2401(*this, "id") { @@ -315,7 +315,7 @@ READ_LINE_MEMBER(konami573_cassette_yi_device::read_line_ds2401) const device_type KONAMI573_CASSETTE_ZI = &device_creator; -konami573_cassette_zi_device::konami573_cassette_zi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +konami573_cassette_zi_device::konami573_cassette_zi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KONAMI573_CASSETTE_ZI, "Konami 573 Cassette ZI", tag, owner, clock, "k573casszi", __FILE__), konami573_cassette_interface(mconfig, *this), m_zs01(*this,"eeprom"), @@ -377,7 +377,7 @@ READ_LINE_MEMBER(konami573_cassette_zi_device::read_line_secflash_sda) const device_type KONAMI573_CASSETTE_SLOT = &device_creator; -konami573_cassette_slot_device::konami573_cassette_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +konami573_cassette_slot_device::konami573_cassette_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KONAMI573_CASSETTE_SLOT, "Konami 573 Cassette Slot", tag, owner, clock, "k573cassslot", __FILE__), device_slot_interface(mconfig, *this), m_dsr_handler(*this) diff --git a/src/mame/machine/k573cass.h b/src/mame/machine/k573cass.h index 4c7153fe50c..899667c7b7b 100644 --- a/src/mame/machine/k573cass.h +++ b/src/mame/machine/k573cass.h @@ -30,7 +30,7 @@ class konami573_cassette_slot_device : public device_t, friend class konami573_cassette_interface; public: - konami573_cassette_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + konami573_cassette_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_dsr_handler(device_t &device, _Object object) { return downcast(device).m_dsr_handler.set_callback(object); } @@ -91,8 +91,8 @@ class konami573_cassette_x_device: public device_t, public konami573_cassette_interface { public: - konami573_cassette_x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - konami573_cassette_x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); + konami573_cassette_x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + konami573_cassette_x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); virtual DECLARE_READ_LINE_MEMBER(read_line_secflash_sda) override; virtual DECLARE_WRITE_LINE_MEMBER(write_line_d0) override; @@ -114,7 +114,7 @@ extern const device_type KONAMI573_CASSETTE_XI; class konami573_cassette_xi_device: public konami573_cassette_x_device { public: - konami573_cassette_xi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + konami573_cassette_xi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ_LINE_MEMBER(read_line_ds2401) override; virtual DECLARE_WRITE_LINE_MEMBER(write_line_d4) override; @@ -167,8 +167,8 @@ class konami573_cassette_y_device: public device_t, public konami573_cassette_interface { public: - konami573_cassette_y_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - konami573_cassette_y_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); + konami573_cassette_y_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + konami573_cassette_y_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); // static configuration helpers template static devcb_base &set_d0_handler(device_t &device, _Object object) { return downcast(device).m_d0_handler.set_callback(object); } @@ -212,7 +212,7 @@ extern const device_type KONAMI573_CASSETTE_YI; class konami573_cassette_yi_device: public konami573_cassette_y_device { public: - konami573_cassette_yi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + konami573_cassette_yi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ_LINE_MEMBER(read_line_ds2401) override; virtual DECLARE_WRITE_LINE_MEMBER(write_line_d4) override; @@ -231,7 +231,7 @@ class konami573_cassette_zi_device: public device_t, public konami573_cassette_interface { public: - konami573_cassette_zi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + konami573_cassette_zi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ_LINE_MEMBER(read_line_ds2401) override; virtual DECLARE_READ_LINE_MEMBER(read_line_secflash_sda) override; diff --git a/src/mame/machine/k573dio.cpp b/src/mame/machine/k573dio.cpp index 0a8e963e2e2..672aa2fa209 100644 --- a/src/mame/machine/k573dio.cpp +++ b/src/mame/machine/k573dio.cpp @@ -105,7 +105,7 @@ static MACHINE_CONFIG_FRAGMENT( k573dio ) MCFG_DS2401_ADD( "digital_id" ) MACHINE_CONFIG_END -k573dio_device::k573dio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k573dio_device::k573dio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KONAMI_573_DIGITAL_IO_BOARD, "Konami 573 digital I/O board", tag, owner, clock, "k573dio", __FILE__), mas3507d(*this, "mpeg"), digital_id(*this, "digital_id"), @@ -147,37 +147,37 @@ void k573dio_device::device_timer(emu_timer &timer, device_timer_id id, int para READ16_MEMBER(k573dio_device::a00_r) { - logerror("%s: a00_r (%s)\n", tag().c_str(), machine().describe_context()); + logerror("%s: a00_r (%s)\n", tag(), machine().describe_context()); return 0x0000; } READ16_MEMBER(k573dio_device::a02_r) { - logerror("%s: a02_r (%s)\n", tag().c_str(), machine().describe_context()); + logerror("%s: a02_r (%s)\n", tag(), machine().describe_context()); return 0x0001; } READ16_MEMBER(k573dio_device::a04_r) { - logerror("%s: a04_r (%s)\n", tag().c_str(), machine().describe_context()); + logerror("%s: a04_r (%s)\n", tag(), machine().describe_context()); return 0x0000; } READ16_MEMBER(k573dio_device::a06_r) { - logerror("%s: a06_r (%s)\n", tag().c_str(), machine().describe_context()); + logerror("%s: a06_r (%s)\n", tag(), machine().describe_context()); return 0x0000; } READ16_MEMBER(k573dio_device::a0a_r) { - logerror("%s: a0a_r (%s)\n", tag().c_str(), machine().describe_context()); + logerror("%s: a0a_r (%s)\n", tag(), machine().describe_context()); return 0x0000; } READ16_MEMBER(k573dio_device::a80_r) { - logerror("%s: a80_r (%s)\n", tag().c_str(), machine().describe_context()); + logerror("%s: a80_r (%s)\n", tag(), machine().describe_context()); return 0x1234; } @@ -304,7 +304,7 @@ WRITE16_MEMBER(k573dio_device::digital_id_w) READ16_MEMBER(k573dio_device::fpga_status_r) { - logerror("%s: fpga_status_r (%s)\n", tag().c_str(), machine().describe_context()); + logerror("%s: fpga_status_r (%s)\n", tag(), machine().describe_context()); // fpga/digital board status checks // wants & c000 = 8000 (just after program upload?) diff --git a/src/mame/machine/k573dio.h b/src/mame/machine/k573dio.h index 7b5d0508640..9762536b072 100644 --- a/src/mame/machine/k573dio.h +++ b/src/mame/machine/k573dio.h @@ -17,7 +17,7 @@ class k573dio_device : public device_t { public: - k573dio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k573dio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template void set_output_cb(_write _output_cb) { diff --git a/src/mame/machine/k573mcr.cpp b/src/mame/machine/k573mcr.cpp index a1fffd470ef..a9866370176 100644 --- a/src/mame/machine/k573mcr.cpp +++ b/src/mame/machine/k573mcr.cpp @@ -11,7 +11,7 @@ GE885-PWB(A)A ( contains Toshiba tmpr3904af, ram, rom, tranceiver and glue ). */ -k573mcr_device::k573mcr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +k573mcr_device::k573mcr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KONAMI_573_MEMORY_CARD_READER, "Konami 573 Memory Card Reader", tag, owner, clock, "k573mcr", __FILE__) { } diff --git a/src/mame/machine/k573mcr.h b/src/mame/machine/k573mcr.h index 09e761aa5db..4241bc33f96 100644 --- a/src/mame/machine/k573mcr.h +++ b/src/mame/machine/k573mcr.h @@ -17,7 +17,7 @@ extern const device_type KONAMI_573_MEMORY_CARD_READER; class k573mcr_device : public device_t { public: - k573mcr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k573mcr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; diff --git a/src/mame/machine/k573msu.cpp b/src/mame/machine/k573msu.cpp index be3ddb6fc3e..b3c38ab95d9 100644 --- a/src/mame/machine/k573msu.cpp +++ b/src/mame/machine/k573msu.cpp @@ -71,7 +71,7 @@ */ -k573msu_device::k573msu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +k573msu_device::k573msu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KONAMI_573_MULTI_SESSION_UNIT, "Konami 573 Multi Session Unit", tag, owner, clock, "k573msu", __FILE__) { } diff --git a/src/mame/machine/k573msu.h b/src/mame/machine/k573msu.h index 29b42c94623..3d4940039a9 100644 --- a/src/mame/machine/k573msu.h +++ b/src/mame/machine/k573msu.h @@ -17,7 +17,7 @@ extern const device_type KONAMI_573_MULTI_SESSION_UNIT; class k573msu_device : public device_t { public: - k573msu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k573msu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; diff --git a/src/mame/machine/k573npu.cpp b/src/mame/machine/k573npu.cpp index 89cf1716f77..f79494d7b56 100644 --- a/src/mame/machine/k573npu.cpp +++ b/src/mame/machine/k573npu.cpp @@ -71,7 +71,7 @@ */ -k573npu_device::k573npu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +k573npu_device::k573npu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KONAMI_573_NETWORK_PCB_UNIT, "Konami 573 Network PCB Unit", tag, owner, clock, "k573npu", __FILE__) { } diff --git a/src/mame/machine/k573npu.h b/src/mame/machine/k573npu.h index 1a25c00b502..13c4d598216 100644 --- a/src/mame/machine/k573npu.h +++ b/src/mame/machine/k573npu.h @@ -17,7 +17,7 @@ extern const device_type KONAMI_573_NETWORK_PCB_UNIT; class k573npu_device : public device_t { public: - k573npu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k573npu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; diff --git a/src/mame/machine/k7659kb.cpp b/src/mame/machine/k7659kb.cpp index e254b7d7fc2..5b46d8a9814 100644 --- a/src/mame/machine/k7659kb.cpp +++ b/src/mame/machine/k7659kb.cpp @@ -212,7 +212,7 @@ ioport_constructor k7659_keyboard_device::device_input_ports() const // k7659_keyboard_device - constructor //------------------------------------------------- -k7659_keyboard_device::k7659_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k7659_keyboard_device::k7659_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K7659_KEYBOARD, "K7659 Keyboard", tag, owner, clock, "k7659kb", __FILE__) {} diff --git a/src/mame/machine/k7659kb.h b/src/mame/machine/k7659kb.h index 9c43f26ff16..c18031b61bf 100644 --- a/src/mame/machine/k7659kb.h +++ b/src/mame/machine/k7659kb.h @@ -43,7 +43,7 @@ class k7659_keyboard_device : public device_t { public: // construction/destruction - k7659_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k7659_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/mame/machine/kaneko_calc3.cpp b/src/mame/machine/kaneko_calc3.cpp index 5a11a34acd7..10390dae679 100644 --- a/src/mame/machine/kaneko_calc3.cpp +++ b/src/mame/machine/kaneko_calc3.cpp @@ -29,7 +29,7 @@ const device_type KANEKO_CALC3 = &device_creator; -kaneko_calc3_device::kaneko_calc3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kaneko_calc3_device::kaneko_calc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KANEKO_CALC3, "Kaneko CALC3 MCU", tag, owner, clock, "kaneko_calc3", __FILE__), m_mcuram(*this, ":mcuram"), m_mcu_status(0), diff --git a/src/mame/machine/kaneko_calc3.h b/src/mame/machine/kaneko_calc3.h index f72de99aa0f..af5e1d31d94 100644 --- a/src/mame/machine/kaneko_calc3.h +++ b/src/mame/machine/kaneko_calc3.h @@ -9,7 +9,7 @@ class kaneko_calc3_device : public device_t { public: - kaneko_calc3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kaneko_calc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE16_MEMBER(mcu_com0_w); DECLARE_WRITE16_MEMBER(mcu_com1_w); diff --git a/src/mame/machine/kaneko_hit.cpp b/src/mame/machine/kaneko_hit.cpp index 650e71125ea..626b03bde29 100644 --- a/src/mame/machine/kaneko_hit.cpp +++ b/src/mame/machine/kaneko_hit.cpp @@ -30,7 +30,7 @@ const device_type KANEKO_HIT = &device_creator; -kaneko_hit_device::kaneko_hit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kaneko_hit_device::kaneko_hit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KANEKO_HIT, "Kaneko CALC Hitbox", tag, owner, clock, "kaneko_hit", __FILE__) { m_hittype = -1; diff --git a/src/mame/machine/kaneko_hit.h b/src/mame/machine/kaneko_hit.h index 93b4d70fce0..815fa4bd70c 100644 --- a/src/mame/machine/kaneko_hit.h +++ b/src/mame/machine/kaneko_hit.h @@ -38,7 +38,7 @@ struct calc3_hit_t class kaneko_hit_device : public device_t { public: - kaneko_hit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kaneko_hit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_type(device_t &device, int hittype); diff --git a/src/mame/machine/kaneko_toybox.cpp b/src/mame/machine/kaneko_toybox.cpp index 070234bea1c..73e8927b7ed 100644 --- a/src/mame/machine/kaneko_toybox.cpp +++ b/src/mame/machine/kaneko_toybox.cpp @@ -53,7 +53,7 @@ mcu_subcmd = kaneko16_mcu_ram[0x0014/2]; // sub-command parameter, happens o const device_type KANEKO_TOYBOX = &device_creator; -kaneko_toybox_device::kaneko_toybox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kaneko_toybox_device::kaneko_toybox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KANEKO_TOYBOX, "Kaneko Toybox MCU", tag, owner, clock, "kaneko_toybox", __FILE__), m_mcuram(*this, ":mcuram"), m_gametype(GAME_NORMAL), @@ -158,7 +158,7 @@ WRITE16_MEMBER(kaneko_toybox_device::mcu_com3_w){ mcu_com_w(offset, data, mem_ma */ READ16_MEMBER(kaneko_toybox_device::mcu_status_r) { - logerror("CPU %s (PC=%06X) : read MCU status\n", space.device().tag().c_str(), space.device().safe_pcbase()); + logerror("CPU %s (PC=%06X) : read MCU status\n", space.device().tag(), space.device().safe_pcbase()); return 0; // most games test bit 0 for failure } diff --git a/src/mame/machine/kaneko_toybox.h b/src/mame/machine/kaneko_toybox.h index 855ab14cabc..98b4bbbec34 100644 --- a/src/mame/machine/kaneko_toybox.h +++ b/src/mame/machine/kaneko_toybox.h @@ -335,7 +335,7 @@ static const UINT8 decryption_table_alt[0x100] = { class kaneko_toybox_device : public device_t { public: - kaneko_toybox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kaneko_toybox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_table(device_t &device, int tabletype); static void set_game_type(device_t &device, int gametype); diff --git a/src/mame/machine/kc_keyb.cpp b/src/mame/machine/kc_keyb.cpp index 9a6859fbd44..740d0dc7fce 100644 --- a/src/mame/machine/kc_keyb.cpp +++ b/src/mame/machine/kc_keyb.cpp @@ -435,7 +435,7 @@ INPUT_PORTS_END //------------------------------------------------- // kc_keyboard_device - constructor //------------------------------------------------- -kc_keyboard_device::kc_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +kc_keyboard_device::kc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KC_KEYBOARD, "KC Keyboard", tag, owner, clock, "kc_keyboard", __FILE__), m_write_out(*this) { diff --git a/src/mame/machine/kc_keyb.h b/src/mame/machine/kc_keyb.h index d6c851dba34..152a886e65f 100644 --- a/src/mame/machine/kc_keyb.h +++ b/src/mame/machine/kc_keyb.h @@ -25,7 +25,7 @@ class kc_keyboard_device : public device_t { public: // construction/destruction - kc_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~kc_keyboard_device(); template static devcb_base &set_out_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_out.set_callback(object); } diff --git a/src/mame/machine/konami1.cpp b/src/mame/machine/konami1.cpp index aa930c81c85..c0240bcbc78 100644 --- a/src/mame/machine/konami1.cpp +++ b/src/mame/machine/konami1.cpp @@ -11,7 +11,7 @@ const device_type KONAMI1 = &device_creator; -konami1_device::konami1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +konami1_device::konami1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m6809_base_device(mconfig, "KONAMI-1", tag, owner, clock, KONAMI1, 1, "konami1", __FILE__) { m_boundary = 0x0000; diff --git a/src/mame/machine/konami1.h b/src/mame/machine/konami1.h index 1753e10e66e..4c5b369896d 100644 --- a/src/mame/machine/konami1.h +++ b/src/mame/machine/konami1.h @@ -5,7 +5,7 @@ class konami1_device : public m6809_base_device { public: - konami1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + konami1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void set_encryption_boundary(UINT16 adr); diff --git a/src/mame/machine/konppc.cpp b/src/mame/machine/konppc.cpp index 74ac6de2a3d..d70d3364142 100644 --- a/src/mame/machine/konppc.cpp +++ b/src/mame/machine/konppc.cpp @@ -16,7 +16,7 @@ const device_type KONPPC = &device_creator; -konppc_device::konppc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +konppc_device::konppc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KONPPC, "Konami PowerPC Common Functions", tag, owner, clock, "konppc", __FILE__), cgboard_type(0), num_cgboards(0)/*, diff --git a/src/mame/machine/konppc.h b/src/mame/machine/konppc.h index 81bd547d6c5..cc3a3c386b9 100644 --- a/src/mame/machine/konppc.h +++ b/src/mame/machine/konppc.h @@ -21,7 +21,7 @@ class konppc_device : public device_t { public: // construction/destruction - konppc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + konppc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_num_boards(device_t &device, int num) { downcast(device).num_cgboards = num; } static void static_set_cbboard_type(device_t &device, int cgtype) { downcast(device).cgboard_type = cgtype; } diff --git a/src/mame/machine/m1comm.cpp b/src/mame/machine/m1comm.cpp index e94e40fa73b..ceec0fc893b 100644 --- a/src/mame/machine/m1comm.cpp +++ b/src/mame/machine/m1comm.cpp @@ -122,7 +122,7 @@ const rom_entry *m1comm_device::device_rom_region() const // m1comm_device - constructor //------------------------------------------------- -m1comm_device::m1comm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m1comm_device::m1comm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, M1COMM, "MODEL-1 COMMUNICATION BD", tag, owner, clock, "m1comm", __FILE__), m_commcpu(*this, Z80_TAG), m_line_rx(OPEN_FLAG_WRITE | OPEN_FLAG_CREATE ), diff --git a/src/mame/machine/m1comm.h b/src/mame/machine/m1comm.h index e9690e20d6d..56106dbe28f 100644 --- a/src/mame/machine/m1comm.h +++ b/src/mame/machine/m1comm.h @@ -21,7 +21,7 @@ class m1comm_device : public device_t { public: // construction/destruction - m1comm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m1comm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/machine/m20_8086.cpp b/src/mame/machine/m20_8086.cpp index 2d8ddd62666..5c817b17edf 100644 --- a/src/mame/machine/m20_8086.cpp +++ b/src/mame/machine/m20_8086.cpp @@ -5,7 +5,7 @@ const device_type M20_8086 = &device_creator; -m20_8086_device::m20_8086_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m20_8086_device::m20_8086_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, M20_8086, "Olivetti M20 8086 Adapter", tag, owner, clock, "m20_8086", __FILE__), m_8086(*this, "8086"), m_maincpu(*this, ":maincpu"), diff --git a/src/mame/machine/m20_8086.h b/src/mame/machine/m20_8086.h index bc8cd62d47c..1f2cc041d69 100644 --- a/src/mame/machine/m20_8086.h +++ b/src/mame/machine/m20_8086.h @@ -10,7 +10,7 @@ class m20_8086_device : public device_t { public: - m20_8086_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m20_8086_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/machine/m20_kbd.cpp b/src/mame/machine/m20_kbd.cpp index 9b8491f94c6..ecccffae775 100644 --- a/src/mame/machine/m20_kbd.cpp +++ b/src/mame/machine/m20_kbd.cpp @@ -4,7 +4,7 @@ #include "machine/m20_kbd.h" -m20_keyboard_device::m20_keyboard_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : +m20_keyboard_device::m20_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : serial_keyboard_device(mconfig, M20_KEYBOARD, "M20 Keyboard", tag, owner, 0, "m20_keyboard", __FILE__) { } diff --git a/src/mame/machine/m20_kbd.h b/src/mame/machine/m20_kbd.h index 93e5a039b11..3cade9c11e4 100644 --- a/src/mame/machine/m20_kbd.h +++ b/src/mame/machine/m20_kbd.h @@ -8,7 +8,7 @@ class m20_keyboard_device : public serial_keyboard_device { public: - m20_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m20_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; protected: diff --git a/src/mame/machine/m24_kbd.cpp b/src/mame/machine/m24_kbd.cpp index a29c518943b..5cc05a95b16 100644 --- a/src/mame/machine/m24_kbd.cpp +++ b/src/mame/machine/m24_kbd.cpp @@ -210,7 +210,7 @@ ioport_constructor m24_keyboard_device::device_input_ports() const return INPUT_PORTS_NAME( m24_keyboard ); } -m24_keyboard_device::m24_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m24_keyboard_device::m24_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, M24_KEYBOARD, "Olivetti M24 Keyboard", tag, owner, clock, "m24_kbd", __FILE__), m_rows(*this, "ROW"), m_mousebtn(*this, "MOUSEBTN"), diff --git a/src/mame/machine/m24_kbd.h b/src/mame/machine/m24_kbd.h index 2b87a80e90c..489d094929e 100644 --- a/src/mame/machine/m24_kbd.h +++ b/src/mame/machine/m24_kbd.h @@ -12,7 +12,7 @@ class m24_keyboard_device : public device_t { public: - m24_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m24_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_data_handler(device_t &device, _Object object) { return downcast(device).m_out_data.set_callback(object); } diff --git a/src/mame/machine/m24_z8000.cpp b/src/mame/machine/m24_z8000.cpp index 3224c3445d6..d89034b4736 100644 --- a/src/mame/machine/m24_z8000.cpp +++ b/src/mame/machine/m24_z8000.cpp @@ -4,7 +4,7 @@ const device_type M24_Z8000 = &device_creator; -m24_z8000_device::m24_z8000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m24_z8000_device::m24_z8000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, M24_Z8000, "Olivetti M24 Z8000 Adapter", tag, owner, clock, "m24_z8000", __FILE__), m_z8000(*this, "z8000"), m_maincpu(*this, ":maincpu"), diff --git a/src/mame/machine/m24_z8000.h b/src/mame/machine/m24_z8000.h index e07d9e75c22..283bd301ac9 100644 --- a/src/mame/machine/m24_z8000.h +++ b/src/mame/machine/m24_z8000.h @@ -15,7 +15,7 @@ class m24_z8000_device : public device_t { public: - m24_z8000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m24_z8000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const override; virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/machine/m2comm.cpp b/src/mame/machine/m2comm.cpp index 4c034fc91c9..4c45669076c 100644 --- a/src/mame/machine/m2comm.cpp +++ b/src/mame/machine/m2comm.cpp @@ -194,7 +194,7 @@ machine_config_constructor m2comm_device::device_mconfig_additions() const // m2comm_device - constructor //------------------------------------------------- -m2comm_device::m2comm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +m2comm_device::m2comm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, M2COMM, "MODEL2 COMMUNICATION BD", tag, owner, clock, "m2comm", __FILE__), m_line_rx(OPEN_FLAG_WRITE | OPEN_FLAG_CREATE ), m_line_tx(OPEN_FLAG_READ) diff --git a/src/mame/machine/m2comm.h b/src/mame/machine/m2comm.h index 890761148dd..8566f2cdd33 100644 --- a/src/mame/machine/m2comm.h +++ b/src/mame/machine/m2comm.h @@ -20,7 +20,7 @@ class m2comm_device : public device_t { public: // construction/destruction - m2comm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m2comm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/machine/mackbd.cpp b/src/mame/machine/mackbd.cpp index 44739089e72..7244b16866f 100644 --- a/src/mame/machine/mackbd.cpp +++ b/src/mame/machine/mackbd.cpp @@ -209,7 +209,7 @@ ioport_constructor mackbd_device::device_input_ports() const // mackbd_device - constructor //------------------------------------------------- -mackbd_device::mackbd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mackbd_device::mackbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MACKBD, "Macintosh keyboard", tag, owner, clock, "mackbd", __FILE__), m_maincpu(*this, MACKBD_CPU_TAG), m_clkout_handler(*this), diff --git a/src/mame/machine/mackbd.h b/src/mame/machine/mackbd.h index dadab8065aa..946d549c0cb 100644 --- a/src/mame/machine/mackbd.h +++ b/src/mame/machine/mackbd.h @@ -42,7 +42,7 @@ public: template static devcb_base &set_dataout_handler(device_t &device, _Object object) { return downcast(device).m_dataout_handler.set_callback(object); } // construction/destruction - mackbd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mackbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(p0_r); DECLARE_WRITE8_MEMBER(p0_w); diff --git a/src/mame/machine/macrtc.cpp b/src/mame/machine/macrtc.cpp index 0d63e06e6de..dd047014c0f 100644 --- a/src/mame/machine/macrtc.cpp +++ b/src/mame/machine/macrtc.cpp @@ -40,7 +40,7 @@ const device_type RTC3430042 = &device_creator; // rtc4543_device - constructor //------------------------------------------------- -rtc3430042_device::rtc3430042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rtc3430042_device::rtc3430042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, RTC3430042, "Apple 343-0042 clock/PRAM", tag, owner, clock, "rtc3430042", __FILE__), device_rtc_interface(mconfig, *this), device_nvram_interface(mconfig, *this) diff --git a/src/mame/machine/macrtc.h b/src/mame/machine/macrtc.h index a06715524fd..ea8726a8fd2 100644 --- a/src/mame/machine/macrtc.h +++ b/src/mame/machine/macrtc.h @@ -36,7 +36,7 @@ class rtc3430042_device : public device_t, { public: // construction/destruction - rtc3430042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + rtc3430042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER( ce_w ); DECLARE_WRITE_LINE_MEMBER( clk_w ); diff --git a/src/mame/machine/maple-dc.cpp b/src/mame/machine/maple-dc.cpp index 3d94ce70708..dcefe0fd84c 100644 --- a/src/mame/machine/maple-dc.cpp +++ b/src/mame/machine/maple-dc.cpp @@ -28,7 +28,7 @@ void maple_dc_device::static_set_irq_cb(device_t &device, void (*irq_cb)(running maple_dc.irq_cb = irq_cb; } -maple_dc_device::maple_dc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +maple_dc_device::maple_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MAPLE_DC, "Dreamcast Maple Bus", tag, owner, clock, "maple_dc", __FILE__) { // Do not move that in device_start or there will be a race diff --git a/src/mame/machine/maple-dc.h b/src/mame/machine/maple-dc.h index 177a606f0fb..dcecaa9d2b5 100644 --- a/src/mame/machine/maple-dc.h +++ b/src/mame/machine/maple-dc.h @@ -15,7 +15,7 @@ class maple_device; class maple_dc_device : public device_t { public: - maple_dc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + maple_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_maincpu_tag(device_t &device, const char *maincpu_tag); static void static_set_irq_cb(device_t &device, void (*irq_cb)(running_machine &)); diff --git a/src/mame/machine/mapledev.cpp b/src/mame/machine/mapledev.cpp index d9f95e9351b..0f7630e3315 100644 --- a/src/mame/machine/mapledev.cpp +++ b/src/mame/machine/mapledev.cpp @@ -12,7 +12,7 @@ void maple_device::static_set_host(device_t &device, const char *_host_tag, int } -maple_device::maple_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) +maple_device::maple_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { host_tag = nullptr; host_port = 0; diff --git a/src/mame/machine/mapledev.h b/src/mame/machine/mapledev.h index f9e58ac64c4..2a2b93ca93c 100644 --- a/src/mame/machine/mapledev.h +++ b/src/mame/machine/mapledev.h @@ -10,7 +10,7 @@ class maple_device : public device_t { public: - maple_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + maple_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); static void static_set_host(device_t &device, const char *_host_tag, int _host_port); virtual void maple_w(const UINT32 *data, UINT32 in_size) = 0; diff --git a/src/mame/machine/mathbox.cpp b/src/mame/machine/mathbox.cpp index 1366081c7e2..7b014ed1158 100644 --- a/src/mame/machine/mathbox.cpp +++ b/src/mame/machine/mathbox.cpp @@ -39,7 +39,7 @@ const device_type MATHBOX = &device_creator; -mathbox_device::mathbox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mathbox_device::mathbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MATHBOX, "Atari MATHBOX", tag, owner, clock, "mathbox", __FILE__) { } diff --git a/src/mame/machine/mathbox.h b/src/mame/machine/mathbox.h index be0df88cb10..d50bb690687 100644 --- a/src/mame/machine/mathbox.h +++ b/src/mame/machine/mathbox.h @@ -19,7 +19,7 @@ class mathbox_device : public device_t { public: - mathbox_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mathbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( go_w ); DECLARE_READ8_MEMBER( status_r ); diff --git a/src/mame/machine/mega32x.cpp b/src/mame/machine/mega32x.cpp index 5cb33c67037..864e3d00b0b 100644 --- a/src/mame/machine/mega32x.cpp +++ b/src/mame/machine/mega32x.cpp @@ -204,7 +204,7 @@ GFX check (these don't explicitly fails): const device_type SEGA_32X_NTSC = &device_creator; const device_type SEGA_32X_PAL = &device_creator; -sega_32x_device::sega_32x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sega_32x_device::sega_32x_device(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_master_cpu(*this, "32x_master_sh2"), m_slave_cpu(*this, "32x_slave_sh2"), @@ -215,12 +215,12 @@ sega_32x_device::sega_32x_device(const machine_config &mconfig, device_type type { } -sega_32x_ntsc_device::sega_32x_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega_32x_ntsc_device::sega_32x_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sega_32x_device(mconfig, SEGA_32X_NTSC, "sega_32x_ntsc", tag, owner, clock, "sega_32x_ntsc", __FILE__) { } -sega_32x_pal_device::sega_32x_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega_32x_pal_device::sega_32x_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sega_32x_device(mconfig, SEGA_32X_PAL, "sega_32x_pal", tag, owner, clock, "sega_32x_pal", __FILE__) { } @@ -230,7 +230,7 @@ sega_32x_pal_device::sega_32x_pal_device(const machine_config &mconfig, std::str // palette device //------------------------------------------------- -void sega_32x_device::static_set_palette_tag(device_t &device, std::string tag) +void sega_32x_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/machine/mega32x.h b/src/mame/machine/mega32x.h index ab33076bba0..f076b0f7a71 100644 --- a/src/mame/machine/mega32x.h +++ b/src/mame/machine/mega32x.h @@ -31,7 +31,7 @@ class sega_32x_device : public device_t { public: - sega_32x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sega_32x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); required_device m_master_cpu; required_device m_slave_cpu; @@ -49,7 +49,7 @@ public: void update_total_scanlines(bool mode3) { m_total_scanlines = mode3 ? (m_base_total_scanlines * 2) : m_base_total_scanlines; } // this gets set at each EOF // static configuration - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); DECLARE_READ32_MEMBER( _32x_sh2_master_4000_common_4002_r ); DECLARE_READ32_MEMBER( _32x_sh2_slave_4000_common_4002_r ); @@ -215,14 +215,14 @@ private: class sega_32x_ntsc_device : public sega_32x_device { public: - sega_32x_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_32x_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class sega_32x_pal_device : public sega_32x_device { public: - sega_32x_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_32x_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp index 892120aa1e2..a76c07d4f25 100644 --- a/src/mame/machine/megacd.cpp +++ b/src/mame/machine/megacd.cpp @@ -289,7 +289,7 @@ machine_config_constructor sega_segacd_device::device_mconfig_additions() const } -sega_segacd_device::sega_segacd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +sega_segacd_device::sega_segacd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_gfx_interface(mconfig, *this, GFXDECODE_NAME( segacd )), m_scdcpu(*this, "segacd_68k"), @@ -305,17 +305,17 @@ sega_segacd_device::sega_segacd_device(const machine_config &mconfig, device_typ { } -sega_segacd_us_device::sega_segacd_us_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega_segacd_us_device::sega_segacd_us_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sega_segacd_device(mconfig, SEGA_SEGACD_US, "sega_segacd_us", tag, owner, clock, "sega_segacd_us", __FILE__) { } -sega_segacd_japan_device::sega_segacd_japan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega_segacd_japan_device::sega_segacd_japan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sega_segacd_device(mconfig, SEGA_SEGACD_JAPAN, "sega_segacd_japan", tag, owner, clock, "sega_segacd_japan", __FILE__) { } -sega_segacd_europe_device::sega_segacd_europe_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega_segacd_europe_device::sega_segacd_europe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sega_segacd_device(mconfig, SEGA_SEGACD_EUROPE, "sega_segacd_europe", tag, owner, clock, "sega_segacd_europe", __FILE__) { } diff --git a/src/mame/machine/megacd.h b/src/mame/machine/megacd.h index 851592224c5..5823c0bd02c 100644 --- a/src/mame/machine/megacd.h +++ b/src/mame/machine/megacd.h @@ -42,7 +42,7 @@ class sega_segacd_device : public device_t, public device_gfx_interface { public: - sega_segacd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + sega_segacd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); required_device m_scdcpu; required_device m_rfsnd; @@ -225,7 +225,7 @@ private: class sega_segacd_us_device : public sega_segacd_device { public: - sega_segacd_us_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_segacd_us_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: }; @@ -233,7 +233,7 @@ class sega_segacd_us_device : public sega_segacd_device class sega_segacd_japan_device : public sega_segacd_device { public: - sega_segacd_japan_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_segacd_japan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // virtual machine_config_constructor device_mconfig_additions() const; }; @@ -241,7 +241,7 @@ class sega_segacd_japan_device : public sega_segacd_device class sega_segacd_europe_device : public sega_segacd_device { public: - sega_segacd_europe_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_segacd_europe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // virtual machine_config_constructor device_mconfig_additions() const; }; diff --git a/src/mame/machine/megacdcd.cpp b/src/mame/machine/megacdcd.cpp index 21d5309da40..0fd65a3d2c0 100644 --- a/src/mame/machine/megacdcd.cpp +++ b/src/mame/machine/megacdcd.cpp @@ -12,7 +12,7 @@ const device_type LC89510_TEMP = &device_creator; -lc89510_temp_device::lc89510_temp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +lc89510_temp_device::lc89510_temp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, LC89510_TEMP, "lc89510_temp_device", tag, owner, clock, "lc89510_temp", __FILE__) { segacd_dma_callback = segacd_dma_delegate(FUNC(lc89510_temp_device::Fake_CDC_Do_DMA), this); diff --git a/src/mame/machine/megacdcd.h b/src/mame/machine/megacdcd.h index 7a16c1785ea..2039f48587b 100644 --- a/src/mame/machine/megacdcd.h +++ b/src/mame/machine/megacdcd.h @@ -147,7 +147,7 @@ typedef device_delegate interrupt_delegate; class lc89510_temp_device : public device_t { public: - lc89510_temp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + lc89510_temp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // HACK for DMA handling segacd_dma_delegate segacd_dma_callback; diff --git a/src/mame/machine/meters.cpp b/src/mame/machine/meters.cpp index 6a416610b7c..651e5902e20 100644 --- a/src/mame/machine/meters.cpp +++ b/src/mame/machine/meters.cpp @@ -17,7 +17,7 @@ const device_type METERS = &device_creator; -meters_device::meters_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +meters_device::meters_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, METERS, "Electro mechanical meters", tag, owner, clock, "meters", __FILE__), m_number_mtr(0) { diff --git a/src/mame/machine/meters.h b/src/mame/machine/meters.h index 14b12e30b03..9a0c49e0cd3 100644 --- a/src/mame/machine/meters.h +++ b/src/mame/machine/meters.h @@ -27,7 +27,7 @@ class meters_device : public device_t { public: - meters_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + meters_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~meters_device() {} static void static_set_number_meters(device_t &device, int number) { downcast(device).m_number_mtr = number; } diff --git a/src/mame/machine/microdrv.cpp b/src/mame/machine/microdrv.cpp index 20bda7df868..36406bd1bdf 100644 --- a/src/mame/machine/microdrv.cpp +++ b/src/mame/machine/microdrv.cpp @@ -43,7 +43,7 @@ const device_type MICRODRIVE = &device_creator; // microdrive_image_device - constructor //------------------------------------------------- -microdrive_image_device::microdrive_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +microdrive_image_device::microdrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MICRODRIVE, "Microdrive", tag, owner, clock, "microdrive_image", __FILE__), device_image_interface(mconfig, *this), m_write_comms_out(*this) @@ -131,11 +131,11 @@ void microdrive_image_device::device_timer(emu_timer &timer, device_timer_id id, WRITE_LINE_MEMBER( microdrive_image_device::clk_w ) { - if (LOG) logerror("Microdrive '%s' CLK: %u\n", tag().c_str(), state); + if (LOG) logerror("Microdrive '%s' CLK: %u\n", tag(), state); if (!m_clk && state) { m_comms_out = m_comms_in; - if (LOG) logerror("Microdrive '%s' COMMS OUT: %u\n", tag().c_str(), m_comms_out); + if (LOG) logerror("Microdrive '%s' COMMS OUT: %u\n", tag(), m_comms_out); m_write_comms_out(m_comms_out); m_bit_timer->enable(m_comms_out); } @@ -144,19 +144,19 @@ WRITE_LINE_MEMBER( microdrive_image_device::clk_w ) WRITE_LINE_MEMBER( microdrive_image_device::comms_in_w ) { - if (LOG) logerror("Microdrive '%s' COMMS IN: %u\n", tag().c_str(), state); + if (LOG) logerror("Microdrive '%s' COMMS IN: %u\n", tag(), state); m_comms_in = state; } WRITE_LINE_MEMBER( microdrive_image_device::erase_w ) { - if (LOG) logerror("Microdrive '%s' ERASE: %u\n", tag().c_str(), state); + if (LOG) logerror("Microdrive '%s' ERASE: %u\n", tag(), state); m_erase = state; } WRITE_LINE_MEMBER( microdrive_image_device::read_write_w ) { - if (LOG) logerror("Microdrive '%s' READ/WRITE: %u\n", tag().c_str(), state); + if (LOG) logerror("Microdrive '%s' READ/WRITE: %u\n", tag(), state); m_read_write = state; } diff --git a/src/mame/machine/microdrv.h b/src/mame/machine/microdrv.h index 2ff37090da2..30853bd84d7 100644 --- a/src/mame/machine/microdrv.h +++ b/src/mame/machine/microdrv.h @@ -42,7 +42,7 @@ class microdrive_image_device : public device_t, { public: // construction/destruction - microdrive_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + microdrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~microdrive_image_device(); template static devcb_base &set_comms_out_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_comms_out.set_callback(object); } diff --git a/src/mame/machine/micropolis.cpp b/src/mame/machine/micropolis.cpp index 0555af2d1f3..a42c692718c 100644 --- a/src/mame/machine/micropolis.cpp +++ b/src/mame/machine/micropolis.cpp @@ -65,7 +65,7 @@ static const UINT8 track_SD[][2] = { const device_type MICROPOLIS = &device_creator; -micropolis_device::micropolis_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +micropolis_device::micropolis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MICROPOLIS, "MICROPOLIS", tag, owner, clock, "micropolis", __FILE__), m_read_dden(*this), m_write_intrq(*this), @@ -84,6 +84,9 @@ micropolis_device::micropolis_device(const machine_config &mconfig, std::string { for (auto & elem : m_buffer) elem = 0; + + for (auto & elem : m_floppy_drive_tags) + elem = nullptr; } //------------------------------------------------- @@ -117,7 +120,7 @@ void micropolis_device::device_reset() { for (auto & elem : m_floppy_drive_tags) { - if (!elem.empty()) + if (elem) { legacy_floppy_image_device *img = siblingdevice(elem); @@ -185,7 +188,7 @@ void micropolis_device::set_drive(UINT8 drive) if (VERBOSE) logerror("micropolis_set_drive: $%02x\n", drive); - if (!m_floppy_drive_tags[drive].empty()) + if (m_floppy_drive_tags[drive]) m_drive = siblingdevice(m_floppy_drive_tags[drive]); } diff --git a/src/mame/machine/micropolis.h b/src/mame/machine/micropolis.h index 9e2af38a17d..76e1664c9ea 100644 --- a/src/mame/machine/micropolis.h +++ b/src/mame/machine/micropolis.h @@ -41,14 +41,14 @@ class micropolis_device : public device_t { public: - micropolis_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + micropolis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~micropolis_device() {} template static devcb_base &set_dden_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_dden.set_callback(object); } template static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_intrq.set_callback(object); } template static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_drq.set_callback(object); } - static void set_drive_tags(device_t &device, std::string tag1, std::string tag2, std::string tag3, std::string tag4) + static void set_drive_tags(device_t &device, const char *tag1, const char *tag2, const char *tag3, const char *tag4) { micropolis_device &dev = downcast(device); dev.m_floppy_drive_tags[0] = tag1; @@ -80,7 +80,7 @@ private: devcb_write_line m_write_intrq; devcb_write_line m_write_drq; - std::string m_floppy_drive_tags[4]; + const char *m_floppy_drive_tags[4]; /* register */ UINT8 m_data; diff --git a/src/mame/machine/midikbd.cpp b/src/mame/machine/midikbd.cpp index 9cace1dda01..a45e6179a3d 100644 --- a/src/mame/machine/midikbd.cpp +++ b/src/mame/machine/midikbd.cpp @@ -4,7 +4,7 @@ const device_type MIDI_KBD = &device_creator; -midi_keyboard_device::midi_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +midi_keyboard_device::midi_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MIDI_KBD, "Generic MIDI Keyboard", tag, owner, clock, "midi_kbd", __FILE__), device_serial_interface(mconfig, *this), m_out_tx_func(*this), diff --git a/src/mame/machine/midikbd.h b/src/mame/machine/midikbd.h index 43f61350667..c5272cf2e33 100644 --- a/src/mame/machine/midikbd.h +++ b/src/mame/machine/midikbd.h @@ -13,7 +13,7 @@ class midi_keyboard_device : public device_t, public device_serial_interface { public: - midi_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + midi_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ioport_constructor device_input_ports() const override; template static devcb_base &static_set_tx_callback(device_t &device, _Object object) { return downcast(device).m_out_tx_func.set_callback(object); } diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp index ae8c4bf7895..2d848da5d0f 100644 --- a/src/mame/machine/midwayic.cpp +++ b/src/mame/machine/midwayic.cpp @@ -112,7 +112,7 @@ const device_type MIDWAY_SERIAL_PIC = &device_creator; // midway_serial_pic2_device - constructor //------------------------------------------------- -midway_serial_pic_device::midway_serial_pic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +midway_serial_pic_device::midway_serial_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MIDWAY_SERIAL_PIC2, "Midway Serial Pic", tag, owner, clock, "midway_serial_pic", __FILE__), m_upper(0), m_buff(0), @@ -124,7 +124,7 @@ midway_serial_pic_device::midway_serial_pic_device(const machine_config &mconfig memset(m_data,0,sizeof(m_data)); } -midway_serial_pic_device::midway_serial_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) : +midway_serial_pic_device::midway_serial_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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_upper(0), m_buff(0), @@ -214,7 +214,7 @@ const device_type MIDWAY_SERIAL_PIC2 = &device_creator; // midway_serial_pic2_device - constructor //------------------------------------------------- -midway_ioasic_device::midway_ioasic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +midway_ioasic_device::midway_ioasic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : midway_serial_pic2_device(mconfig, MIDWAY_IOASIC, "Midway IOASIC", tag, owner, clock, "midway_ioasic", __FILE__), m_has_dcs(0), m_has_cage(0), diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h index 433e2bcbb4a..385234c5a66 100644 --- a/src/mame/machine/midwayic.h +++ b/src/mame/machine/midwayic.h @@ -18,8 +18,8 @@ class midway_serial_pic_device : public device_t { public: // construction/destruction - midway_serial_pic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - midway_serial_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); + midway_serial_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + midway_serial_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); static void static_set_upper(device_t &device, int upper) { downcast(device).m_upper = upper; } @@ -61,8 +61,8 @@ class midway_serial_pic2_device : public midway_serial_pic_device, { public: // construction/destruction - midway_serial_pic2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + midway_serial_pic2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); static void static_set_yearoffs(device_t &device, int yearoffs) { downcast(device).m_yearoffs = yearoffs; } @@ -119,7 +119,7 @@ class midway_ioasic_device : public midway_serial_pic2_device { public: // construction/destruction - midway_ioasic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + midway_ioasic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_shuffle(device_t &device, UINT8 shuffle) { downcast(device).m_shuffle_type = shuffle; } static void static_set_shuffle_default(device_t &device, UINT8 shuffle) { downcast(device).m_shuffle_default = shuffle; } diff --git a/src/mame/machine/mie.cpp b/src/mame/machine/mie.cpp index 010df09a3a9..55bac6f038f 100644 --- a/src/mame/machine/mie.cpp +++ b/src/mame/machine/mie.cpp @@ -87,12 +87,12 @@ machine_config_constructor mie_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME(mie); } -mie_jvs_device::mie_jvs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mie_jvs_device::mie_jvs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : jvs_host(mconfig, MIE_JVS, "JVS (MIE)", tag, owner, clock, "mie_jvs", __FILE__) { } -mie_device::mie_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mie_device::mie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : maple_device(mconfig, MIE, "Sega 315-6146 MIE", tag, owner, clock, "mie", __FILE__) { memset(gpio_name, 0, sizeof(gpio_name)); diff --git a/src/mame/machine/mie.h b/src/mame/machine/mie.h index 438138384df..fa50c4d5756 100644 --- a/src/mame/machine/mie.h +++ b/src/mame/machine/mie.h @@ -28,7 +28,7 @@ class mie_jvs_device; class mie_device : public maple_device { public: - mie_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_gpio_name(device_t &device, int entry, const char *name); static void static_set_jvs_name(device_t &device, const char *name); @@ -123,7 +123,7 @@ public: friend class mie_device; // construction/destruction - mie_jvs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mie_jvs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/mame/machine/mm1kb.cpp b/src/mame/machine/mm1kb.cpp index 7c40a7b82d5..88faf286961 100644 --- a/src/mame/machine/mm1kb.cpp +++ b/src/mame/machine/mm1kb.cpp @@ -205,7 +205,7 @@ ioport_constructor mm1_keyboard_t::device_input_ports() const // mm1_keyboard_t - constructor //------------------------------------------------- -mm1_keyboard_t::mm1_keyboard_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +mm1_keyboard_t::mm1_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MM1_KEYBOARD, "MikroMikko 1 keyboard", tag, owner, clock, "mm1kb", __FILE__), m_write_kbst(*this), m_samples(*this, "keyboard_and_chassis_sounds"), diff --git a/src/mame/machine/mm1kb.h b/src/mame/machine/mm1kb.h index 54149450358..594608696b3 100644 --- a/src/mame/machine/mm1kb.h +++ b/src/mame/machine/mm1kb.h @@ -35,7 +35,7 @@ class mm1_keyboard_t : public device_t { public: // construction/destruction - mm1_keyboard_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mm1_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_kbst_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_kbst.set_callback(object); } diff --git a/src/mame/machine/ms7004.cpp b/src/mame/machine/ms7004.cpp index cce0546f192..f0f9d2ad10d 100644 --- a/src/mame/machine/ms7004.cpp +++ b/src/mame/machine/ms7004.cpp @@ -354,7 +354,7 @@ ioport_constructor ms7004_device::device_input_ports() const // ms7004_device - constructor //------------------------------------------------- -ms7004_device::ms7004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ms7004_device::ms7004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MS7004, "MS7004 keyboard", tag, owner, clock, "ms7004", __FILE__), m_maincpu(*this, MS7004_CPU_TAG), m_speaker(*this, MS7004_SPK_TAG), @@ -416,7 +416,7 @@ WRITE8_MEMBER( ms7004_device::p1_w ) 6 7 Serial TX */ - DBG_LOG(2,0,( "%s: p1_w %02x = send %d\n", tag().c_str(), data, BIT(data, 7))); + DBG_LOG(2,0,( "%s: p1_w %02x = send %d\n", tag(), data, BIT(data, 7))); m_p1 = data; m_tx_handler(BIT(data, 7)); @@ -441,7 +441,7 @@ WRITE8_MEMBER( ms7004_device::p2_w ) 6 LED "Caps" 7 LED "Hold" */ - DBG_LOG(2,0,( "%s: p2_w %02x = col %d\n", tag().c_str(), data, data&15)); + DBG_LOG(2,0,( "%s: p2_w %02x = col %d\n", tag(), data, data&15)); m_p2 = data; m_i8243->i8243_p2_w(space, offset, data); @@ -457,7 +457,7 @@ WRITE8_MEMBER( ms7004_device::i8243_port_w ) int sense = 0; DBG_LOG(2,0,( "%s: 8243 port %d data %02xH\n", - tag().c_str(), offset + 4, data)); + tag(), offset + 4, data)); if (data) { switch(offset << 4 | data) { @@ -481,7 +481,7 @@ WRITE8_MEMBER( ms7004_device::i8243_port_w ) m_keylatch = BIT(sense, (m_p1 & 7)); if (m_keylatch) DBG_LOG(1,0,( "%s: row %d col %02x t1 %d\n", - tag().c_str(), (m_p1 & 7), (offset << 4 | data), m_keylatch)); + tag(), (m_p1 & 7), (offset << 4 | data), m_keylatch)); } } diff --git a/src/mame/machine/ms7004.h b/src/mame/machine/ms7004.h index 00189cff641..1ceca1b46b6 100644 --- a/src/mame/machine/ms7004.h +++ b/src/mame/machine/ms7004.h @@ -33,7 +33,7 @@ class ms7004_device : public device_t //, public device_serial_interface { public: // construction/destruction - ms7004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ms7004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_tx_handler(device_t &device, _Object wr) { return downcast(device).m_tx_handler.set_callback(wr); } diff --git a/src/mame/machine/msx_matsushita.cpp b/src/mame/machine/msx_matsushita.cpp index d687b228515..dd00841f5eb 100644 --- a/src/mame/machine/msx_matsushita.cpp +++ b/src/mame/machine/msx_matsushita.cpp @@ -7,7 +7,7 @@ const device_type MSX_MATSUSHITA = &device_creator; -msx_matsushita_device::msx_matsushita_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_matsushita_device::msx_matsushita_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : msx_switched_device(mconfig, MSX_MATSUSHITA, "Matsushita switched device", tag, owner, clock, "msx_matsushita", __FILE__) , m_io_config(*this, "CONFIG") , m_nvram(*this, "nvram") diff --git a/src/mame/machine/msx_matsushita.h b/src/mame/machine/msx_matsushita.h index 9c71e424537..70a30d705a6 100644 --- a/src/mame/machine/msx_matsushita.h +++ b/src/mame/machine/msx_matsushita.h @@ -21,7 +21,7 @@ extern const device_type MSX_MATSUSHITA; class msx_matsushita_device : public msx_switched_device { public: - msx_matsushita_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + msx_matsushita_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_turbo_callback(device_t &device, _Object object) { return downcast(device).m_turbo_out_cb.set_callback(object); } diff --git a/src/mame/machine/msx_s1985.cpp b/src/mame/machine/msx_s1985.cpp index eeb2affe463..762b82afa8f 100644 --- a/src/mame/machine/msx_s1985.cpp +++ b/src/mame/machine/msx_s1985.cpp @@ -7,7 +7,7 @@ const device_type MSX_S1985 = &device_creator; -msx_s1985_device::msx_s1985_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_s1985_device::msx_s1985_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : msx_switched_device(mconfig, MSX_S1985, "MSX-Engine S1985", tag, owner, clock, "msx_s1985", __FILE__) , m_6_1(0) , m_6_2(0) diff --git a/src/mame/machine/msx_s1985.h b/src/mame/machine/msx_s1985.h index 8d61855f57e..0a741ce5071 100644 --- a/src/mame/machine/msx_s1985.h +++ b/src/mame/machine/msx_s1985.h @@ -17,7 +17,7 @@ extern const device_type MSX_S1985; class msx_s1985_device : public msx_switched_device { public: - msx_s1985_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + msx_s1985_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual UINT8 get_id() override; diff --git a/src/mame/machine/msx_switched.cpp b/src/mame/machine/msx_switched.cpp index 9ec492934b7..f810f2c2dc2 100644 --- a/src/mame/machine/msx_switched.cpp +++ b/src/mame/machine/msx_switched.cpp @@ -4,7 +4,7 @@ #include "msx_switched.h" -msx_switched_device::msx_switched_device(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_switched_device::msx_switched_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } diff --git a/src/mame/machine/msx_switched.h b/src/mame/machine/msx_switched.h index 42a643bded6..2b3c3c02c17 100644 --- a/src/mame/machine/msx_switched.h +++ b/src/mame/machine/msx_switched.h @@ -7,7 +7,7 @@ class msx_switched_device : public device_t { public: - msx_switched_device(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_switched_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual UINT8 get_id() = 0; diff --git a/src/mame/machine/msx_systemflags.cpp b/src/mame/machine/msx_systemflags.cpp index 52268e0b24d..ee443f79471 100644 --- a/src/mame/machine/msx_systemflags.cpp +++ b/src/mame/machine/msx_systemflags.cpp @@ -7,7 +7,7 @@ const device_type MSX_SYSTEMFLAGS = &device_creator; -msx_systemflags_device::msx_systemflags_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msx_systemflags_device::msx_systemflags_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSX_SYSTEMFLAGS, "MSX System Flags", tag, owner, clock, "msx_systemflags", __FILE__) , m_initial_value(0xff) , m_system_flags(0xff) diff --git a/src/mame/machine/msx_systemflags.h b/src/mame/machine/msx_systemflags.h index a066e757468..65e7bdb87ba 100644 --- a/src/mame/machine/msx_systemflags.h +++ b/src/mame/machine/msx_systemflags.h @@ -20,7 +20,7 @@ extern const device_type MSX_SYSTEMFLAGS; class msx_systemflags_device : public device_t { public: - msx_systemflags_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + msx_systemflags_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers static void set_initial_value(device_t &device, UINT8 initial_value) { dynamic_cast(device).m_initial_value = initial_value; } diff --git a/src/mame/machine/n64.cpp b/src/mame/machine/n64.cpp index c93a870bbec..4918f1a1613 100644 --- a/src/mame/machine/n64.cpp +++ b/src/mame/machine/n64.cpp @@ -20,7 +20,7 @@ const device_type N64PERIPH = &device_creator; -n64_periphs::n64_periphs(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +n64_periphs::n64_periphs(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, N64PERIPH, "N64 Periphal Chips", tag, owner, clock, "n64_periphs", __FILE__) , device_video_interface(mconfig, *this) , m_nvram_image(nullptr) diff --git a/src/mame/machine/namco06.cpp b/src/mame/machine/namco06.cpp index 152f232eeca..f8b6703f530 100644 --- a/src/mame/machine/namco06.cpp +++ b/src/mame/machine/namco06.cpp @@ -92,11 +92,11 @@ TIMER_CALLBACK_MEMBER( namco_06xx_device::nmi_generate ) { if (!m_nmicpu->suspended(SUSPEND_REASON_HALT | SUSPEND_REASON_RESET | SUSPEND_REASON_DISABLE)) { - LOG(("NMI cpu '%s'\n",m_nmicpu->tag().c_str())); + LOG(("NMI cpu '%s'\n",m_nmicpu->tag())); m_nmicpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } else - LOG(("NMI not generated because cpu '%s' is suspended\n",m_nmicpu->tag().c_str())); + LOG(("NMI not generated because cpu '%s' is suspended\n",m_nmicpu->tag())); } @@ -104,11 +104,11 @@ READ8_MEMBER( namco_06xx_device::data_r ) { UINT8 result = 0xff; - LOG(("%s: 06XX '%s' read offset %d\n",machine().describe_context(),tag().c_str(),offset)); + LOG(("%s: 06XX '%s' read offset %d\n",machine().describe_context(),tag(),offset)); if (!(m_control & 0x10)) { - logerror("%s: 06XX '%s' read in write mode %02x\n",machine().describe_context(),tag().c_str(),m_control); + logerror("%s: 06XX '%s' read in write mode %02x\n",machine().describe_context(),tag(),m_control); return 0; } @@ -123,11 +123,11 @@ READ8_MEMBER( namco_06xx_device::data_r ) WRITE8_MEMBER( namco_06xx_device::data_w ) { - LOG(("%s: 06XX '%s' write offset %d = %02x\n",machine().describe_context(),tag().c_str(),offset,data)); + LOG(("%s: 06XX '%s' write offset %d = %02x\n",machine().describe_context(),tag(),offset,data)); if (m_control & 0x10) { - logerror("%s: 06XX '%s' write in read mode %02x\n",machine().describe_context(),tag().c_str(),m_control); + logerror("%s: 06XX '%s' write in read mode %02x\n",machine().describe_context(),tag(),m_control); return; } if ((m_control & (1 << 0)) && !m_write_0.isnull()) m_write_0(space, 0, data); @@ -139,13 +139,13 @@ WRITE8_MEMBER( namco_06xx_device::data_w ) READ8_MEMBER( namco_06xx_device::ctrl_r ) { - LOG(("%s: 06XX '%s' ctrl_r\n",machine().describe_context(),tag().c_str())); + LOG(("%s: 06XX '%s' ctrl_r\n",machine().describe_context(),tag())); return m_control; } WRITE8_MEMBER( namco_06xx_device::ctrl_w ) { - LOG(("%s: 06XX '%s' control %02x\n",space.machine().describe_context(),tag().c_str(),data)); + LOG(("%s: 06XX '%s' control %02x\n",space.machine().describe_context(),tag(),data)); m_control = data; @@ -176,7 +176,7 @@ WRITE8_MEMBER( namco_06xx_device::ctrl_w ) const device_type NAMCO_06XX = &device_creator; -namco_06xx_device::namco_06xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_06xx_device::namco_06xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_06XX, "Namco 06xx", tag, owner, clock, "namco06xx", __FILE__), m_control(0), m_nmicpu(*this), diff --git a/src/mame/machine/namco06.h b/src/mame/machine/namco06.h index d6d4793afd2..446009dbcec 100644 --- a/src/mame/machine/namco06.h +++ b/src/mame/machine/namco06.h @@ -63,9 +63,9 @@ struct namco_06xx_config class namco_06xx_device : public device_t { public: - namco_06xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_06xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void set_maincpu(device_t &device, std::string tag) { downcast(device).m_nmicpu.set_tag(tag); } + static void set_maincpu(device_t &device, const char *tag) { downcast(device).m_nmicpu.set_tag(tag); } template static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast(device).m_read_0.set_callback(object); } template static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast(device).m_read_1.set_callback(object); } diff --git a/src/mame/machine/namco50.cpp b/src/mame/machine/namco50.cpp index 7e429664cca..8967806295a 100644 --- a/src/mame/machine/namco50.cpp +++ b/src/mame/machine/namco50.cpp @@ -239,7 +239,7 @@ ROM_END const device_type NAMCO_50XX = &device_creator; -namco_50xx_device::namco_50xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_50xx_device::namco_50xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_50XX, "Namco 50xx", tag, owner, clock, "namco50", __FILE__), m_cpu(*this, "mcu"), m_latched_cmd(0), diff --git a/src/mame/machine/namco50.h b/src/mame/machine/namco50.h index e51ebebedf0..320e785fafa 100644 --- a/src/mame/machine/namco50.h +++ b/src/mame/machine/namco50.h @@ -13,7 +13,7 @@ class namco_50xx_device : public device_t { public: - namco_50xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_50xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); WRITE8_MEMBER( write ); WRITE_LINE_MEMBER(read_request); diff --git a/src/mame/machine/namco51.cpp b/src/mame/machine/namco51.cpp index 17cffd5e9c1..2cd77ab69b5 100644 --- a/src/mame/machine/namco51.cpp +++ b/src/mame/machine/namco51.cpp @@ -342,7 +342,7 @@ ROM_END const device_type NAMCO_51XX = &device_creator; -namco_51xx_device::namco_51xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_51xx_device::namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_51XX, "Namco 51xx", tag, owner, clock, "namco51", __FILE__), m_cpu(*this, "mcu"), m_in_0(*this), diff --git a/src/mame/machine/namco51.h b/src/mame/machine/namco51.h index 72d4a80ffd8..22c7e4e2cdc 100644 --- a/src/mame/machine/namco51.h +++ b/src/mame/machine/namco51.h @@ -30,7 +30,7 @@ class namco_51xx_device : public device_t { public: - namco_51xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_input_0_callback(device_t &device, _Object object) { return downcast(device).m_in_0.set_callback(object); } template static devcb_base &set_input_1_callback(device_t &device, _Object object) { return downcast(device).m_in_1.set_callback(object); } diff --git a/src/mame/machine/namco53.cpp b/src/mame/machine/namco53.cpp index ceff9efbd6c..e5e809ec465 100644 --- a/src/mame/machine/namco53.cpp +++ b/src/mame/machine/namco53.cpp @@ -145,7 +145,7 @@ ROM_END const device_type NAMCO_53XX = &device_creator; -namco_53xx_device::namco_53xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_53xx_device::namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_53XX, "Namco 53xx", tag, owner, clock, "namco53", __FILE__), m_cpu(*this, "mcu"), m_portO(0), diff --git a/src/mame/machine/namco53.h b/src/mame/machine/namco53.h index d07c5d73a3e..66b60c8c80f 100644 --- a/src/mame/machine/namco53.h +++ b/src/mame/machine/namco53.h @@ -30,7 +30,7 @@ class namco_53xx_device : public device_t { public: - namco_53xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_input_0_callback(device_t &device, _Object object) { return downcast(device).m_in_0.set_callback(object); } template static devcb_base &set_input_1_callback(device_t &device, _Object object) { return downcast(device).m_in_1.set_callback(object); } diff --git a/src/mame/machine/namco62.cpp b/src/mame/machine/namco62.cpp index 0d3f9d8f5d2..de6e6067972 100644 --- a/src/mame/machine/namco62.cpp +++ b/src/mame/machine/namco62.cpp @@ -44,7 +44,7 @@ ROM_END const device_type NAMCO_62XX = &device_creator; -namco_62xx_device::namco_62xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_62xx_device::namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_62XX, "Namco 62xx", tag, owner, clock, "namco62", __FILE__), m_cpu(*this, "mcu"), m_in_0(*this), diff --git a/src/mame/machine/namco62.h b/src/mame/machine/namco62.h index bb092e448d0..323c751c789 100644 --- a/src/mame/machine/namco62.h +++ b/src/mame/machine/namco62.h @@ -30,7 +30,7 @@ class namco_62xx_device : public device_t { public: - namco_62xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_input_0_callback(device_t &device, _Object object) { return downcast(device).m_in_0.set_callback(object); } template static devcb_base &set_input_1_callback(device_t &device, _Object object) { return downcast(device).m_in_1.set_callback(object); } diff --git a/src/mame/machine/namco_settings.cpp b/src/mame/machine/namco_settings.cpp index e8d695d2465..ba028892786 100644 --- a/src/mame/machine/namco_settings.cpp +++ b/src/mame/machine/namco_settings.cpp @@ -5,7 +5,7 @@ const device_type NAMCO_SETTINGS = &device_creator; -namco_settings_device::namco_settings_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +namco_settings_device::namco_settings_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_SETTINGS, "Namco Settings", tag, owner, clock, "namco_settings", __FILE__) { } @@ -31,7 +31,7 @@ WRITE_LINE_MEMBER( namco_settings_device::clk_w ) cur_bit++; if(cur_bit == 16) { cur_bit = 0; - logerror("%s: %02x = %02x\n", tag().c_str(), adr, value); + logerror("%s: %02x = %02x\n", tag(), adr, value); } } } diff --git a/src/mame/machine/namco_settings.h b/src/mame/machine/namco_settings.h index 618167cf640..8bd18ad4346 100644 --- a/src/mame/machine/namco_settings.h +++ b/src/mame/machine/namco_settings.h @@ -11,7 +11,7 @@ class namco_settings_device : public device_t { public: - namco_settings_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_settings_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER( ce_w ); DECLARE_WRITE_LINE_MEMBER( clk_w ); diff --git a/src/mame/machine/namcoio.cpp b/src/mame/machine/namcoio.cpp index cb625654004..4ac534279ce 100644 --- a/src/mame/machine/namcoio.cpp +++ b/src/mame/machine/namcoio.cpp @@ -122,7 +122,7 @@ const device_type NAMCO56XX = &device_creator; const device_type NAMCO58XX = &device_creator; const device_type NAMCO59XX = &device_creator; -namcoio_device::namcoio_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname) +namcoio_device::namcoio_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), m_in_0_cb(*this), m_in_1_cb(*this), @@ -133,19 +133,19 @@ namcoio_device::namcoio_device(const machine_config &mconfig, device_type type, { } -namco56xx_device::namco56xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco56xx_device::namco56xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : namcoio_device(mconfig, NAMCO56XX, "Namco 56xx", tag, owner, clock, "56xx") { m_device_type = TYPE_NAMCO56XX; } -namco58xx_device::namco58xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco58xx_device::namco58xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : namcoio_device(mconfig, NAMCO58XX, "Namco 58xx", tag, owner, clock, "58xx") { m_device_type = TYPE_NAMCO58XX; } -namco59xx_device::namco59xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco59xx_device::namco59xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : namcoio_device(mconfig, NAMCO59XX, "Namco 59xx", tag, owner, clock, "59xx") { m_device_type = TYPE_NAMCO59XX; diff --git a/src/mame/machine/namcoio.h b/src/mame/machine/namcoio.h index db18a9eb976..b28b2a9117d 100644 --- a/src/mame/machine/namcoio.h +++ b/src/mame/machine/namcoio.h @@ -11,7 +11,7 @@ class namcoio_device : public device_t { public: - namcoio_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname); + namcoio_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); template static devcb_base &set_in_0_callback(device_t &device, _Object object) { return downcast(device).m_in_0_cb.set_callback(object); } template static devcb_base &set_in_1_callback(device_t &device, _Object object) { return downcast(device).m_in_1_cb.set_callback(object); } @@ -69,7 +69,7 @@ private: class namco56xx_device : public namcoio_device { public: - namco56xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco56xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void customio_run() override; }; @@ -77,7 +77,7 @@ public: class namco58xx_device : public namcoio_device { public: - namco58xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco58xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void customio_run() override; }; @@ -85,7 +85,7 @@ public: class namco59xx_device : public namcoio_device { public: - namco59xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco59xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void customio_run() override; }; diff --git a/src/mame/machine/namcomcu.cpp b/src/mame/machine/namcomcu.cpp index bd585973453..82495680f51 100644 --- a/src/mame/machine/namcomcu.cpp +++ b/src/mame/machine/namcomcu.cpp @@ -53,27 +53,27 @@ ROM_START( c76 ) ROM_END -namco_c69_device::namco_c69_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_c69_device::namco_c69_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m37702m2_device(mconfig, NAMCO_C69, "C69 (M37702)", tag, owner, clock, "namcoc69", __FILE__) { } -namco_c70_device::namco_c70_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_c70_device::namco_c70_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m37702m2_device(mconfig, NAMCO_C70, "C70 (M37702)", tag, owner, clock, "namcoc70", __FILE__) { } -namco_c74_device::namco_c74_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_c74_device::namco_c74_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m37702m2_device(mconfig, NAMCO_C74, "C74 (M37702)", tag, owner, clock, "namcoc74", __FILE__) { } -namco_c75_device::namco_c75_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_c75_device::namco_c75_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m37702m2_device(mconfig, NAMCO_C75, "C75 (M37702)", tag, owner, clock, "namcoc75", __FILE__) { } -namco_c76_device::namco_c76_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_c76_device::namco_c76_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : m37702m2_device(mconfig, NAMCO_C76, "C76 (M37702)", tag, owner, clock, "namcoc76", __FILE__) { } diff --git a/src/mame/machine/namcomcu.h b/src/mame/machine/namcomcu.h index 2778787aa77..e4daf70a020 100644 --- a/src/mame/machine/namcomcu.h +++ b/src/mame/machine/namcomcu.h @@ -11,7 +11,7 @@ class namco_c69_device : public m37702m2_device { public: - namco_c69_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_c69_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual const rom_entry *device_rom_region() const override; }; @@ -20,7 +20,7 @@ protected: class namco_c70_device : public m37702m2_device { public: - namco_c70_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_c70_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual const rom_entry *device_rom_region() const override; }; @@ -29,7 +29,7 @@ protected: class namco_c74_device : public m37702m2_device { public: - namco_c74_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_c74_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual const rom_entry *device_rom_region() const override; }; @@ -38,7 +38,7 @@ protected: class namco_c75_device : public m37702m2_device { public: - namco_c75_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_c75_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual const rom_entry *device_rom_region() const override; }; @@ -47,7 +47,7 @@ protected: class namco_c76_device : public m37702m2_device { public: - namco_c76_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_c76_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual const rom_entry *device_rom_region() const override; }; diff --git a/src/mame/machine/namcos1.cpp b/src/mame/machine/namcos1.cpp index e7e8701db7b..9d7fa409421 100644 --- a/src/mame/machine/namcos1.cpp +++ b/src/mame/machine/namcos1.cpp @@ -19,13 +19,13 @@ WRITE8_MEMBER( namcos1_state::_3dcs_w ) READ8_MEMBER( namcos1_state::no_key_r ) { - popmessage("CPU %s PC %08x: keychip read %04x\n", space.device().tag().c_str(), space.device().safe_pc(), offset); + popmessage("CPU %s PC %08x: keychip read %04x\n", space.device().tag(), space.device().safe_pc(), offset); return 0; } WRITE8_MEMBER( namcos1_state::no_key_w ) { - popmessage("CPU %s PC %08x: keychip write %04x=%02x\n", space.device().tag().c_str(), space.device().safe_pc(), offset, data); + popmessage("CPU %s PC %08x: keychip write %04x=%02x\n", space.device().tag(), space.device().safe_pc(), offset, data); } @@ -455,14 +455,14 @@ READ8_MEMBER( namcos1_state::key_type3_r ) if (op == m_key_bottom4) return (offset << 4) | (m_key[m_key_swap4_arg] & 0x0f); if (op == m_key_top4) return (offset << 4) | (m_key[m_key_swap4_arg] >> 4); - popmessage("CPU %s PC %08x: keychip read %04x", space.device().tag().c_str(), space.device().safe_pc(), offset); + popmessage("CPU %s PC %08x: keychip read %04x", space.device().tag(), space.device().safe_pc(), offset); return 0; } WRITE8_MEMBER( namcos1_state::key_type3_w ) { -// logerror("CPU %s PC %04x: keychip write %04x=%02x\n", space.device().tag().c_str(), space.device().safe_pc(), offset, data); +// logerror("CPU %s PC %04x: keychip write %04x=%02x\n", space.device().tag(), space.device().safe_pc(), offset, data); m_key[(offset & 0x70) >> 4] = data; } diff --git a/src/mame/machine/naomi.cpp b/src/mame/machine/naomi.cpp index 96f30efad03..72a3a6338b9 100644 --- a/src/mame/machine/naomi.cpp +++ b/src/mame/machine/naomi.cpp @@ -213,7 +213,7 @@ INPUT_CHANGED_MEMBER(naomi_state::naomi_mp_w) } CUSTOM_INPUT_MEMBER(naomi_state::naomi_mp_r) { - const char * tagptr = (const char *)param; + const char *tagptr = (const char *)param; UINT8 retval = 0; for (int i = 0x80; i >= 0x08; i >>= 1) diff --git a/src/mame/machine/naomibd.cpp b/src/mame/machine/naomibd.cpp index f0b6c991bf2..704c357d70f 100644 --- a/src/mame/machine/naomibd.cpp +++ b/src/mame/machine/naomibd.cpp @@ -65,7 +65,7 @@ DEVICE_ADDRESS_MAP_START(submap, 16, naomi_board) AM_RANGE(0x00, 0xff) AM_READ(default_r) ADDRESS_MAP_END -naomi_board::naomi_board(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +naomi_board::naomi_board(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : naomi_g1_device(mconfig, type, name, tag, owner, clock, shortname, source) { eeprom_tag = nullptr; diff --git a/src/mame/machine/naomibd.h b/src/mame/machine/naomibd.h index 3061291ce65..1b4d2b705c0 100644 --- a/src/mame/machine/naomibd.h +++ b/src/mame/machine/naomibd.h @@ -12,7 +12,7 @@ class naomi_board : public naomi_g1_device { public: - naomi_board(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + naomi_board(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); static void static_set_eeprom_tag(device_t &device, const char *_eeprom_tag, const char *_actel_tag); diff --git a/src/mame/machine/naomig1.cpp b/src/mame/machine/naomig1.cpp index 8221db382db..1a4cea48b13 100644 --- a/src/mame/machine/naomig1.cpp +++ b/src/mame/machine/naomig1.cpp @@ -25,7 +25,7 @@ DEVICE_ADDRESS_MAP_START(amap, 32, naomi_g1_device) AM_RANGE(0xf8, 0xfb) AM_READ(sb_gdlend_r) ADDRESS_MAP_END -naomi_g1_device::naomi_g1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +naomi_g1_device::naomi_g1_device(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), irq_cb(*this) { diff --git a/src/mame/machine/naomig1.h b/src/mame/machine/naomig1.h index 717467ab50e..0ab82cf134f 100644 --- a/src/mame/machine/naomig1.h +++ b/src/mame/machine/naomig1.h @@ -18,7 +18,7 @@ public: typedef delegate dma_cb; - naomi_g1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + naomi_g1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template void set_irq_cb(_cb cb) { irq_cb.set_callback(cb); } void set_dma_cb(dma_cb _cb) { _dma_cb = _cb; } diff --git a/src/mame/machine/naomigd.cpp b/src/mame/machine/naomigd.cpp index 9f5fbca28af..28dc2ccb3e6 100644 --- a/src/mame/machine/naomigd.cpp +++ b/src/mame/machine/naomigd.cpp @@ -326,7 +326,7 @@ void naomi_gdrom_board::write_from_qword(UINT8 *region, UINT64 qword) region[i] = qword >> (56-(i*8)); } -naomi_gdrom_board::naomi_gdrom_board(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +naomi_gdrom_board::naomi_gdrom_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : naomi_board(mconfig, NAOMI_GDROM_BOARD, "Sega NAOMI GDROM Board", tag, owner, clock, "naomi_gdrom_board", __FILE__) { image_tag = nullptr; diff --git a/src/mame/machine/naomigd.h b/src/mame/machine/naomigd.h index 75be1c22980..6f9e434ec13 100644 --- a/src/mame/machine/naomigd.h +++ b/src/mame/machine/naomigd.h @@ -12,7 +12,7 @@ class naomi_gdrom_board : public naomi_board { public: - naomi_gdrom_board(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + naomi_gdrom_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_tags(device_t &device, const char *_image_tag, const char *_pic_tag); diff --git a/src/mame/machine/naomim1.cpp b/src/mame/machine/naomim1.cpp index 98fa787d0fd..7e205ce1ee7 100644 --- a/src/mame/machine/naomim1.cpp +++ b/src/mame/machine/naomim1.cpp @@ -12,7 +12,7 @@ DEVICE_ADDRESS_MAP_START(submap, 16, naomi_m1_board) AM_INHERIT_FROM(naomi_board::submap) ADDRESS_MAP_END -naomi_m1_board::naomi_m1_board(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +naomi_m1_board::naomi_m1_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : naomi_board(mconfig, NAOMI_M1_BOARD, "Sega NAOMI M1 Board", tag, owner, clock, "naomi_m1_board", __FILE__) { } @@ -37,7 +37,7 @@ void naomi_m1_board::device_start() key = strtoll(skey.c_str(), nullptr, 16); else { - logerror("%s: Warning: key not provided\n", tag().c_str()); + logerror("%s: Warning: key not provided\n", tag()); key = 0; } diff --git a/src/mame/machine/naomim1.h b/src/mame/machine/naomim1.h index 290e4d5e5d8..37c5a58739b 100644 --- a/src/mame/machine/naomim1.h +++ b/src/mame/machine/naomim1.h @@ -11,7 +11,7 @@ class naomi_m1_board : public naomi_board { public: - naomi_m1_board(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + naomi_m1_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_ADDRESS_MAP(submap, 16) override; diff --git a/src/mame/machine/naomim2.cpp b/src/mame/machine/naomim2.cpp index 34cb957a0ab..516da16435e 100644 --- a/src/mame/machine/naomim2.cpp +++ b/src/mame/machine/naomim2.cpp @@ -111,7 +111,7 @@ note: if ROM is not mounted its area readed as 0xFF const device_type NAOMI_M2_BOARD = &device_creator; -naomi_m2_board::naomi_m2_board(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +naomi_m2_board::naomi_m2_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : naomi_board(mconfig, NAOMI_M2_BOARD, "Sega NAOMI M2 Board", tag, owner, clock, "naomi_m2_board", __FILE__), m_cryptdevice(*this, "segam2crypt") { diff --git a/src/mame/machine/naomim2.h b/src/mame/machine/naomim2.h index 9da797bf357..ae1bdf3fed8 100644 --- a/src/mame/machine/naomim2.h +++ b/src/mame/machine/naomim2.h @@ -13,7 +13,7 @@ class naomi_m2_board : public naomi_board { public: - naomi_m2_board(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + naomi_m2_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); UINT32 rom_cur_address; static const int RAM_SIZE = 65536; std::unique_ptr ram; diff --git a/src/mame/machine/naomim4.cpp b/src/mame/machine/naomim4.cpp index 9f5de2309a4..40ced99ea5a 100644 --- a/src/mame/machine/naomim4.cpp +++ b/src/mame/machine/naomim4.cpp @@ -46,7 +46,7 @@ DEVICE_ADDRESS_MAP_START(submap, 16, naomi_m4_board) AM_INHERIT_FROM(naomi_board::submap) ADDRESS_MAP_END -naomi_m4_board::naomi_m4_board(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +naomi_m4_board::naomi_m4_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : naomi_board(mconfig, NAOMI_M4_BOARD, "Sega NAOMI M4 Board", tag, owner, clock, "naomi_m4_board", __FILE__) { key_tag = nullptr; diff --git a/src/mame/machine/naomim4.h b/src/mame/machine/naomim4.h index ae544e0e3e3..650ed901c24 100644 --- a/src/mame/machine/naomim4.h +++ b/src/mame/machine/naomim4.h @@ -12,7 +12,7 @@ class naomi_m4_board : public naomi_board { public: - naomi_m4_board(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + naomi_m4_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_tags(device_t &device, const char *_key_tag); diff --git a/src/mame/machine/naomirom.cpp b/src/mame/machine/naomirom.cpp index d8ed31026fe..5f074d16ec6 100644 --- a/src/mame/machine/naomirom.cpp +++ b/src/mame/machine/naomirom.cpp @@ -5,7 +5,7 @@ const device_type NAOMI_ROM_BOARD = &device_creator; -naomi_rom_board::naomi_rom_board(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +naomi_rom_board::naomi_rom_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : naomi_board(mconfig, NAOMI_ROM_BOARD, "Sega NAOMI ROM Board", tag, owner, clock, "naomi_rom_board", __FILE__) { } diff --git a/src/mame/machine/naomirom.h b/src/mame/machine/naomirom.h index 20fdf43f31b..f23268cfa32 100644 --- a/src/mame/machine/naomirom.h +++ b/src/mame/machine/naomirom.h @@ -11,7 +11,7 @@ class naomi_rom_board : public naomi_board { public: - naomi_rom_board(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + naomi_rom_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; diff --git a/src/mame/machine/nb1413m3.cpp b/src/mame/machine/nb1413m3.cpp index 9249235204f..b8992261f2c 100644 --- a/src/mame/machine/nb1413m3.cpp +++ b/src/mame/machine/nb1413m3.cpp @@ -23,7 +23,7 @@ Memo: const device_type NB1413M3 = &device_creator; -nb1413m3_device::nb1413m3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nb1413m3_device::nb1413m3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NB1413M3, "NB1413M3 Mahjong Custom", tag, owner, clock, "nb1413m3", __FILE__), m_sndromrgntag("voice"), m_sndrombank1(0), diff --git a/src/mame/machine/nb1414m4.cpp b/src/mame/machine/nb1414m4.cpp index 5603f0c0f50..07fc537fd6c 100644 --- a/src/mame/machine/nb1414m4.cpp +++ b/src/mame/machine/nb1414m4.cpp @@ -32,7 +32,7 @@ Notes: const device_type NB1414M4 = &device_creator; -nb1414m4_device::nb1414m4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nb1414m4_device::nb1414m4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NB1414M4, "NB1414M4 Mahjong Custom", tag, owner, clock, "nb1414m4", __FILE__), device_video_interface(mconfig, *this), m_data(nullptr) diff --git a/src/mame/machine/nextkbd.cpp b/src/mame/machine/nextkbd.cpp index db5e0066185..7ff946b7916 100644 --- a/src/mame/machine/nextkbd.cpp +++ b/src/mame/machine/nextkbd.cpp @@ -14,7 +14,7 @@ DEVICE_ADDRESS_MAP_START(amap, 32, nextkbd_device) AM_RANGE(0x8, 0xb) AM_READWRITE(kmdata_r, kmdata_w) ADDRESS_MAP_END -nextkbd_device::nextkbd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nextkbd_device::nextkbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NEXTKBD, "NEXTKBD", tag, owner, clock, "nextkbd", __FILE__), int_change_cb(*this), int_power_cb(*this), @@ -161,31 +161,31 @@ bool nextkbd_device::fifo_empty() const READ8_MEMBER( nextkbd_device::status_snd_r ) { - logerror("%s: status_snd_r %02x (%08x)\n", tag().c_str(), ctrl_snd, (unsigned int)space.device().safe_pc()); + logerror("%s: status_snd_r %02x (%08x)\n", tag(), ctrl_snd, (unsigned int)space.device().safe_pc()); return ctrl_snd; } READ8_MEMBER( nextkbd_device::status_kms_r ) { - logerror("%s: status_kms_r %02x (%08x)\n", tag().c_str(), ctrl_kms, (unsigned int)space.device().safe_pc()); + logerror("%s: status_kms_r %02x (%08x)\n", tag(), ctrl_kms, (unsigned int)space.device().safe_pc()); return ctrl_kms; } READ8_MEMBER( nextkbd_device::status_dma_r ) { - logerror("%s: status_dma_r %02x (%08x)\n", tag().c_str(), ctrl_dma, (unsigned int)space.device().safe_pc()); + logerror("%s: status_dma_r %02x (%08x)\n", tag(), ctrl_dma, (unsigned int)space.device().safe_pc()); return ctrl_dma; } READ8_MEMBER( nextkbd_device::status_cmd_r ) { - logerror("%s: status_cmd_r %02x (%08x)\n", tag().c_str(), ctrl_cmd, (unsigned int)space.device().safe_pc()); + logerror("%s: status_cmd_r %02x (%08x)\n", tag(), ctrl_cmd, (unsigned int)space.device().safe_pc()); return ctrl_cmd; } READ32_MEMBER( nextkbd_device::cdata_r ) { - logerror("%s: cdata_r %08x @ %08x (%08x)\n", tag().c_str(), cdata, mem_mask, (unsigned int)space.device().safe_pc()); + logerror("%s: cdata_r %08x @ %08x (%08x)\n", tag(), cdata, mem_mask, (unsigned int)space.device().safe_pc()); return cdata; } @@ -195,7 +195,7 @@ READ32_MEMBER( nextkbd_device::kmdata_r ) ctrl_kms &= ~(C_KBD_INTERRUPT|C_KBD_DATA); if(old & C_KBD_INTERRUPT) int_change_cb(false); - logerror("%s: kmdata_r %08x @ %08x (%08x)\n", tag().c_str(), kmdata, mem_mask, (unsigned int)space.device().safe_pc()); + logerror("%s: kmdata_r %08x @ %08x (%08x)\n", tag(), kmdata, mem_mask, (unsigned int)space.device().safe_pc()); return kmdata; } @@ -205,7 +205,7 @@ WRITE8_MEMBER( nextkbd_device::ctrl_snd_w ) ctrl_snd = (ctrl_snd & ~C_SOUND_WMASK) | (data & C_SOUND_WMASK); UINT8 diff = old ^ ctrl_snd; - logerror("%s: ctrl_snd_w %02x | %02x (%08x)\n", tag().c_str(), ctrl_snd, diff, (unsigned int)space.device().safe_pc()); + logerror("%s: ctrl_snd_w %02x | %02x (%08x)\n", tag(), ctrl_snd, diff, (unsigned int)space.device().safe_pc()); } WRITE8_MEMBER( nextkbd_device::ctrl_kms_w ) @@ -214,7 +214,7 @@ WRITE8_MEMBER( nextkbd_device::ctrl_kms_w ) ctrl_kms = (ctrl_kms & ~C_KMS_WMASK) | (data & C_KMS_WMASK); UINT8 diff = old ^ ctrl_kms; - logerror("%s: ctrl_kms_w %02x | %02x (%08x)\n", tag().c_str(), ctrl_kms, diff, (unsigned int)space.device().safe_pc()); + logerror("%s: ctrl_kms_w %02x | %02x (%08x)\n", tag(), ctrl_kms, diff, (unsigned int)space.device().safe_pc()); } WRITE8_MEMBER( nextkbd_device::ctrl_dma_w ) @@ -223,25 +223,25 @@ WRITE8_MEMBER( nextkbd_device::ctrl_dma_w ) ctrl_dma = (ctrl_dma & ~C_WMASK) | (data & C_WMASK); UINT8 diff = old ^ ctrl_dma; - logerror("%s: ctrl_dma_w %02x | %02x (%08x)\n", tag().c_str(), ctrl_dma, diff, (unsigned int)space.device().safe_pc()); + logerror("%s: ctrl_dma_w %02x | %02x (%08x)\n", tag(), ctrl_dma, diff, (unsigned int)space.device().safe_pc()); } WRITE8_MEMBER( nextkbd_device::ctrl_cmd_w ) { ctrl_cmd = data; - logerror("%s: ctrl_cmd_w %02x (%08x)\n", tag().c_str(), ctrl_cmd, (unsigned int)space.device().safe_pc()); + logerror("%s: ctrl_cmd_w %02x (%08x)\n", tag(), ctrl_cmd, (unsigned int)space.device().safe_pc()); } WRITE32_MEMBER( nextkbd_device::cdata_w ) { COMBINE_DATA(&cdata); - logerror("%s: cdata_w %08x @ %08x (%08x)\n", tag().c_str(), data, mem_mask, (unsigned int)space.device().safe_pc()); + logerror("%s: cdata_w %08x @ %08x (%08x)\n", tag(), data, mem_mask, (unsigned int)space.device().safe_pc()); handle_command(); } WRITE32_MEMBER( nextkbd_device::kmdata_w ) { - logerror("%s: kmdata_w %08x @ %08x (%08x)\n", tag().c_str(), data, mem_mask, (unsigned int)space.device().safe_pc()); + logerror("%s: kmdata_w %08x @ %08x (%08x)\n", tag(), data, mem_mask, (unsigned int)space.device().safe_pc()); } INPUT_CHANGED_MEMBER( nextkbd_device::update ) @@ -289,7 +289,7 @@ INPUT_CHANGED_MEMBER( nextkbd_device::update ) void nextkbd_device::handle_fifo_command() { - logerror("%s: Fifo command %08x?\n", tag().c_str(), cdata); + logerror("%s: Fifo command %08x?\n", tag(), cdata); fifo_ir = 0; fifo_iw = 0; fifo_size = 0; @@ -303,18 +303,18 @@ void nextkbd_device::handle_kbd_command() { switch(cdata >> 24) { case 0x00: - logerror("%s: Keyboard LED control %06x?\n", tag().c_str(), cdata & 0xffffff); + logerror("%s: Keyboard LED control %06x?\n", tag(), cdata & 0xffffff); ctrl_kms |= C_KBD_DATA; // Hmmmm. The rom wants it, but I'm not sure if data is actually expected break; case 0xef: - logerror("%s: Set keyboard/mouse address to %d\n", tag().c_str(), (cdata >> 17) & 7); + logerror("%s: Set keyboard/mouse address to %d\n", tag(), (cdata >> 17) & 7); km_address = ((cdata >> 17) & 7) << 25; ctrl_kms |= C_KBD_DATA; // Hmmmm. The rom wants it, but I'm not sure if data is actually expected break; default: - logerror("%s: Unhandled keyboard command %02x.%06x\n", tag().c_str(), cdata >> 24, cdata & 0xffffff); + logerror("%s: Unhandled keyboard command %02x.%06x\n", tag(), cdata >> 24, cdata & 0xffffff); break; } } @@ -331,7 +331,7 @@ void nextkbd_device::handle_command() break; default: - logerror("%s: Unhandled command %02x.%08x\n", tag().c_str(), ctrl_cmd, cdata); + logerror("%s: Unhandled command %02x.%08x\n", tag(), ctrl_cmd, cdata); break; } } diff --git a/src/mame/machine/nextkbd.h b/src/mame/machine/nextkbd.h index 53c58247b84..ed233dd8ecd 100644 --- a/src/mame/machine/nextkbd.h +++ b/src/mame/machine/nextkbd.h @@ -16,7 +16,7 @@ class nextkbd_device : public device_t { public: - nextkbd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nextkbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_int_change_wr_callback(device_t &device, _Object object) { return downcast(device).int_change_cb.set_callback(object); } template static devcb_base &set_int_power_wr_callback(device_t &device, _Object object) { return downcast(device).int_power_cb.set_callback(object); } diff --git a/src/mame/machine/nextmo.cpp b/src/mame/machine/nextmo.cpp index 4ea3c95fb47..20cfba9aa6c 100644 --- a/src/mame/machine/nextmo.cpp +++ b/src/mame/machine/nextmo.cpp @@ -18,7 +18,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, nextmo_device) AM_RANGE(0x10, 0x17) AM_READWRITE(r10_r, r10_w) ADDRESS_MAP_END -nextmo_device::nextmo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +nextmo_device::nextmo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NEXTMO, "NeXT Magneto-optical drive", tag, owner, clock, "nextmo", __FILE__), r4(0), irq_cb(*this), diff --git a/src/mame/machine/nextmo.h b/src/mame/machine/nextmo.h index 5ccc4a17208..a219f159be2 100644 --- a/src/mame/machine/nextmo.h +++ b/src/mame/machine/nextmo.h @@ -12,7 +12,7 @@ class nextmo_device : public device_t { public: - nextmo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nextmo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).irq_cb.set_callback(object); } template static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast(device).drq_cb.set_callback(object); } diff --git a/src/mame/machine/ng_memcard.cpp b/src/mame/machine/ng_memcard.cpp index 05515d26696..f4c816c6f1c 100644 --- a/src/mame/machine/ng_memcard.cpp +++ b/src/mame/machine/ng_memcard.cpp @@ -19,7 +19,7 @@ const device_type NG_MEMCARD = &device_creator; // ng_memcard_device - constructor //------------------------------------------------- -ng_memcard_device::ng_memcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ng_memcard_device::ng_memcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NG_MEMCARD, "NeoGeo Memory Card", tag, owner, clock, "ng_memcard", __FILE__), device_image_interface(mconfig, *this) { diff --git a/src/mame/machine/ng_memcard.h b/src/mame/machine/ng_memcard.h index e11e31fb1a1..4752c1d1a67 100644 --- a/src/mame/machine/ng_memcard.h +++ b/src/mame/machine/ng_memcard.h @@ -31,7 +31,7 @@ class ng_memcard_device : public device_t, { public: // construction/destruction - ng_memcard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ng_memcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual iodevice_t image_type() const override { return IO_MEMCARD; } diff --git a/src/mame/machine/ngen_kb.cpp b/src/mame/machine/ngen_kb.cpp index 1dbfa0fdac8..4c901ea5d41 100644 --- a/src/mame/machine/ngen_kb.cpp +++ b/src/mame/machine/ngen_kb.cpp @@ -4,7 +4,7 @@ #include "ngen_kb.h" -ngen_keyboard_device::ngen_keyboard_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : +ngen_keyboard_device::ngen_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : serial_keyboard_device(mconfig, NGEN_KEYBOARD, "NGEN Keyboard", tag, owner, 0, "ngen_keyboard", __FILE__), m_keys_down(false) { diff --git a/src/mame/machine/ngen_kb.h b/src/mame/machine/ngen_kb.h index ce9667c1275..1270077bf99 100644 --- a/src/mame/machine/ngen_kb.h +++ b/src/mame/machine/ngen_kb.h @@ -10,7 +10,7 @@ class ngen_keyboard_device : public serial_keyboard_device { public: - ngen_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ngen_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } diff --git a/src/mame/machine/nmk004.cpp b/src/mame/machine/nmk004.cpp index 3383ac2ab44..abf9f9d2ec6 100644 --- a/src/mame/machine/nmk004.cpp +++ b/src/mame/machine/nmk004.cpp @@ -98,7 +98,7 @@ ROM_END const device_type NMK004 = &device_creator; -nmk004_device::nmk004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nmk004_device::nmk004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NMK004, "NMK004", tag, owner, clock, "nmk004", __FILE__), m_cpu(*this, "mcu"), m_systemcpu(*this, ":maincpu"), diff --git a/src/mame/machine/nmk004.h b/src/mame/machine/nmk004.h index 3ffec45cfc3..e10866db2fd 100644 --- a/src/mame/machine/nmk004.h +++ b/src/mame/machine/nmk004.h @@ -21,7 +21,7 @@ class nmk004_device : public device_t { public: - nmk004_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nmk004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); WRITE8_MEMBER( write ); READ8_MEMBER( read ); diff --git a/src/mame/machine/nmk112.cpp b/src/mame/machine/nmk112.cpp index 03dd10a53d8..afe6588c000 100644 --- a/src/mame/machine/nmk112.cpp +++ b/src/mame/machine/nmk112.cpp @@ -19,9 +19,11 @@ const device_type NMK112 = &device_creator; -nmk112_device::nmk112_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nmk112_device::nmk112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NMK112, "NMK112", tag, owner, clock, "nmk112", __FILE__), m_page_mask(0xff), + m_tag0(nullptr), + m_tag1(nullptr), m_rom0(nullptr), m_rom1(nullptr), m_size0(0), @@ -38,12 +40,12 @@ void nmk112_device::device_start() save_item(NAME(m_current_bank)); machine().save().register_postload(save_prepost_delegate(FUNC(nmk112_device::postload_bankswitch), this)); - if (!m_tag0.empty()) + if (m_tag0) { m_rom0 = machine().root_device().memregion(m_tag0)->base(); m_size0 = machine().root_device().memregion(m_tag0)->bytes() - 0x40000; } - if (!m_tag1.empty()) + if (m_tag1) { m_rom1 = machine().root_device().memregion(m_tag1)->base(); m_size1 = machine().root_device().memregion(m_tag1)->bytes() - 0x40000; diff --git a/src/mame/machine/nmk112.h b/src/mame/machine/nmk112.h index a7a26dd5c36..c65e244e53a 100644 --- a/src/mame/machine/nmk112.h +++ b/src/mame/machine/nmk112.h @@ -16,12 +16,12 @@ class nmk112_device : public device_t { public: - nmk112_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nmk112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~nmk112_device() {} // static configuration - static void set_rom0_tag(device_t &device, std::string tag) { downcast(device).m_tag0 = tag; } - static void set_rom1_tag(device_t &device, std::string tag) { downcast(device).m_tag1 = tag; } + static void set_rom0_tag(device_t &device, const char *tag) { downcast(device).m_tag0 = tag; } + static void set_rom1_tag(device_t &device, const char *tag) { downcast(device).m_tag1 = tag; } static void set_page_mask(device_t &device, UINT8 mask) { downcast(device).m_page_mask = ~mask; } DECLARE_WRITE8_MEMBER( okibank_w ); @@ -42,8 +42,7 @@ private: UINT8 m_current_bank[8]; - std::string m_tag0; - std::string m_tag1; + const char *m_tag0, *m_tag1; UINT8 *m_rom0, *m_rom1; int m_size0, m_size1; }; diff --git a/src/mame/machine/ns10crypt.cpp b/src/mame/machine/ns10crypt.cpp index 54e89d3e993..e639108166c 100644 --- a/src/mame/machine/ns10crypt.cpp +++ b/src/mame/machine/ns10crypt.cpp @@ -124,7 +124,7 @@ const device_type STARTRGN_DECRYPTER = &device_creator; /* soul edge */ -keycus_c409_device::keycus_c409_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +keycus_c409_device::keycus_c409_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ns11_keycus_device(mconfig, KEYCUS_C409, "Namco C409 KEYCUS", tag, owner, clock, "keycus_c409", __FILE__) { } @@ -108,7 +108,7 @@ const device_type KEYCUS_C409 = &device_creator; /* dunk mania */ -keycus_c410_device::keycus_c410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +keycus_c410_device::keycus_c410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ns11_keycus_device(mconfig, KEYCUS_C410, "Namco C410 KEYCUS", tag, owner, clock, "keycus_c410", __FILE__) { } @@ -162,7 +162,7 @@ const device_type KEYCUS_C410 = &device_creator; /* prime goal ex */ -keycus_c411_device::keycus_c411_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +keycus_c411_device::keycus_c411_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ns11_keycus_device(mconfig, KEYCUS_C411, "Namco C411 KEYCUS", tag, owner, clock, "keycus_c411", __FILE__) { } @@ -218,7 +218,7 @@ const device_type KEYCUS_C411 = &device_creator; /* xevious 3d/g */ -keycus_c430_device::keycus_c430_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +keycus_c430_device::keycus_c430_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ns11_keycus_device(mconfig, KEYCUS_C430, "Namco C430 KEYCUS", tag, owner, clock, "keycus_c430", __FILE__) { } @@ -277,7 +277,7 @@ const device_type KEYCUS_C430 = &device_creator; /* dancing eyes */ -keycus_c431_device::keycus_c431_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +keycus_c431_device::keycus_c431_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ns11_keycus_device(mconfig, KEYCUS_C431, "Namco C431 KEYCUS", tag, owner, clock, "keycus_c431", __FILE__) { } @@ -335,7 +335,7 @@ const device_type KEYCUS_C431 = &device_creator; /* pocket racer */ -keycus_c432_device::keycus_c432_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +keycus_c432_device::keycus_c432_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ns11_keycus_device(mconfig, KEYCUS_C432, "Namco C432 KEYCUS", tag, owner, clock, "keycus_c432", __FILE__) { } @@ -395,7 +395,7 @@ const device_type KEYCUS_C432 = &device_creator; /* star sweep */ -keycus_c442_device::keycus_c442_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +keycus_c442_device::keycus_c442_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ns11_keycus_device(mconfig, KEYCUS_C442, "Namco C442 KEYCUS", tag, owner, clock, "keycus_c442", __FILE__) { } @@ -443,7 +443,7 @@ const device_type KEYCUS_C442 = &device_creator; /* kosodate quiz my angel 3 / point blank 2 */ -keycus_c443_device::keycus_c443_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +keycus_c443_device::keycus_c443_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ns11_keycus_device(mconfig, KEYCUS_C443, "Namco C443 KEYCUS", tag, owner, clock, "keycus_c443", __FILE__) { } diff --git a/src/mame/machine/ns11prot.h b/src/mame/machine/ns11prot.h index 9b3fd0cc333..3a3d0109978 100644 --- a/src/mame/machine/ns11prot.h +++ b/src/mame/machine/ns11prot.h @@ -10,7 +10,7 @@ class ns11_keycus_device : public device_t { protected: - ns11_keycus_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); + ns11_keycus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); virtual void device_start() override; virtual void device_reset() override; @@ -30,7 +30,7 @@ public: class keycus_c406_device : public ns11_keycus_device { public: - keycus_c406_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + keycus_c406_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ16_MEMBER( read ) override; virtual DECLARE_WRITE16_MEMBER( write ) override; @@ -43,7 +43,7 @@ extern const device_type KEYCUS_C406; class keycus_c409_device : public ns11_keycus_device { public: - keycus_c409_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + keycus_c409_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ16_MEMBER( read ) override; virtual DECLARE_WRITE16_MEMBER( write ) override; @@ -56,7 +56,7 @@ extern const device_type KEYCUS_C409; class keycus_c410_device : public ns11_keycus_device { public: - keycus_c410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + keycus_c410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ16_MEMBER( read ) override; virtual DECLARE_WRITE16_MEMBER( write ) override; @@ -69,7 +69,7 @@ extern const device_type KEYCUS_C410; class keycus_c411_device : public ns11_keycus_device { public: - keycus_c411_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + keycus_c411_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ16_MEMBER( read ) override; virtual DECLARE_WRITE16_MEMBER( write ) override; @@ -82,7 +82,7 @@ extern const device_type KEYCUS_C411; class keycus_c430_device : public ns11_keycus_device { public: - keycus_c430_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + keycus_c430_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ16_MEMBER( read ) override; virtual DECLARE_WRITE16_MEMBER( write ) override; @@ -95,7 +95,7 @@ extern const device_type KEYCUS_C430; class keycus_c431_device : public ns11_keycus_device { public: - keycus_c431_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + keycus_c431_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ16_MEMBER( read ) override; virtual DECLARE_WRITE16_MEMBER( write ) override; @@ -108,7 +108,7 @@ extern const device_type KEYCUS_C431; class keycus_c432_device : public ns11_keycus_device { public: - keycus_c432_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + keycus_c432_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ16_MEMBER( read ) override; virtual DECLARE_WRITE16_MEMBER( write ) override; @@ -121,7 +121,7 @@ extern const device_type KEYCUS_C432; class keycus_c442_device : public ns11_keycus_device { public: - keycus_c442_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + keycus_c442_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ16_MEMBER( read ) override; virtual DECLARE_WRITE16_MEMBER( write ) override; @@ -134,7 +134,7 @@ extern const device_type KEYCUS_C442; class keycus_c443_device : public ns11_keycus_device { public: - keycus_c443_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + keycus_c443_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ16_MEMBER( read ) override; virtual DECLARE_WRITE16_MEMBER( write ) override; diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp index aa24da96099..262d253d31b 100644 --- a/src/mame/machine/pc1512kb.cpp +++ b/src/mame/machine/pc1512kb.cpp @@ -225,7 +225,7 @@ ioport_constructor pc1512_keyboard_device::device_input_ports() const // pc1512_keyboard_device - constructor //------------------------------------------------- -pc1512_keyboard_device::pc1512_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pc1512_keyboard_device::pc1512_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC1512_KEYBOARD, "Amstrad PC1512 Keyboard", tag, owner, clock, "pc1512kb", __FILE__), m_maincpu(*this, I8048_TAG), m_y1(*this, "Y1"), diff --git a/src/mame/machine/pc1512kb.h b/src/mame/machine/pc1512kb.h index 34b873f6ef3..d27d4b200e0 100644 --- a/src/mame/machine/pc1512kb.h +++ b/src/mame/machine/pc1512kb.h @@ -47,7 +47,7 @@ class pc1512_keyboard_device : public device_t { public: // construction/destruction - pc1512_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pc1512_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_clock.set_callback(object); } template static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_data.set_callback(object); } diff --git a/src/mame/machine/pc9801_118.cpp b/src/mame/machine/pc9801_118.cpp index 0de0bc067ab..ee3a189b338 100644 --- a/src/mame/machine/pc9801_118.cpp +++ b/src/mame/machine/pc9801_118.cpp @@ -117,7 +117,7 @@ const rom_entry *pc9801_118_device::device_rom_region() const // pc9801_118_device - constructor //------------------------------------------------- -pc9801_118_device::pc9801_118_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pc9801_118_device::pc9801_118_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC9801_118, "pc9801_118", tag, owner, clock, "pc9801_118", __FILE__), // m_maincpu(*owner, "maincpu"), m_opn3(*this, "opn3") diff --git a/src/mame/machine/pc9801_118.h b/src/mame/machine/pc9801_118.h index 05a333de6eb..83e4cb4b284 100644 --- a/src/mame/machine/pc9801_118.h +++ b/src/mame/machine/pc9801_118.h @@ -26,7 +26,7 @@ class pc9801_118_device : public device_t { public: // construction/destruction - pc9801_118_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pc9801_118_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/machine/pc9801_26.cpp b/src/mame/machine/pc9801_26.cpp index 38facbc8609..2f0b0351c7c 100644 --- a/src/mame/machine/pc9801_26.cpp +++ b/src/mame/machine/pc9801_26.cpp @@ -109,7 +109,7 @@ ioport_constructor pc9801_26_device::device_input_ports() const // pc9801_26_device - constructor //------------------------------------------------- -pc9801_26_device::pc9801_26_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pc9801_26_device::pc9801_26_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC9801_26, "pc9801_26", tag, owner, clock, "pc9801_26", __FILE__), // m_maincpu(*owner, "maincpu"), m_opn(*this, "opn") diff --git a/src/mame/machine/pc9801_26.h b/src/mame/machine/pc9801_26.h index 870ebb54956..cf87298347a 100644 --- a/src/mame/machine/pc9801_26.h +++ b/src/mame/machine/pc9801_26.h @@ -26,7 +26,7 @@ class pc9801_26_device : public device_t { public: // construction/destruction - pc9801_26_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pc9801_26_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/machine/pc9801_86.cpp b/src/mame/machine/pc9801_86.cpp index 57377adc43a..db40adbcaa4 100644 --- a/src/mame/machine/pc9801_86.cpp +++ b/src/mame/machine/pc9801_86.cpp @@ -125,7 +125,7 @@ ioport_constructor pc9801_86_device::device_input_ports() const // pc9801_86_device - constructor //------------------------------------------------- -pc9801_86_device::pc9801_86_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pc9801_86_device::pc9801_86_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC9801_86, "pc9801_86", tag, owner, clock, "pc9801_86", __FILE__), m_opna(*this, "opna"), m_dacl(*this, "dacl"), diff --git a/src/mame/machine/pc9801_86.h b/src/mame/machine/pc9801_86.h index 3bb780bd10d..61b48dcabb9 100644 --- a/src/mame/machine/pc9801_86.h +++ b/src/mame/machine/pc9801_86.h @@ -26,7 +26,7 @@ class pc9801_86_device : public device_t { public: // construction/destruction - pc9801_86_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pc9801_86_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/machine/pc9801_cbus.cpp b/src/mame/machine/pc9801_cbus.cpp index 730e6ae11d5..2e3f6b59670 100644 --- a/src/mame/machine/pc9801_cbus.cpp +++ b/src/mame/machine/pc9801_cbus.cpp @@ -51,7 +51,7 @@ device_pc9801cbus_card_interface::~device_pc9801cbus_card_interface() // pc9801_slot_device - constructor //------------------------------------------------- -pc9801_slot_device::pc9801_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pc9801_slot_device::pc9801_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC9801CBUS_SLOT, "PC-9801 sound cbus slot", tag, owner, clock, "pc9801_slot", __FILE__), device_slot_interface(mconfig, *this) { diff --git a/src/mame/machine/pc9801_cbus.h b/src/mame/machine/pc9801_cbus.h index 42e4edff67f..2a7ca5e33e1 100644 --- a/src/mame/machine/pc9801_cbus.h +++ b/src/mame/machine/pc9801_cbus.h @@ -58,7 +58,7 @@ class pc9801_slot_device : public device_t, { public: // construction/destruction - pc9801_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pc9801_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; diff --git a/src/mame/machine/pc9801_kbd.cpp b/src/mame/machine/pc9801_kbd.cpp index caf42e6903d..260bd9f6b3d 100644 --- a/src/mame/machine/pc9801_kbd.cpp +++ b/src/mame/machine/pc9801_kbd.cpp @@ -34,7 +34,7 @@ const device_type PC9801_KBD = &device_creator; // pc9801_kbd_device - constructor //------------------------------------------------- -pc9801_kbd_device::pc9801_kbd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pc9801_kbd_device::pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC9801_KBD, "pc9801_kbd", tag, owner, clock, "pc9801_kbd_", __FILE__), m_write_irq(*this) { diff --git a/src/mame/machine/pc9801_kbd.h b/src/mame/machine/pc9801_kbd.h index bca5cc12e8c..c33d554ab3e 100644 --- a/src/mame/machine/pc9801_kbd.h +++ b/src/mame/machine/pc9801_kbd.h @@ -30,7 +30,7 @@ class pc9801_kbd_device : public device_t { public: // construction/destruction - pc9801_kbd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } diff --git a/src/mame/machine/pcd_kbd.cpp b/src/mame/machine/pcd_kbd.cpp index 5f60b353fe7..4c1aa9f0ea5 100644 --- a/src/mame/machine/pcd_kbd.cpp +++ b/src/mame/machine/pcd_kbd.cpp @@ -221,7 +221,7 @@ ioport_constructor pcd_keyboard_device::device_input_ports() const return INPUT_PORTS_NAME( pcd_keyboard ); } -pcd_keyboard_device::pcd_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pcd_keyboard_device::pcd_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PCD_KEYBOARD, "PC-D Keyboard", tag, owner, clock, "pcd_kbd", __FILE__), m_rows(*this, "ROW"), m_p1(0), diff --git a/src/mame/machine/pcd_kbd.h b/src/mame/machine/pcd_kbd.h index 79de0cbdcdf..921abdb2454 100644 --- a/src/mame/machine/pcd_kbd.h +++ b/src/mame/machine/pcd_kbd.h @@ -13,7 +13,7 @@ class pcd_keyboard_device : public device_t { public: - pcd_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pcd_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_tx_handler(device_t &device, _Object object) { return downcast(device).m_out_tx_handler.set_callback(object); } diff --git a/src/mame/machine/pce220_ser.cpp b/src/mame/machine/pce220_ser.cpp index 79761f0dd4c..59aaf593e73 100644 --- a/src/mame/machine/pce220_ser.cpp +++ b/src/mame/machine/pce220_ser.cpp @@ -43,7 +43,7 @@ const device_type PCE220SERIAL = &device_creator; // pce220_serial_device - constructor //------------------------------------------------- -pce220_serial_device::pce220_serial_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pce220_serial_device::pce220_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PCE220SERIAL, "Sharp PC-E220 serial", tag, owner, clock, "pce220_serial", __FILE__), device_image_interface(mconfig, *this) { @@ -190,7 +190,7 @@ void pce220_serial_device::device_timer(emu_timer &timer, device_timer_id id, in break; case SIO_SEND_PARITY: if (m_xout != calc_parity(m_current_byte)) - logerror("SIO %s: byte %d has wrong parity!\n", tag().c_str(), m_bytes_count); + logerror("SIO %s: byte %d has wrong parity!\n", tag(), m_bytes_count); break; case SIO_SEND_STOP1: case SIO_SEND_STOP2: diff --git a/src/mame/machine/pce220_ser.h b/src/mame/machine/pce220_ser.h index c503a770338..dd351a4d9ff 100644 --- a/src/mame/machine/pce220_ser.h +++ b/src/mame/machine/pce220_ser.h @@ -23,7 +23,7 @@ class pce220_serial_device : public device_t, { public: // construction/destruction - pce220_serial_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pce220_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~pce220_serial_device(); // image-level overrides diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp index 3a277d5d25b..26e730b491e 100644 --- a/src/mame/machine/pce_cd.cpp +++ b/src/mame/machine/pce_cd.cpp @@ -78,7 +78,7 @@ CD Interface Register 0x0f - ADPCM fade in/out register const device_type PCE_CD = &device_creator; -pce_cd_device::pce_cd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pce_cd_device::pce_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PCE_CD, "PCE CD Add-on", tag, owner, clock, "pcecd", __FILE__), m_maincpu(*this, ":maincpu"), m_msm(*this, "msm5205"), diff --git a/src/mame/machine/pce_cd.h b/src/mame/machine/pce_cd.h index 03ac019997a..ebb39aeb680 100644 --- a/src/mame/machine/pce_cd.h +++ b/src/mame/machine/pce_cd.h @@ -42,7 +42,7 @@ class pce_cd_device : public device_t { public: // construction/destruction - pce_cd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pce_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~pce_cd_device() {} // device-level overrides diff --git a/src/mame/machine/pcecommn.h b/src/mame/machine/pcecommn.h index 65b6506fb56..deed15decaa 100644 --- a/src/mame/machine/pcecommn.h +++ b/src/mame/machine/pcecommn.h @@ -18,7 +18,7 @@ class pce_common_state : public driver_device { public: - pce_common_state(const machine_config &mconfig, device_type type, std::string tag) + pce_common_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_huc6260(*this, "huc6260") { } diff --git a/src/mame/machine/pcshare.h b/src/mame/machine/pcshare.h index 16b499ee117..81d423ad1d0 100644 --- a/src/mame/machine/pcshare.h +++ b/src/mame/machine/pcshare.h @@ -9,7 +9,7 @@ class pcat_base_state : public driver_device { public: - pcat_base_state(const machine_config &mconfig, device_type type, std::string tag) + pcat_base_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dma8237_1(*this, "dma8237_1"), diff --git a/src/mame/machine/prof80mmu.cpp b/src/mame/machine/prof80mmu.cpp index 4af917bc1e7..68bdabb7237 100644 --- a/src/mame/machine/prof80mmu.cpp +++ b/src/mame/machine/prof80mmu.cpp @@ -34,7 +34,7 @@ ADDRESS_MAP_END // prof80_mmu_device - constructor //------------------------------------------------- -prof80_mmu_device::prof80_mmu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +prof80_mmu_device::prof80_mmu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PROF80_MMU, "PROF80_MMU", tag, owner, clock, "prof80_mmu", __FILE__), device_memory_interface(mconfig, *this), m_program_space_config("program", ENDIANNESS_LITTLE, 8, 20, 0, *ADDRESS_MAP_NAME(program_map)) diff --git a/src/mame/machine/prof80mmu.h b/src/mame/machine/prof80mmu.h index 39247168848..db0352fa913 100644 --- a/src/mame/machine/prof80mmu.h +++ b/src/mame/machine/prof80mmu.h @@ -35,7 +35,7 @@ class prof80_mmu_device : public device_t, public device_memory_interface { public: - prof80_mmu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + prof80_mmu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_ADDRESS_MAP(z80_program_map, 8); diff --git a/src/mame/machine/psion_pack.cpp b/src/mame/machine/psion_pack.cpp index efbed1da682..eef4bdc4709 100644 --- a/src/mame/machine/psion_pack.cpp +++ b/src/mame/machine/psion_pack.cpp @@ -60,7 +60,7 @@ const device_type PSION_DATAPACK = &device_creator; // datapack_device - constructor //------------------------------------------------- -datapack_device::datapack_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +datapack_device::datapack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PSION_DATAPACK, "Psion Datapack", tag, owner, clock, "datapack", __FILE__), device_image_interface(mconfig, *this) { diff --git a/src/mame/machine/psion_pack.h b/src/mame/machine/psion_pack.h index 131df31f32f..d5d68aca7b1 100644 --- a/src/mame/machine/psion_pack.h +++ b/src/mame/machine/psion_pack.h @@ -21,7 +21,7 @@ class datapack_device : public device_t, { public: // construction/destruction - datapack_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + datapack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~datapack_device(); // image-level overrides diff --git a/src/mame/machine/psxcd.cpp b/src/mame/machine/psxcd.cpp index 7203590a375..069e9f224f1 100644 --- a/src/mame/machine/psxcd.cpp +++ b/src/mame/machine/psxcd.cpp @@ -85,7 +85,7 @@ enum submode_flags const device_type PSXCD = &device_creator; -psxcd_device::psxcd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +psxcd_device::psxcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : cdrom_image_device(mconfig, PSXCD, "PSX Cdrom", tag, owner, clock, "psx_cd", __FILE__), m_irq_handler(*this) { diff --git a/src/mame/machine/psxcd.h b/src/mame/machine/psxcd.h index b322d0a2725..4bcf9ee5696 100644 --- a/src/mame/machine/psxcd.h +++ b/src/mame/machine/psxcd.h @@ -21,7 +21,7 @@ class psxcd_device : public cdrom_image_device { public: - psxcd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + psxcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast(device).m_irq_handler.set_callback(object); } diff --git a/src/mame/machine/qimi.cpp b/src/mame/machine/qimi.cpp index aeb4b751cb8..e1a55134b69 100644 --- a/src/mame/machine/qimi.cpp +++ b/src/mame/machine/qimi.cpp @@ -102,7 +102,7 @@ ioport_constructor qimi_t::device_input_ports() const // qimi_t - constructor //------------------------------------------------- -qimi_t::qimi_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +qimi_t::qimi_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, QIMI, "QL Internal Mouse Interface", tag, owner, clock, "qimi", __FILE__), m_write_extint(*this), m_buttons(*this, "mouse_buttons"), diff --git a/src/mame/machine/qimi.h b/src/mame/machine/qimi.h index 8d5f67298bc..ffa3caf0fe1 100644 --- a/src/mame/machine/qimi.h +++ b/src/mame/machine/qimi.h @@ -34,7 +34,7 @@ class qimi_t : public device_t { public: // construction/destruction - qimi_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + qimi_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_exting_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_extint.set_callback(object); } diff --git a/src/mame/machine/qx10kbd.cpp b/src/mame/machine/qx10kbd.cpp index a975aaa3cc8..1a4c7364c06 100644 --- a/src/mame/machine/qx10kbd.cpp +++ b/src/mame/machine/qx10kbd.cpp @@ -4,7 +4,7 @@ #include "machine/qx10kbd.h" -qx10_keyboard_device::qx10_keyboard_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : +qx10_keyboard_device::qx10_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : serial_keyboard_device(mconfig, QX10_KEYBOARD, "QX10 Keyboard", tag, owner, 0, "qx10_keyboard", __FILE__), m_io_kbd8(*this, "TERM_LINE8"), m_io_kbd9(*this, "TERM_LINE9"), diff --git a/src/mame/machine/qx10kbd.h b/src/mame/machine/qx10kbd.h index 3f25b426e7d..4adb6ebb9a4 100644 --- a/src/mame/machine/qx10kbd.h +++ b/src/mame/machine/qx10kbd.h @@ -8,7 +8,7 @@ class qx10_keyboard_device : public serial_keyboard_device { public: - qx10_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + qx10_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; protected: diff --git a/src/mame/machine/raiden2cop.cpp b/src/mame/machine/raiden2cop.cpp index 519b93cd8c7..0190e691043 100644 --- a/src/mame/machine/raiden2cop.cpp +++ b/src/mame/machine/raiden2cop.cpp @@ -24,7 +24,7 @@ const device_type RAIDEN2COP = &device_creator; -raiden2cop_device::raiden2cop_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +raiden2cop_device::raiden2cop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, RAIDEN2COP, "Seibu COP (Raiden 2)", tag, owner, clock, "raiden2cop", __FILE__), cop_latch_addr(0), cop_latch_trigger(0), diff --git a/src/mame/machine/raiden2cop.h b/src/mame/machine/raiden2cop.h index 2f55efe547d..9f543062541 100644 --- a/src/mame/machine/raiden2cop.h +++ b/src/mame/machine/raiden2cop.h @@ -34,7 +34,7 @@ class raiden2cop_device : public device_t { public: - raiden2cop_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + raiden2cop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // Command Table UINT16 cop_func_trigger[0x100/8]; /* function trigger */ diff --git a/src/mame/machine/rmnkbd.cpp b/src/mame/machine/rmnkbd.cpp index 68abae29b7b..30987c6701e 100644 --- a/src/mame/machine/rmnkbd.cpp +++ b/src/mame/machine/rmnkbd.cpp @@ -2,7 +2,7 @@ // copyright-holders:Carl #include "machine/rmnkbd.h" -rmnimbus_keyboard_device::rmnimbus_keyboard_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : +rmnimbus_keyboard_device::rmnimbus_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : serial_keyboard_device(mconfig, RMNIMBUS_KEYBOARD, "RM Nimbus Keyboard", tag, owner, 0, "rmnimbus_keyboard", __FILE__), m_io_kbd8(*this, "TERM_LINE8"), m_io_kbd9(*this, "TERM_LINE9"), diff --git a/src/mame/machine/rmnkbd.h b/src/mame/machine/rmnkbd.h index 8b93db6358a..f60f600ac99 100644 --- a/src/mame/machine/rmnkbd.h +++ b/src/mame/machine/rmnkbd.h @@ -8,7 +8,7 @@ class rmnimbus_keyboard_device : public serial_keyboard_device { public: - rmnimbus_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + rmnimbus_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; protected: diff --git a/src/mame/machine/rx01.cpp b/src/mame/machine/rx01.cpp index 3721c43dd61..b4cb85869ea 100644 --- a/src/mame/machine/rx01.cpp +++ b/src/mame/machine/rx01.cpp @@ -48,7 +48,7 @@ const device_type RX01 = &device_creator; // rx01_device - constructor //------------------------------------------------- -rx01_device::rx01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rx01_device::rx01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, RX01, "RX01", tag, owner, clock, "rx01", __FILE__) { } diff --git a/src/mame/machine/rx01.h b/src/mame/machine/rx01.h index 5bb14cabc60..ad55511be41 100644 --- a/src/mame/machine/rx01.h +++ b/src/mame/machine/rx01.h @@ -30,7 +30,7 @@ class rx01_device : public device_t { public: // construction/destruction - rx01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + rx01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ16_MEMBER( read ); DECLARE_WRITE16_MEMBER( write ); diff --git a/src/mame/machine/s32comm.cpp b/src/mame/machine/s32comm.cpp index 5d670bd6bc7..dad9c291527 100644 --- a/src/mame/machine/s32comm.cpp +++ b/src/mame/machine/s32comm.cpp @@ -97,7 +97,7 @@ machine_config_constructor s32comm_device::device_mconfig_additions() const // s32comm_device - constructor //------------------------------------------------- -s32comm_device::s32comm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +s32comm_device::s32comm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, S32COMM, "SYSTEM32 COMMUNICATION BD", tag, owner, clock, "s32comm", __FILE__), m_line_rx(OPEN_FLAG_WRITE | OPEN_FLAG_CREATE ), m_line_tx(OPEN_FLAG_READ) diff --git a/src/mame/machine/s32comm.h b/src/mame/machine/s32comm.h index 782eb1e9cd3..19b01110361 100644 --- a/src/mame/machine/s32comm.h +++ b/src/mame/machine/s32comm.h @@ -20,7 +20,7 @@ class s32comm_device : public device_t { public: // construction/destruction - s32comm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + s32comm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; diff --git a/src/mame/machine/segabb.cpp b/src/mame/machine/segabb.cpp index 53246e69126..8adbf5dc809 100644 --- a/src/mame/machine/segabb.cpp +++ b/src/mame/machine/segabb.cpp @@ -13,7 +13,7 @@ ADDRESS_MAP_END DEVICE_ADDRESS_MAP_START(map3, 32, sega_lindbergh_baseboard_device) ADDRESS_MAP_END -sega_lindbergh_baseboard_device::sega_lindbergh_baseboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega_lindbergh_baseboard_device::sega_lindbergh_baseboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pci_device(mconfig, SEGA_LINDBERGH_BASEBOARD, "Sega Lindbergh Baseboard", tag, owner, clock, "sega_lindbergh_baseboard", __FILE__) { } diff --git a/src/mame/machine/segabb.h b/src/mame/machine/segabb.h index 1ff7a2d4ab2..93f42833fea 100644 --- a/src/mame/machine/segabb.h +++ b/src/mame/machine/segabb.h @@ -12,7 +12,7 @@ class sega_lindbergh_baseboard_device : public pci_device { public: - sega_lindbergh_baseboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_lindbergh_baseboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; diff --git a/src/mame/machine/segaic16.cpp b/src/mame/machine/segaic16.cpp index 9351d784654..3d807412a56 100644 --- a/src/mame/machine/segaic16.cpp +++ b/src/mame/machine/segaic16.cpp @@ -42,7 +42,7 @@ const device_type SEGA_315_5250_COMPARE_TIMER = &device_creator sound_write_delegate; // construction/destruction - sega_315_5195_mapper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_315_5195_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers static void static_set_cputag(device_t &device, const char *cpu); @@ -182,7 +182,7 @@ class sega_315_5248_multiplier_device : public device_t { public: // construction/destruction - sega_315_5248_multiplier_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_315_5248_multiplier_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // public interface DECLARE_READ16_MEMBER( read ); @@ -205,7 +205,7 @@ class sega_315_5249_divider_device : public device_t { public: // construction/destruction - sega_315_5249_divider_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_315_5249_divider_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // public interface DECLARE_READ16_MEMBER( read ); @@ -234,7 +234,7 @@ public: typedef device_delegate timer_ack_delegate; // construction/destruction - sega_315_5250_compare_timer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_315_5250_compare_timer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers static void static_set_timer_ack(device_t &device, timer_ack_delegate callback); diff --git a/src/mame/machine/seicop.cpp b/src/mame/machine/seicop.cpp index 83c10b41002..d5640aa6881 100644 --- a/src/mame/machine/seicop.cpp +++ b/src/mame/machine/seicop.cpp @@ -22,7 +22,7 @@ const device_type SEIBU_COP_BOOTLEG = &device_creator; -seibu_cop_bootleg_device::seibu_cop_bootleg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +seibu_cop_bootleg_device::seibu_cop_bootleg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEIBU_COP_BOOTLEG, "Seibu COP (Bootleg)", tag, owner, clock, "seibu_cop_boot", __FILE__), m_cop_mcu_ram(nullptr), m_raiden2cop(*this, ":raiden2cop") diff --git a/src/mame/machine/seicop.h b/src/mame/machine/seicop.h index 7851a88b1a8..a1bfa9b592c 100644 --- a/src/mame/machine/seicop.h +++ b/src/mame/machine/seicop.h @@ -8,7 +8,7 @@ class seibu_cop_bootleg_device : public device_t { public: -seibu_cop_bootleg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); +seibu_cop_bootleg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ16_MEMBER( copdxbl_0_r ); DECLARE_WRITE16_MEMBER( copdxbl_0_w ); diff --git a/src/mame/machine/sgi.cpp b/src/mame/machine/sgi.cpp index a62825fc613..d9b6e8b8887 100644 --- a/src/mame/machine/sgi.cpp +++ b/src/mame/machine/sgi.cpp @@ -30,7 +30,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_ const device_type SGI_MC = &device_creator; -sgi_mc_device::sgi_mc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sgi_mc_device::sgi_mc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SGI_MC, "SGI Memory Controller", tag, owner, clock, "sgi_mc", __FILE__), m_tUpdateTimer(nullptr), m_nCPUControl0(0), diff --git a/src/mame/machine/sgi.h b/src/mame/machine/sgi.h index 650f62134f3..9cebd996873 100644 --- a/src/mame/machine/sgi.h +++ b/src/mame/machine/sgi.h @@ -14,7 +14,7 @@ class sgi_mc_device : public device_t { public: - sgi_mc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sgi_mc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~sgi_mc_device() {} DECLARE_READ32_MEMBER(read); diff --git a/src/mame/machine/slapstic.cpp b/src/mame/machine/slapstic.cpp index 5ecab2095a7..4ff2fe4a2e3 100644 --- a/src/mame/machine/slapstic.cpp +++ b/src/mame/machine/slapstic.cpp @@ -186,7 +186,7 @@ extern const device_type SLAPSTIC = &device_creator; -atari_slapstic_device::atari_slapstic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_slapstic_device::atari_slapstic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SLAPSTIC, "Atari Slapstic", tag, owner, clock, "slapstic", __FILE__), state(0), current_bank(0), diff --git a/src/mame/machine/smartmed.cpp b/src/mame/machine/smartmed.cpp index e73cf0b0203..9ba88c447fe 100644 --- a/src/mame/machine/smartmed.cpp +++ b/src/mame/machine/smartmed.cpp @@ -72,7 +72,7 @@ enum const device_type NAND = &device_creator; -nand_device::nand_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nand_device::nand_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAND, "NAND Flash Memory", tag, owner, clock, "nand", __FILE__), m_page_data_size(0), m_page_total_size(0), @@ -88,7 +88,7 @@ nand_device::nand_device(const machine_config &mconfig, std::string tag, device_ memset(m_id, 0, sizeof(m_id)); } -nand_device::nand_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +nand_device::nand_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_page_data_size(0), m_page_total_size(0), @@ -779,7 +779,7 @@ void nand_device::device_reset() const device_type SMARTMEDIA = &device_creator; -smartmedia_image_device::smartmedia_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +smartmedia_image_device::smartmedia_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nand_device(mconfig, SMARTMEDIA, "SmartMedia Flash ROM", tag, owner, clock, "smartmedia", __FILE__), device_image_interface(mconfig, *this) { diff --git a/src/mame/machine/smartmed.h b/src/mame/machine/smartmed.h index 251dc563365..15ad48d4235 100644 --- a/src/mame/machine/smartmed.h +++ b/src/mame/machine/smartmed.h @@ -57,8 +57,8 @@ class nand_device : public device_t { public: // construction/destruction - nand_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - nand_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + nand_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + nand_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template static devcb_base &set_rnb_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_rnb.set_callback(object); } @@ -201,7 +201,7 @@ class smartmedia_image_device : public nand_device, { public: // construction/destruction - smartmedia_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + smartmedia_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_MEMCARD; } diff --git a/src/mame/machine/sonydriv.cpp b/src/mame/machine/sonydriv.cpp index 89bec93984d..3c70a4664e7 100644 --- a/src/mame/machine/sonydriv.cpp +++ b/src/mame/machine/sonydriv.cpp @@ -531,7 +531,7 @@ const device_type FLOPPY_SONY = &device_creator; // sonydriv_floppy_image_device - constructor //------------------------------------------------- -sonydriv_floppy_image_device::sonydriv_floppy_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sonydriv_floppy_image_device::sonydriv_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : legacy_floppy_image_device(mconfig, FLOPPY_SONY, "Floppy Disk [Sony]", tag, owner, clock, "floppy_sonny", __FILE__) { } diff --git a/src/mame/machine/sonydriv.h b/src/mame/machine/sonydriv.h index 758bae7f76a..5e5d20c2f3d 100644 --- a/src/mame/machine/sonydriv.h +++ b/src/mame/machine/sonydriv.h @@ -38,7 +38,7 @@ class sonydriv_floppy_image_device : public legacy_floppy_image_device { public: // construction/destruction - sonydriv_floppy_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sonydriv_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void call_unload() override; protected: diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp index ce5e311029d..598a94ebddc 100644 --- a/src/mame/machine/st0016.cpp +++ b/src/mame/machine/st0016.cpp @@ -29,7 +29,7 @@ ADDRESS_MAP_END // note: a lot of bits are left uninitialized by the games, the default values are uncertain -st0016_cpu_device::st0016_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +st0016_cpu_device::st0016_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : z80_device(mconfig, ST0016_CPU, "ST0016", tag, owner, clock, "st0016_cpu", __FILE__), st0016_game(-1), st0016_spr_bank(0), diff --git a/src/mame/machine/st0016.h b/src/mame/machine/st0016.h index 00a41dd3e0d..6401ddc5c19 100644 --- a/src/mame/machine/st0016.h +++ b/src/mame/machine/st0016.h @@ -37,7 +37,7 @@ extern UINT8 macs_cart_slot; class st0016_cpu_device : public z80_device { public: - st0016_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32); + st0016_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32); DECLARE_WRITE8_MEMBER(st0016_sprite_bank_w); DECLARE_WRITE8_MEMBER(st0016_palette_bank_w); diff --git a/src/mame/machine/swim.cpp b/src/mame/machine/swim.cpp index e07c621bb4c..9e1506ad9ab 100644 --- a/src/mame/machine/swim.cpp +++ b/src/mame/machine/swim.cpp @@ -37,7 +37,7 @@ const device_type SWIM = &device_creator; // ctor //------------------------------------------------- -swim_device::swim_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +swim_device::swim_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : applefdc_base_device(APPLEFDC_SWIM, mconfig, SWIM, "Apple SWIM (Steve Woz Integrated Machine)", tag, owner, clock, "swim", __FILE__) { } diff --git a/src/mame/machine/swim.h b/src/mame/machine/swim.h index 515a98a7286..438ee9e4933 100644 --- a/src/mame/machine/swim.h +++ b/src/mame/machine/swim.h @@ -24,7 +24,7 @@ extern const device_type SWIM; class swim_device : public applefdc_base_device { public: - swim_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + swim_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // read/write virtual UINT8 read(UINT8 offset) override; diff --git a/src/mame/machine/tait8741.cpp b/src/mame/machine/tait8741.cpp index fbefb426ecb..5e568fbd6f1 100644 --- a/src/mame/machine/tait8741.cpp +++ b/src/mame/machine/tait8741.cpp @@ -35,7 +35,7 @@ gladiatr and Great Swordsman set. const device_type TAITO8741_4PACK = &device_creator; -taito8741_4pack_device::taito8741_4pack_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +taito8741_4pack_device::taito8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TAITO8741_4PACK, "I8741 MCU Simulation (Taito 4Pack)", tag, owner, clock, "taito8741_4pack", __FILE__), m_port_handler_0_r(*this), m_port_handler_1_r(*this), @@ -347,7 +347,7 @@ joshi Vollyball set. const device_type JOSVOLLY8741_4PACK = &device_creator; -josvolly8741_4pack_device::josvolly8741_4pack_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +josvolly8741_4pack_device::josvolly8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, JOSVOLLY8741_4PACK, "I8741 MCU Simulation (Joshi Volleyball)", tag, owner, clock, "josvolly8741_4pack", __FILE__), m_port_handler_0_r(*this), m_port_handler_1_r(*this), diff --git a/src/mame/machine/tait8741.h b/src/mame/machine/tait8741.h index 8bb7ad4b5a3..e0a5eb75c73 100644 --- a/src/mame/machine/tait8741.h +++ b/src/mame/machine/tait8741.h @@ -57,7 +57,7 @@ class taito8741_4pack_device : public device_t }; public: - taito8741_4pack_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + taito8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~taito8741_4pack_device() {} template static devcb_base &set_port_handler_0_callback(device_t &device, _Object object) { return downcast(device).m_port_handler_0_r.set_callback(object); } @@ -143,7 +143,7 @@ class josvolly8741_4pack_device : public device_t }; public: - josvolly8741_4pack_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + josvolly8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~josvolly8741_4pack_device() {} template static devcb_base &set_port_handler_0_callback(device_t &device, _Object object) { return downcast(device).m_port_handler_0_r.set_callback(object); } diff --git a/src/mame/machine/taitoio.cpp b/src/mame/machine/taitoio.cpp index c5215252911..7ec4223c354 100644 --- a/src/mame/machine/taitoio.cpp +++ b/src/mame/machine/taitoio.cpp @@ -56,7 +56,7 @@ Newer version of the I/O chip ? const device_type TC0220IOC = &device_creator; -tc0220ioc_device::tc0220ioc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0220ioc_device::tc0220ioc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0220IOC, "Taito TC0220IOC", tag, owner, clock, "tc0220ioc", __FILE__), m_read_0_cb(*this), m_read_1_cb(*this), @@ -182,7 +182,7 @@ WRITE8_MEMBER( tc0220ioc_device::portreg_w ) const device_type TC0510NIO = &device_creator; -tc0510nio_device::tc0510nio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0510nio_device::tc0510nio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0510NIO, "Taito TC0510NIO", tag, owner, clock, "tc0510nio", __FILE__), m_read_0_cb(*this), m_read_1_cb(*this), @@ -309,7 +309,7 @@ WRITE16_MEMBER( tc0510nio_device::halfword_wordswap_w ) const device_type TC0640FIO = &device_creator; -tc0640fio_device::tc0640fio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0640fio_device::tc0640fio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0640FIO, "Taito TC0640FIO", tag, owner, clock, "tc0640fio", __FILE__), m_read_0_cb(*this), m_read_1_cb(*this), diff --git a/src/mame/machine/taitoio.h b/src/mame/machine/taitoio.h index 7df6117969e..a1b5e53b6c9 100644 --- a/src/mame/machine/taitoio.h +++ b/src/mame/machine/taitoio.h @@ -15,7 +15,7 @@ class tc0220ioc_device : public device_t { public: - tc0220ioc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0220ioc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0220ioc_device() {} template static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast(device).m_read_0_cb.set_callback(object); } @@ -53,7 +53,7 @@ extern const device_type TC0220IOC; class tc0510nio_device : public device_t { public: - tc0510nio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0510nio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0510nio_device() {} template static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast(device).m_read_0_cb.set_callback(object); } @@ -90,7 +90,7 @@ extern const device_type TC0510NIO; class tc0640fio_device : public device_t { public: - tc0640fio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0640fio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0640fio_device() {} template static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast(device).m_read_0_cb.set_callback(object); } diff --git a/src/mame/machine/tandy2kb.cpp b/src/mame/machine/tandy2kb.cpp index 5b602772f8b..6e0b08351e7 100644 --- a/src/mame/machine/tandy2kb.cpp +++ b/src/mame/machine/tandy2kb.cpp @@ -225,7 +225,7 @@ ioport_constructor tandy2k_keyboard_device::device_input_ports() const // tandy2k_keyboard_device - constructor //------------------------------------------------- -tandy2k_keyboard_device::tandy2k_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tandy2k_keyboard_device::tandy2k_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TANDY2K_KEYBOARD, "Tandy 2000 Keyboard", tag, owner, clock, "tandy2kb", __FILE__), m_maincpu(*this, I8048_TAG), m_y0(*this, "Y0"), diff --git a/src/mame/machine/tandy2kb.h b/src/mame/machine/tandy2kb.h index b5ecd01be34..aa27aa3b782 100644 --- a/src/mame/machine/tandy2kb.h +++ b/src/mame/machine/tandy2kb.h @@ -46,7 +46,7 @@ class tandy2k_keyboard_device : public device_t { public: // construction/destruction - tandy2k_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tandy2k_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_clock.set_callback(object); } template static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_data.set_callback(object); } diff --git a/src/mame/machine/teleprinter.cpp b/src/mame/machine/teleprinter.cpp index 17e225c7e85..1c72a536883 100644 --- a/src/mame/machine/teleprinter.cpp +++ b/src/mame/machine/teleprinter.cpp @@ -136,7 +136,7 @@ static const UINT8 teleprinter_font[128*8] = 0x2a,0x15,0x2a,0x15,0x2a,0x15,0x2a,0x15 }; -teleprinter_device::teleprinter_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +teleprinter_device::teleprinter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : generic_terminal_device(mconfig, TELEPRINTER, "Teleprinter", tag, owner, clock, "teleprinter", __FILE__) { } diff --git a/src/mame/machine/teleprinter.h b/src/mame/machine/teleprinter.h index a7af040b2a9..918a2b3ec0c 100644 --- a/src/mame/machine/teleprinter.h +++ b/src/mame/machine/teleprinter.h @@ -25,7 +25,7 @@ class teleprinter_device : public generic_terminal_device { public: - teleprinter_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + teleprinter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); UINT32 tp_update(screen_device &device, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: virtual void term_write(UINT8 data) override; diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp index 89157913d3e..bda8cf14c80 100644 --- a/src/mame/machine/thomson.cpp +++ b/src/mame/machine/thomson.cpp @@ -613,7 +613,7 @@ const device_type TO7_IO_LINE = &device_creator; // to7_io_line_device - constructor //------------------------------------------------- -to7_io_line_device::to7_io_line_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +to7_io_line_device::to7_io_line_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TO7_IO_LINE, "T07 Serial source", tag, owner, clock, "to7_io_line", __FILE__), m_pia_io(*this, THOM_PIA_IO), m_rs232(*this, "rs232"), diff --git a/src/mame/machine/ticket.cpp b/src/mame/machine/ticket.cpp index d68b68ea793..3bd90d40e53 100644 --- a/src/mame/machine/ticket.cpp +++ b/src/mame/machine/ticket.cpp @@ -38,7 +38,7 @@ const device_type TICKET_DISPENSER = &device_creator; // ticket_dispenser_device - constructor //------------------------------------------------- -ticket_dispenser_device::ticket_dispenser_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ticket_dispenser_device::ticket_dispenser_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TICKET_DISPENSER, "Ticket Dispenser", tag, owner, clock, "ticket_dispenser", __FILE__), m_motor_sense(TICKET_MOTOR_ACTIVE_LOW), m_status_sense(TICKET_STATUS_ACTIVE_LOW), diff --git a/src/mame/machine/ticket.h b/src/mame/machine/ticket.h index 1fbafb19d89..1d02202103e 100644 --- a/src/mame/machine/ticket.h +++ b/src/mame/machine/ticket.h @@ -53,7 +53,7 @@ class ticket_dispenser_device : public device_t { public: // construction/destruction - ticket_dispenser_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ticket_dispenser_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~ticket_dispenser_device(); // inline configuration helpers diff --git a/src/mame/machine/trs80m2kb.cpp b/src/mame/machine/trs80m2kb.cpp index c08c041e844..d098a56ae88 100644 --- a/src/mame/machine/trs80m2kb.cpp +++ b/src/mame/machine/trs80m2kb.cpp @@ -226,7 +226,7 @@ ioport_constructor trs80m2_keyboard_device::device_input_ports() const // trs80m2_keyboard_device - constructor //------------------------------------------------- -trs80m2_keyboard_device::trs80m2_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +trs80m2_keyboard_device::trs80m2_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TRS80M2_KEYBOARD, "TRS-80 Model II Keyboard", tag, owner, clock, "trs80m2kb", __FILE__), m_maincpu(*this, I8021_TAG), m_y0(*this, "Y0"), diff --git a/src/mame/machine/trs80m2kb.h b/src/mame/machine/trs80m2kb.h index c9a9984902d..72a815bcbf4 100644 --- a/src/mame/machine/trs80m2kb.h +++ b/src/mame/machine/trs80m2kb.h @@ -44,7 +44,7 @@ class trs80m2_keyboard_device : public device_t { public: // construction/destruction - trs80m2_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + trs80m2_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_clock.set_callback(object); } diff --git a/src/mame/machine/upd65031.cpp b/src/mame/machine/upd65031.cpp index 4980f87b80d..86d9ff5e093 100644 --- a/src/mame/machine/upd65031.cpp +++ b/src/mame/machine/upd65031.cpp @@ -142,13 +142,13 @@ inline void upd65031_device::interrupt_refresh() { if ((m_int & INT_GINT) && ((m_int & m_sta & 0x7c) || ((m_int & INT_TIME) && (m_sta & STA_TIME)))) { - if (LOG) logerror("uPD65031 '%s': set int\n", tag().c_str()); + if (LOG) logerror("uPD65031 '%s': set int\n", tag()); m_write_int(ASSERT_LINE); } else { - if (LOG) logerror("uPD65031 '%s': clear int\n", tag().c_str()); + if (LOG) logerror("uPD65031 '%s': clear int\n", tag()); m_write_int(CLEAR_LINE); } @@ -195,7 +195,7 @@ inline void upd65031_device::set_mode(int mode) // upd65031_device - constructor //------------------------------------------------- -upd65031_device::upd65031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd65031_device::upd65031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, UPD65031, "NEC uPD65031", tag, owner, clock, "upd65031", __FILE__), m_read_kb(*this), m_write_int(*this), @@ -289,7 +289,7 @@ void upd65031_device::device_timer(emu_timer &timer, device_timer_id id, int par // if a key is pressed sets the interrupt if ((m_int & INT_GINT) && (m_int & INT_KEY) && m_read_kb(0) != 0xff) { - if (LOG) logerror("uPD65031 '%s': Keyboard interrupt!\n", tag().c_str()); + if (LOG) logerror("uPD65031 '%s': Keyboard interrupt!\n", tag()); // awakes CPU from snooze on key down if (m_mode == STATE_SNOOZE) @@ -416,36 +416,36 @@ READ8_MEMBER( upd65031_device::read ) { set_mode(STATE_SNOOZE); - if (LOG) logerror("uPD65031 '%s': entering snooze!\n", tag().c_str()); + if (LOG) logerror("uPD65031 '%s': entering snooze!\n", tag()); } UINT8 data = m_read_kb(offset>>8); - if (LOG) logerror("uPD65031 '%s': key r %02x: %02x\n", tag().c_str(), offset>>8, data); + if (LOG) logerror("uPD65031 '%s': key r %02x: %02x\n", tag(), offset>>8, data); return data; } // read real time clock status case REG_TSTA: - if (LOG) logerror("uPD65031 '%s': tsta r: %02x\n", tag().c_str(), m_tsta); + if (LOG) logerror("uPD65031 '%s': tsta r: %02x\n", tag(), m_tsta); return m_tsta & 0x07; // read real time clock counters case REG_TIM0: - if (LOG) logerror("uPD65031 '%s': TIM0 r: %02x\n", tag().c_str(), m_tim[0]); + if (LOG) logerror("uPD65031 '%s': TIM0 r: %02x\n", tag(), m_tim[0]); return m_tim[0]; case REG_TIM1: - if (LOG) logerror("uPD65031 '%s': TIM1 r: %02x\n", tag().c_str(), m_tim[1]); + if (LOG) logerror("uPD65031 '%s': TIM1 r: %02x\n", tag(), m_tim[1]); return m_tim[1]; case REG_TIM2: - if (LOG) logerror("uPD65031 '%s': TIM2 r: %02x\n", tag().c_str(), m_tim[2]); + if (LOG) logerror("uPD65031 '%s': TIM2 r: %02x\n", tag(), m_tim[2]); return m_tim[2]; case REG_TIM3: - if (LOG) logerror("uPD65031 '%s': TIM3 r: %02x\n", tag().c_str(), m_tim[3]); + if (LOG) logerror("uPD65031 '%s': TIM3 r: %02x\n", tag(), m_tim[3]); return m_tim[3]; case REG_TIM4: - if (LOG) logerror("uPD65031 '%s': TIM4 r: %02x\n", tag().c_str(), m_tim[4]); + if (LOG) logerror("uPD65031 '%s': TIM4 r: %02x\n", tag(), m_tim[4]); return m_tim[4]; // UART @@ -456,7 +456,7 @@ READ8_MEMBER( upd65031_device::read ) return 0; default: - logerror("uPD65031 '%s': blink r: %04x\n", tag().c_str(), offset); + logerror("uPD65031 '%s': blink r: %04x\n", tag(), offset); return 0; } } @@ -482,7 +482,7 @@ WRITE8_MEMBER( upd65031_device::write ) break; case REG_COM: // command register - if (LOG) logerror("uPD65031 '%s': com w: %02x\n", tag().c_str(), data); + if (LOG) logerror("uPD65031 '%s': com w: %02x\n", tag(), data); // reset clock? if (data & COM_RESTIM) @@ -518,7 +518,7 @@ WRITE8_MEMBER( upd65031_device::write ) break; case REG_INT: // interrupt control - if (LOG) logerror("uPD65031 '%s': int w: %02x\n", tag().c_str(), data); + if (LOG) logerror("uPD65031 '%s': int w: %02x\n", tag(), data); m_int = data; @@ -528,12 +528,12 @@ WRITE8_MEMBER( upd65031_device::write ) break; case REG_EPR: // EPROM programming register - if (LOG) logerror("uPD65031 '%s': epr w: %02x\n", tag().c_str(), data); + if (LOG) logerror("uPD65031 '%s': epr w: %02x\n", tag(), data); // TODO break; case REG_TACK: // rtc interrupt acknowledge - if (LOG) logerror("uPD65031 '%s': tack w: %02x\n", tag().c_str(), data); + if (LOG) logerror("uPD65031 '%s': tack w: %02x\n", tag(), data); // clear ints that have occurred m_tsta &= ~(data & 0x07); @@ -545,13 +545,13 @@ WRITE8_MEMBER( upd65031_device::write ) break; case REG_TMK: // write rtc interrupt mask - if (LOG) logerror("uPD65031 '%s': tmk w: %02x\n", tag().c_str(), data); + if (LOG) logerror("uPD65031 '%s': tmk w: %02x\n", tag(), data); m_tmk = data & 0x07; break; case REG_ACK: // acknowledge ints - if (LOG) logerror("uPD65031 '%s': ack w: %02x\n", tag().c_str(), data); + if (LOG) logerror("uPD65031 '%s': ack w: %02x\n", tag(), data); m_ack = data; m_sta &= ~(data & 0x7f); @@ -577,12 +577,12 @@ WRITE8_MEMBER( upd65031_device::write ) case REG_TXC: case REG_UMK: case REG_UAK: - if (LOG) logerror("uPD65031 '%s': UART w: %02x %02x\n", tag().c_str(), port & 7 , data); + if (LOG) logerror("uPD65031 '%s': UART w: %02x %02x\n", tag(), port & 7 , data); // TODO break; default: - logerror("uPD65031 '%s': blink w: %04x %02x\n", tag().c_str(), offset, data); + logerror("uPD65031 '%s': blink w: %04x %02x\n", tag(), offset, data); break; } } diff --git a/src/mame/machine/upd65031.h b/src/mame/machine/upd65031.h index c0b7f94c90c..d8ca35211d5 100644 --- a/src/mame/machine/upd65031.h +++ b/src/mame/machine/upd65031.h @@ -55,7 +55,7 @@ class upd65031_device : public device_t { public: // construction/destruction - upd65031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + upd65031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_kb_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_kb.set_callback(object); } template static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_int.set_callback(object); } diff --git a/src/mame/machine/v1050kb.cpp b/src/mame/machine/v1050kb.cpp index ea4022cfa7a..d1f06bcdf30 100644 --- a/src/mame/machine/v1050kb.cpp +++ b/src/mame/machine/v1050kb.cpp @@ -301,7 +301,7 @@ ioport_constructor v1050_keyboard_device::device_input_ports() const // v1050_keyboard_device - constructor //------------------------------------------------- -v1050_keyboard_device::v1050_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v1050_keyboard_device::v1050_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, V1050_KEYBOARD, "Visual 1050 Keyboard", tag, owner, clock, "v1050kb", __FILE__), m_maincpu(*this, I8049_TAG), m_discrete(*this, DISCRETE_TAG), diff --git a/src/mame/machine/v1050kb.h b/src/mame/machine/v1050kb.h index cc20f950f0c..dd646c40b04 100644 --- a/src/mame/machine/v1050kb.h +++ b/src/mame/machine/v1050kb.h @@ -36,7 +36,7 @@ class v1050_keyboard_device : public device_t { public: // construction/destruction - v1050_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v1050_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_out_tx_handler(device_t &device, _Object object) { return downcast(device).m_out_tx_handler.set_callback(object); } diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp index 66e85490838..61bd336b47e 100644 --- a/src/mame/machine/victor9k_fdc.cpp +++ b/src/mame/machine/victor9k_fdc.cpp @@ -217,7 +217,7 @@ machine_config_constructor victor_9000_fdc_t::device_mconfig_additions() const // victor_9000_fdc_t - constructor //------------------------------------------------- -victor_9000_fdc_t::victor_9000_fdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +victor_9000_fdc_t::victor_9000_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VICTOR_9000_FDC, "Victor 9000 FDC", tag, owner, clock, "victor9k_fdc", __FILE__), m_irq_cb(*this), m_syn_cb(*this), @@ -564,10 +564,10 @@ void victor_9000_fdc_t::update_stepper_motor(floppy_image_device *floppy, int st void victor_9000_fdc_t::update_spindle_motor(floppy_image_device *floppy, emu_timer *t_tach, bool start, bool stop, bool sel, UINT8 &da) { if (start && !stop && floppy->mon_r()) { - if (LOG_SCP) logerror("%s: motor start\n", floppy->tag().c_str()); + if (LOG_SCP) logerror("%s: motor start\n", floppy->tag()); floppy->mon_w(0); } else if (stop && !floppy->mon_r()) { - if (LOG_SCP) logerror("%s: motor stop\n", floppy->tag().c_str()); + if (LOG_SCP) logerror("%s: motor stop\n", floppy->tag()); floppy->mon_w(1); t_tach->reset(); } @@ -577,7 +577,7 @@ void victor_9000_fdc_t::update_spindle_motor(floppy_image_device *floppy, emu_ti if (!floppy->mon_r()) { float tach = rpm[da] / 60 * SPINDLE_RATIO * MOTOR_POLES; - if (LOG_SCP) logerror("%s: motor speed %u rpm / tach %0.1f hz (DA %02x)\n", floppy->tag().c_str(), rpm[da], (double) tach, da); + if (LOG_SCP) logerror("%s: motor speed %u rpm / tach %0.1f hz (DA %02x)\n", floppy->tag(), rpm[da], (double) tach, da); t_tach->adjust(attotime::from_hz(tach*2), 0, attotime::from_hz(tach*2)); floppy->set_rpm(rpm[da]); diff --git a/src/mame/machine/victor9k_fdc.h b/src/mame/machine/victor9k_fdc.h index 468d9d360af..60935760748 100644 --- a/src/mame/machine/victor9k_fdc.h +++ b/src/mame/machine/victor9k_fdc.h @@ -45,7 +45,7 @@ class victor_9000_fdc_t : public device_t { public: // construction/destruction - victor_9000_fdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + victor_9000_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_irq_cb.set_callback(object); } template static devcb_base &set_syn_wr_callback(device_t &device, _Object object) { return downcast(device).m_syn_cb.set_callback(object); } diff --git a/src/mame/machine/victor9kb.cpp b/src/mame/machine/victor9kb.cpp index 7bb534fdd7e..337a1b64cae 100644 --- a/src/mame/machine/victor9kb.cpp +++ b/src/mame/machine/victor9kb.cpp @@ -566,7 +566,7 @@ ioport_constructor victor_9000_keyboard_t::device_input_ports() const // victor_9000_keyboard_t - constructor //------------------------------------------------- -victor_9000_keyboard_t::victor_9000_keyboard_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +victor_9000_keyboard_t::victor_9000_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VICTOR9K_KEYBOARD, "Victor 9000 Keyboard", tag, owner, clock, "victor9kb", __FILE__), m_maincpu(*this, I8021_TAG), m_y0(*this, "Y0"), diff --git a/src/mame/machine/victor9kb.h b/src/mame/machine/victor9kb.h index 5383c4ce492..47511113fe7 100644 --- a/src/mame/machine/victor9kb.h +++ b/src/mame/machine/victor9kb.h @@ -38,7 +38,7 @@ class victor_9000_keyboard_t : public device_t { public: // construction/destruction - victor_9000_keyboard_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + victor_9000_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_kbrdy_cb(device_t &device, _Object object) { return downcast(device).m_kbrdy_cb.set_callback(object); } template static devcb_base &set_kbdata_cb(device_t &device, _Object object) { return downcast(device).m_kbdata_cb.set_callback(object); } diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp index 6ec7d866cba..679c75862a6 100644 --- a/src/mame/machine/wangpckb.cpp +++ b/src/mame/machine/wangpckb.cpp @@ -370,7 +370,7 @@ ioport_constructor wangpc_keyboard_device::device_input_ports() const // wangpc_keyboard_device - constructor //------------------------------------------------- -wangpc_keyboard_device::wangpc_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +wangpc_keyboard_device::wangpc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WANGPC_KEYBOARD, "Wang PC Keyboard", tag, owner, clock, "wangpckb", __FILE__), device_serial_interface(mconfig, *this), m_maincpu(*this, I8051_TAG), diff --git a/src/mame/machine/wangpckb.h b/src/mame/machine/wangpckb.h index 8b87026c602..e253685966a 100644 --- a/src/mame/machine/wangpckb.h +++ b/src/mame/machine/wangpckb.h @@ -48,7 +48,7 @@ class wangpc_keyboard_device : public device_t, { public: // construction/destruction - wangpc_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wangpc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast(device).m_txd_handler.set_callback(object); } diff --git a/src/mame/machine/wpc.cpp b/src/mame/machine/wpc.cpp index 48f0e288165..49608b7075f 100644 --- a/src/mame/machine/wpc.cpp +++ b/src/mame/machine/wpc.cpp @@ -12,7 +12,7 @@ const device_type WPCASIC = &device_creator; -wpc_device::wpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +wpc_device::wpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig,WPCASIC,"Williams WPC ASIC",tag,owner,clock, "wpc", __FILE__), m_dmd_visiblepage(0), m_irq_cb(*this), diff --git a/src/mame/machine/wpc.h b/src/mame/machine/wpc.h index 09c29246985..6d4a4e38406 100644 --- a/src/mame/machine/wpc.h +++ b/src/mame/machine/wpc.h @@ -102,7 +102,7 @@ class wpc_device : public device_t { public: - wpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); diff --git a/src/mame/machine/wpc_lamp.cpp b/src/mame/machine/wpc_lamp.cpp index 95523978b8f..eba57bb6ced 100644 --- a/src/mame/machine/wpc_lamp.cpp +++ b/src/mame/machine/wpc_lamp.cpp @@ -6,7 +6,7 @@ const device_type WPC_LAMP = &device_creator; -wpc_lamp_device::wpc_lamp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +wpc_lamp_device::wpc_lamp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WPC_LAMP, "Williams Pinball Controller Lamp Control", tag, owner, clock, "wpc_lamp", __FILE__) { names = nullptr; diff --git a/src/mame/machine/wpc_lamp.h b/src/mame/machine/wpc_lamp.h index 12df7709ae7..bc057ead3f4 100644 --- a/src/mame/machine/wpc_lamp.h +++ b/src/mame/machine/wpc_lamp.h @@ -12,7 +12,7 @@ class wpc_lamp_device : public device_t { public: - wpc_lamp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wpc_lamp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~wpc_lamp_device(); DECLARE_WRITE8_MEMBER(row_w); diff --git a/src/mame/machine/wpc_out.cpp b/src/mame/machine/wpc_out.cpp index fd4dc47a569..7268eeeed09 100644 --- a/src/mame/machine/wpc_out.cpp +++ b/src/mame/machine/wpc_out.cpp @@ -6,7 +6,7 @@ const device_type WPC_OUT = &device_creator; -wpc_out_device::wpc_out_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +wpc_out_device::wpc_out_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WPC_OUT, "Williams Pinball Controller Output Control", tag, owner, clock, "wpc_out", __FILE__) { names = nullptr; diff --git a/src/mame/machine/wpc_out.h b/src/mame/machine/wpc_out.h index 6734881ab76..f5615ddfd2a 100644 --- a/src/mame/machine/wpc_out.h +++ b/src/mame/machine/wpc_out.h @@ -15,7 +15,7 @@ class wpc_out_device : public device_t public: typedef delegate handler_t; - wpc_out_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wpc_out_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~wpc_out_device(); DECLARE_WRITE8_MEMBER(out_w); diff --git a/src/mame/machine/wpc_pic.cpp b/src/mame/machine/wpc_pic.cpp index f09b4bb48f7..353454fb7a1 100644 --- a/src/mame/machine/wpc_pic.cpp +++ b/src/mame/machine/wpc_pic.cpp @@ -6,7 +6,7 @@ const device_type WPC_PIC = &device_creator; -wpc_pic_device::wpc_pic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +wpc_pic_device::wpc_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WPC_PIC, "Williams Pinball Controller PIC Security", tag, owner, clock, "wpc_pic", __FILE__), swarray(*this, ":SW") { @@ -38,7 +38,7 @@ READ8_MEMBER(wpc_pic_device::read) data = swarray[curcmd - 0x16]->read(); else - logerror("%s: cmd=%02x (%04x)\n", tag().c_str(), curcmd, space.device().safe_pc()); + logerror("%s: cmd=%02x (%04x)\n", tag(), curcmd, space.device().safe_pc()); return data; } @@ -50,7 +50,7 @@ void wpc_pic_device::check_game_id() UINT32 v = (i >> 8) * 0x3133 + (i & 0xff) * 0x3231; v = v & 0xffffff; if(v == cmp) - logerror("%s: Detected game id %03d\n", tag().c_str(), i); + logerror("%s: Detected game id %03d\n", tag(), i); } } @@ -60,7 +60,7 @@ WRITE8_MEMBER(wpc_pic_device::write) cmpchk[3-chk_count] = data; if(data != cmpchk[3-chk_count]) { - logerror("%s: WARNING: validation error, checksum[%d] got %02x, expected %02x\n", tag().c_str(), 3-chk_count, data, chk[3-chk_count]); + logerror("%s: WARNING: validation error, checksum[%d] got %02x, expected %02x\n", tag(), 3-chk_count, data, chk[3-chk_count]); if(chk_count == 1) check_game_id(); } @@ -79,7 +79,7 @@ WRITE8_MEMBER(wpc_pic_device::write) else if(data == 0x20) chk_count = 3; else if((data < 0x16 || data >= 0x1e) && ((data & 0xf0) != 0x70)) - logerror("%s: write %02x (%04x)\n", tag().c_str(), data, space.device().safe_pc()); + logerror("%s: write %02x (%04x)\n", tag(), data, space.device().safe_pc()); curcmd = data; } diff --git a/src/mame/machine/wpc_pic.h b/src/mame/machine/wpc_pic.h index 61266e71204..793dec9c05e 100644 --- a/src/mame/machine/wpc_pic.h +++ b/src/mame/machine/wpc_pic.h @@ -12,7 +12,7 @@ class wpc_pic_device : public device_t { public: - wpc_pic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wpc_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~wpc_pic_device(); DECLARE_READ8_MEMBER(read); diff --git a/src/mame/machine/wpc_shift.cpp b/src/mame/machine/wpc_shift.cpp index ade2c28f2c4..8022f14a26a 100644 --- a/src/mame/machine/wpc_shift.cpp +++ b/src/mame/machine/wpc_shift.cpp @@ -6,7 +6,7 @@ const device_type WPC_SHIFT = &device_creator; -wpc_shift_device::wpc_shift_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +wpc_shift_device::wpc_shift_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WPC_SHIFT, "Williams Pinball Controller Shifter", tag, owner, clock, "wpc_shift", __FILE__) { } diff --git a/src/mame/machine/wpc_shift.h b/src/mame/machine/wpc_shift.h index 9968bc79f23..70fc487c3ea 100644 --- a/src/mame/machine/wpc_shift.h +++ b/src/mame/machine/wpc_shift.h @@ -12,7 +12,7 @@ class wpc_shift_device : public device_t { public: - wpc_shift_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wpc_shift_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~wpc_shift_device(); DECLARE_ADDRESS_MAP(registers, 8); diff --git a/src/mame/machine/x1.cpp b/src/mame/machine/x1.cpp index 50174644e24..f9c40398f20 100644 --- a/src/mame/machine/x1.cpp +++ b/src/mame/machine/x1.cpp @@ -14,7 +14,7 @@ const device_type X1_KEYBOARD = &device_creator; // z80ctc_device - constructor //------------------------------------------------- -x1_keyboard_device::x1_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +x1_keyboard_device::x1_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, X1_KEYBOARD, "X1 Keyboard", tag, owner, clock, "x1_keyboard", __FILE__), device_z80daisy_interface(mconfig, *this) { diff --git a/src/mame/machine/x68k_hdc.cpp b/src/mame/machine/x68k_hdc.cpp index 0429a4db0d9..bdc1612da23 100644 --- a/src/mame/machine/x68k_hdc.cpp +++ b/src/mame/machine/x68k_hdc.cpp @@ -23,7 +23,7 @@ const device_type X68KHDC = &device_creator; -x68k_hdc_image_device::x68k_hdc_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +x68k_hdc_image_device::x68k_hdc_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, X68KHDC, "SASI Hard Disk", tag, owner, clock, "x68k_hdc_image", __FILE__), device_image_interface(mconfig, *this) { diff --git a/src/mame/machine/x68k_hdc.h b/src/mame/machine/x68k_hdc.h index 2baad2f29de..a4ea3e92165 100644 --- a/src/mame/machine/x68k_hdc.h +++ b/src/mame/machine/x68k_hdc.h @@ -82,7 +82,7 @@ class x68k_hdc_image_device : public device_t, { public: // construction/destruction - x68k_hdc_image_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + x68k_hdc_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides virtual iodevice_t image_type() const override { return IO_HARDDISK; } diff --git a/src/mame/machine/x68k_kbd.cpp b/src/mame/machine/x68k_kbd.cpp index 00301df3491..675038414c4 100644 --- a/src/mame/machine/x68k_kbd.cpp +++ b/src/mame/machine/x68k_kbd.cpp @@ -2,7 +2,7 @@ // copyright-holders:Barry Rodewald #include "machine/x68k_kbd.h" -x68k_keyboard_device::x68k_keyboard_device(const machine_config& mconfig, std::string tag, device_t* owner, UINT32 clock) : +x68k_keyboard_device::x68k_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) : serial_keyboard_device(mconfig, X68K_KEYBOARD, "X68k Keyboard", tag, owner, 0, "x68k_keyboard", __FILE__), m_io_kbd8(*this, "TERM_LINE8"), m_io_kbd9(*this, "TERM_LINE9"), diff --git a/src/mame/machine/x68k_kbd.h b/src/mame/machine/x68k_kbd.h index 8836e0d3bfc..09c5b1c0e0c 100644 --- a/src/mame/machine/x68k_kbd.h +++ b/src/mame/machine/x68k_kbd.h @@ -8,7 +8,7 @@ class x68k_keyboard_device : public serial_keyboard_device { public: - x68k_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + x68k_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const override; protected: diff --git a/src/mame/machine/x820kb.cpp b/src/mame/machine/x820kb.cpp index d68d53a152b..115e8591e4a 100644 --- a/src/mame/machine/x820kb.cpp +++ b/src/mame/machine/x820kb.cpp @@ -239,7 +239,7 @@ ioport_constructor xerox_820_keyboard_t::device_input_ports() const // xerox_820_keyboard_t - constructor //------------------------------------------------- -xerox_820_keyboard_t::xerox_820_keyboard_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +xerox_820_keyboard_t::xerox_820_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, XEROX_820_KEYBOARD, "Xerox 820 Keyboard", tag, owner, clock, "x820kb", __FILE__), m_maincpu(*this, I8748_TAG), m_y0(*this, "Y0"), diff --git a/src/mame/machine/x820kb.h b/src/mame/machine/x820kb.h index 7e0b0993d78..ca678203545 100644 --- a/src/mame/machine/x820kb.h +++ b/src/mame/machine/x820kb.h @@ -35,7 +35,7 @@ class xerox_820_keyboard_t : public device_t { public: // construction/destruction - xerox_820_keyboard_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + xerox_820_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_kbstb_wr_callback(device_t &device, _Object object) { return downcast(device).m_kbstb_cb.set_callback(object); } diff --git a/src/mame/machine/zndip.cpp b/src/mame/machine/zndip.cpp index c6ba395d308..f5e1d618604 100644 --- a/src/mame/machine/zndip.cpp +++ b/src/mame/machine/zndip.cpp @@ -4,7 +4,7 @@ const device_type ZNDIP = &device_creator; -zndip_device::zndip_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +zndip_device::zndip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ZNDIP, "Sony ZNDIP", tag, owner, clock, "zndip", __FILE__), m_data_handler(*this), m_dataout_handler(*this), diff --git a/src/mame/machine/zndip.h b/src/mame/machine/zndip.h index 7725570c341..405ee496fda 100644 --- a/src/mame/machine/zndip.h +++ b/src/mame/machine/zndip.h @@ -21,7 +21,7 @@ extern const device_type ZNDIP; class zndip_device : public device_t { public: - zndip_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + zndip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template static devcb_base &set_data_handler(device_t &device, _Object object) { return downcast(device).m_data_handler.set_callback(object); } diff --git a/src/mame/machine/zs01.cpp b/src/mame/machine/zs01.cpp index 37f12f241e3..613a3cdcc1a 100644 --- a/src/mame/machine/zs01.cpp +++ b/src/mame/machine/zs01.cpp @@ -22,14 +22,14 @@ inline void ATTR_PRINTF( 3, 4 ) zs01_device::verboselog( int n_level, const char va_start( v, s_fmt ); vsprintf( buf, s_fmt, v ); va_end( v ); - logerror( "%s: zs01(%s) %s", machine().describe_context(), tag().c_str(), buf ); + logerror( "%s: zs01(%s) %s", machine().describe_context(), tag(), buf ); } } // device type definition const device_type ZS01 = &device_creator; -zs01_device::zs01_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +zs01_device::zs01_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock ) : device_t( mconfig, ZS01, "Konami ZS01 PIC", tag, owner, clock, "zs01", __FILE__ ), device_nvram_interface(mconfig, *this), m_cs( 0 ), @@ -583,11 +583,11 @@ void zs01_device::nvram_default() if( !m_region ) { - logerror( "zs01(%s) region not found\n", tag().c_str() ); + logerror( "zs01(%s) region not found\n", tag() ); } else if( m_region->bytes() != expected_bytes ) { - logerror( "zs01(%s) region length 0x%x expected 0x%x\n", tag().c_str(), m_region->bytes(), expected_bytes ); + logerror( "zs01(%s) region length 0x%x expected 0x%x\n", tag(), m_region->bytes(), expected_bytes ); } else { diff --git a/src/mame/machine/zs01.h b/src/mame/machine/zs01.h index 175580975b6..2606cb5341e 100644 --- a/src/mame/machine/zs01.h +++ b/src/mame/machine/zs01.h @@ -24,7 +24,7 @@ class zs01_device : public device_t, { public: // construction/destruction - zs01_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ); + zs01_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock ); // inline configuration helpers static void static_set_ds2401_tag( device_t &device, const char *ds2401_tag ) { downcast( device ).m_ds2401_tag = ds2401_tag; } diff --git a/src/mame/machine/zx8302.cpp b/src/mame/machine/zx8302.cpp index 45ad3359784..16e06522aa0 100644 --- a/src/mame/machine/zx8302.cpp +++ b/src/mame/machine/zx8302.cpp @@ -93,7 +93,7 @@ inline void zx8302_device::transmit_ipc_data() switch (m_ipc_state) { case IPC_START: - if (LOG) logerror("ZX8302 '%s' COMDATA Start Bit\n", tag().c_str()); + if (LOG) logerror("ZX8302 '%s' COMDATA Start Bit\n", tag()); m_out_comdata_cb(BIT(m_idr, 0)); m_ipc_busy = 1; @@ -101,7 +101,7 @@ inline void zx8302_device::transmit_ipc_data() break; case IPC_DATA: - if (LOG) logerror("ZX8302 '%s' COMDATA Data Bit: %x\n", tag().c_str(), BIT(m_idr, 1)); + if (LOG) logerror("ZX8302 '%s' COMDATA Data Bit: %x\n", tag(), BIT(m_idr, 1)); m_comdata_to_ipc = BIT(m_idr, 1); m_out_comdata_cb(m_comdata_to_ipc); @@ -109,7 +109,7 @@ inline void zx8302_device::transmit_ipc_data() break; case IPC_STOP: - if (LOG) logerror("ZX8302 '%s' COMDATA Stop Bit\n", tag().c_str()); + if (LOG) logerror("ZX8302 '%s' COMDATA Stop Bit\n", tag()); m_out_comdata_cb(BIT(m_idr, 2)); m_ipc_busy = 0; @@ -127,7 +127,7 @@ inline void zx8302_device::transmit_ipc_data() // zx8302_device - constructor //------------------------------------------------- -zx8302_device::zx8302_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +zx8302_device::zx8302_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ZX8302, "Sinclair ZX8302", tag, owner, clock, "zx8302", __FILE__), device_serial_interface(mconfig, *this), m_rtc_clock(0), @@ -340,7 +340,7 @@ READ8_MEMBER( zx8302_device::rtc_r ) WRITE8_MEMBER( zx8302_device::rtc_w ) { - if (LOG) logerror("ZX8302 '%s' Set Real Time Clock: %02x\n", tag().c_str(), data); + if (LOG) logerror("ZX8302 '%s' Set Real Time Clock: %02x\n", tag(), data); } @@ -350,7 +350,7 @@ WRITE8_MEMBER( zx8302_device::rtc_w ) WRITE8_MEMBER( zx8302_device::control_w ) { - if (LOG) logerror("ZX8302 '%s' Transmit Control: %02x\n", tag().c_str(), data); + if (LOG) logerror("ZX8302 '%s' Transmit Control: %02x\n", tag(), data); int baud = (19200 >> (data & BAUD_MASK)); int baudx4 = baud * 4; @@ -370,7 +370,7 @@ WRITE8_MEMBER( zx8302_device::control_w ) READ8_MEMBER( zx8302_device::mdv_track_r ) { - if (LOG) logerror("ZX8302 '%s' Microdrive Track %u: %02x\n", tag().c_str(), m_track, m_mdv_data[m_track]); + if (LOG) logerror("ZX8302 '%s' Microdrive Track %u: %02x\n", tag(), m_track, m_mdv_data[m_track]); UINT8 data = m_mdv_data[m_track]; @@ -422,7 +422,7 @@ READ8_MEMBER( zx8302_device::status_r ) // COMDATA data |= m_comdata_to_cpu << 7; - if (LOG) logerror("ZX8302 '%s' Status: %02x\n", tag().c_str(), data); + if (LOG) logerror("ZX8302 '%s' Status: %02x\n", tag(), data); return data; } @@ -444,7 +444,7 @@ READ8_MEMBER( zx8302_device::status_r ) WRITE8_MEMBER( zx8302_device::ipc_command_w ) { - if (LOG) logerror("ZX8302 '%s' IPC Command: %02x\n", tag().c_str(), data); + if (LOG) logerror("ZX8302 '%s' IPC Command: %02x\n", tag(), data); m_idr = data; m_ipc_state = IPC_START; @@ -474,7 +474,7 @@ WRITE8_MEMBER( zx8302_device::mdv_control_w ) */ - if (LOG) logerror("ZX8302 '%s' Microdrive Control: %02x\n", tag().c_str(), data); + if (LOG) logerror("ZX8302 '%s' Microdrive Control: %02x\n", tag(), data); m_out_mdseld_cb(BIT(data, 0)); m_out_mdselck_cb(BIT(data, 1)); @@ -494,7 +494,7 @@ WRITE8_MEMBER( zx8302_device::mdv_control_w ) READ8_MEMBER( zx8302_device::irq_status_r ) { - if (LOG) logerror("ZX8302 '%s' Interrupt Status: %02x\n", tag().c_str(), m_irq); + if (LOG) logerror("ZX8302 '%s' Interrupt Status: %02x\n", tag(), m_irq); return m_irq; } @@ -506,7 +506,7 @@ READ8_MEMBER( zx8302_device::irq_status_r ) WRITE8_MEMBER( zx8302_device::irq_acknowledge_w ) { - if (LOG) logerror("ZX8302 '%s' Interrupt Acknowledge: %02x\n", tag().c_str(), data); + if (LOG) logerror("ZX8302 '%s' Interrupt Acknowledge: %02x\n", tag(), data); m_irq &= ~data; @@ -523,7 +523,7 @@ WRITE8_MEMBER( zx8302_device::irq_acknowledge_w ) WRITE8_MEMBER( zx8302_device::data_w ) { - if (LOG) logerror("ZX8302 '%s' Data Register: %02x\n", tag().c_str(), data); + if (LOG) logerror("ZX8302 '%s' Data Register: %02x\n", tag(), data); m_tdr = data; m_status |= STATUS_TX_BUFFER_FULL; @@ -538,7 +538,7 @@ WRITE_LINE_MEMBER( zx8302_device::vsync_w ) { if (state) { - if (LOG) logerror("ZX8302 '%s' Frame Interrupt\n", tag().c_str()); + if (LOG) logerror("ZX8302 '%s' Frame Interrupt\n", tag()); trigger_interrupt(INT_FRAME); } @@ -551,7 +551,7 @@ WRITE_LINE_MEMBER( zx8302_device::vsync_w ) WRITE_LINE_MEMBER( zx8302_device::comctl_w ) { - if (LOG) logerror("ZX8302 '%s' COMCTL: %x\n", tag().c_str(), state); + if (LOG) logerror("ZX8302 '%s' COMCTL: %x\n", tag(), state); if (state) { @@ -569,7 +569,7 @@ WRITE_LINE_MEMBER( zx8302_device::comctl_w ) WRITE_LINE_MEMBER( zx8302_device::comdata_w ) { - if (LOG) logerror("ZX8302 '%s' COMDATA->CPU(pending): %x\n", tag().c_str(), state); + if (LOG) logerror("ZX8302 '%s' COMDATA->CPU(pending): %x\n", tag(), state); m_comdata_from_ipc = state; } @@ -581,7 +581,7 @@ WRITE_LINE_MEMBER( zx8302_device::comdata_w ) WRITE_LINE_MEMBER( zx8302_device::extint_w ) { - if (LOG) logerror("ZX8302 '%s' EXTINT: %x\n", tag().c_str(), state); + if (LOG) logerror("ZX8302 '%s' EXTINT: %x\n", tag(), state); if (state == ASSERT_LINE) { diff --git a/src/mame/machine/zx8302.h b/src/mame/machine/zx8302.h index 986c7dfa206..0d4a223946f 100644 --- a/src/mame/machine/zx8302.h +++ b/src/mame/machine/zx8302.h @@ -98,7 +98,7 @@ class zx8302_device : public device_t, { public: // construction/destruction - zx8302_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + zx8302_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_rtc_clock(device_t &device, int rtc_clock) { downcast(device).m_rtc_clock = rtc_clock; } template static devcb_base &set_out_ipl1l_callback(device_t &device, _Object object) { return downcast(device).m_out_ipl1l_cb.set_callback(object); } diff --git a/src/mame/video/733_asr.cpp b/src/mame/video/733_asr.cpp index a2cd22d7e8c..e9c446301a2 100644 --- a/src/mame/video/733_asr.cpp +++ b/src/mame/video/733_asr.cpp @@ -80,7 +80,7 @@ PALETTE_INIT_MEMBER(asr733_device, asr733) const device_type ASR733 = &device_creator; -asr733_device::asr733_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +asr733_device::asr733_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASR733, "733 ASR", tag, owner, clock, "asr733", __FILE__), m_palette(*this, "palette"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/video/733_asr.h b/src/mame/video/733_asr.h index 54a62303ee6..9c45c69c6ed 100644 --- a/src/mame/video/733_asr.h +++ b/src/mame/video/733_asr.h @@ -13,7 +13,7 @@ enum class asr733_device : public device_t { public: - asr733_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + asr733_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_PALETTE_INIT(asr733); diff --git a/src/mame/video/911_vdt.cpp b/src/mame/video/911_vdt.cpp index 0ed7ee3d364..c0d30600681 100644 --- a/src/mame/video/911_vdt.cpp +++ b/src/mame/video/911_vdt.cpp @@ -143,7 +143,7 @@ static void apply_char_overrides(int nb_char_overrides, const char_override_t ch const device_type VDT911 = &device_creator; -vdt911_device::vdt911_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vdt911_device::vdt911_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VDT911, "911 VDT", tag, owner, clock, "vdt911", __FILE__), m_beeper(*this, "beeper"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/video/911_vdt.h b/src/mame/video/911_vdt.h index b87430fc1b6..e0ced6bbede 100644 --- a/src/mame/video/911_vdt.h +++ b/src/mame/video/911_vdt.h @@ -37,7 +37,7 @@ enum vdt911_model_t class vdt911_device : public device_t { public: - vdt911_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + vdt911_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(cru_r); DECLARE_WRITE8_MEMBER(cru_w); diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp index feb613af679..60b05e4fc94 100644 --- a/src/mame/video/abc1600.cpp +++ b/src/mame/video/abc1600.cpp @@ -224,7 +224,7 @@ machine_config_constructor abc1600_mover_device::device_mconfig_additions() cons // abc1600_mover_device - constructor //------------------------------------------------- -abc1600_mover_device::abc1600_mover_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +abc1600_mover_device::abc1600_mover_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC1600_MOVER, "ABC 1600 Mover", tag, owner, clock, "abc1600mover", __FILE__), device_memory_interface(mconfig, *this), m_space_config("vram", ENDIANNESS_BIG, 16, 18, -1, *ADDRESS_MAP_NAME(mover_map)), diff --git a/src/mame/video/abc1600.h b/src/mame/video/abc1600.h index 05c291214a0..a3f356dd2e5 100644 --- a/src/mame/video/abc1600.h +++ b/src/mame/video/abc1600.h @@ -39,7 +39,7 @@ class abc1600_mover_device : public device_t, { public: // construction/destruction - abc1600_mover_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + abc1600_mover_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const override; diff --git a/src/mame/video/antic.cpp b/src/mame/video/antic.cpp index e1cf7592ab8..e393107bf53 100644 --- a/src/mame/video/antic.cpp +++ b/src/mame/video/antic.cpp @@ -25,9 +25,10 @@ const device_type ATARI_ANTIC = &device_creator; // antic_device - constructor //------------------------------------------------- -antic_device::antic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +antic_device::antic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ATARI_ANTIC, "Atari ANTIC", tag, owner, clock, "antic", __FILE__), device_video_interface(mconfig, *this), + m_gtia_tag(nullptr), m_maincpu(*this, ":maincpu"), m_djoy_b(*this, ":djoy_b"), m_artifacts(*this, ":artifacts"), diff --git a/src/mame/video/antic.h b/src/mame/video/antic.h index 8eb0fff7e55..2b278c2a780 100644 --- a/src/mame/video/antic.h +++ b/src/mame/video/antic.h @@ -366,14 +366,14 @@ class antic_device : public device_t, { public: // construction/destruction - antic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + antic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - static void set_gtia_tag(device_t &device, std::string tag) { downcast(device).m_gtia_tag = tag; } + static void set_gtia_tag(device_t &device, const char *tag) { downcast(device).m_gtia_tag = tag; } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -387,7 +387,7 @@ private: static const device_timer_id TIMER_LINE_REND = 2; static const device_timer_id TIMER_LINE_DONE = 3; - std::string m_gtia_tag; + const char *m_gtia_tag; gtia_device *m_gtia; required_device m_maincpu; optional_ioport m_djoy_b; diff --git a/src/mame/video/apollo.cpp b/src/mame/video/apollo.cpp index 60f78fadd4d..7d6cc7099ef 100644 --- a/src/mame/video/apollo.cpp +++ b/src/mame/video/apollo.cpp @@ -1719,14 +1719,14 @@ MACHINE_CONFIG_END const device_type APOLLO_GRAPHICS = &device_creator ; -apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,std::string tag, device_t *owner, UINT32 clock) : +apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, APOLLO_GRAPHICS, "Apollo Screen", tag, owner, clock,"apollo_graphics_15i", __FILE__), m_lut_fifo(nullptr), m_bt458(nullptr) { } -apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,std::string tag, device_t *owner, UINT32 clock, device_type type,const char *name, const char *shortname, const char *source) : +apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,const char *tag, device_t *owner, UINT32 clock, device_type type,const char *name, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_lut_fifo(nullptr), m_bt458(nullptr) @@ -1904,7 +1904,7 @@ MACHINE_CONFIG_FRAGMENT( apollo_mono19i ) const device_type APOLLO_MONO19I = &device_creator ; apollo_graphics_19i::apollo_graphics_19i(const machine_config &mconfig, - std::string tag, device_t *owner, UINT32 clock) : + const char *tag, device_t *owner, UINT32 clock) : apollo_graphics_15i(mconfig, tag, owner, clock, APOLLO_MONO19I, "Apollo 19\" Monochrome Screen", "apollo_graphics_19i", __FILE__) { diff --git a/src/mame/video/apple2.cpp b/src/mame/video/apple2.cpp index 8eacc248cae..a496d3e3e15 100644 --- a/src/mame/video/apple2.cpp +++ b/src/mame/video/apple2.cpp @@ -679,7 +679,7 @@ const device_type APPLE2_VIDEO = &device_creator; // a2_video_device - constructor //------------------------------------------------- -a2_video_device::a2_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +a2_video_device::a2_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, APPLE2_VIDEO, "Apple II video", tag, owner, clock, "a2video", __FILE__) { } diff --git a/src/mame/video/apple2.h b/src/mame/video/apple2.h index 91cfe218092..420a293a703 100644 --- a/src/mame/video/apple2.h +++ b/src/mame/video/apple2.h @@ -16,7 +16,7 @@ class a2_video_device : { public: // construction/destruction - a2_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + a2_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_PALETTE_INIT(apple2); diff --git a/src/mame/video/atarimo.cpp b/src/mame/video/atarimo.cpp index 010268263e5..bb5e1927e40 100644 --- a/src/mame/video/atarimo.cpp +++ b/src/mame/video/atarimo.cpp @@ -123,7 +123,7 @@ const device_type ATARI_MOTION_OBJECTS = &device_creator(device).m_gfxdecode.set_tag(tag); } diff --git a/src/mame/video/atarimo.h b/src/mame/video/atarimo.h index 2bccbec2026..0d3b54f6f38 100644 --- a/src/mame/video/atarimo.h +++ b/src/mame/video/atarimo.h @@ -83,10 +83,10 @@ class atari_motion_objects_device : public sprite16_device_ind16, public: // construction/destruction - atari_motion_objects_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_motion_objects_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void static_set_config(device_t &device, const atari_motion_objects_config &config); // getters diff --git a/src/mame/video/atarirle.cpp b/src/mame/video/atarirle.cpp index 464df7b9a4f..6a433d4666c 100644 --- a/src/mame/video/atarirle.cpp +++ b/src/mame/video/atarirle.cpp @@ -66,7 +66,7 @@ inline int atari_rle_objects_device::round_to_powerof2(int value) // atari_rle_objects_device: Constructor //------------------------------------------------- -atari_rle_objects_device::atari_rle_objects_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_rle_objects_device::atari_rle_objects_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ATARI_RLE_OBJECTS, "Atari RLE Motion Objects", tag, owner, clock, "atari_rle", __FILE__), device_video_interface(mconfig, *this) { @@ -191,7 +191,7 @@ void atari_rle_objects_device::device_start() // resolve our memory memory_share *share = owner()->memshare(tag()); if (share == nullptr) - throw emu_fatalerror("Error: unable to find memory share '%s' needed for Atari RLE device", tag().c_str()); + throw emu_fatalerror("Error: unable to find memory share '%s' needed for Atari RLE device", tag()); m_ram.set(*share, 2); // register a VBLANK callback diff --git a/src/mame/video/atarirle.h b/src/mame/video/atarirle.h index 07cc68f6635..5cf65931d04 100644 --- a/src/mame/video/atarirle.h +++ b/src/mame/video/atarirle.h @@ -78,7 +78,7 @@ class atari_rle_objects_device : public device_t, { public: // construction/destruction - atari_rle_objects_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_rle_objects_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers static void static_set_config(device_t &device, const atari_rle_objects_config &config); diff --git a/src/mame/video/avgdvg.cpp b/src/mame/video/avgdvg.cpp index 8ba78e925a6..4363db0e66c 100644 --- a/src/mame/video/avgdvg.cpp +++ b/src/mame/video/avgdvg.cpp @@ -1390,12 +1390,12 @@ void dvg_device::device_start() register_state(); } -void avgdvg_device::static_set_vector_tag(device_t &device, std::string tag) +void avgdvg_device::static_set_vector_tag(device_t &device, const char *tag) { downcast(device).m_vector.set_tag(tag); } -avgdvg_device::avgdvg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +avgdvg_device::avgdvg_device(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_vector(*this) { @@ -1451,47 +1451,47 @@ avgdvg_device::avgdvg_device(const machine_config &mconfig, device_type type, co nvect = 0; } -dvg_device::dvg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +dvg_device::dvg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : avgdvg_device(mconfig, DVG, "Atari DVG", tag, owner, clock, "dvg", __FILE__) { } -avg_device::avg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +avg_device::avg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : avgdvg_device(mconfig, AVG, "Atari AVG", tag, owner, clock, "avg", __FILE__) { } -avg_device::avg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +avg_device::avg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : avgdvg_device(mconfig, type, name, tag, owner, clock, shortname, source) { } -avg_tempest_device::avg_tempest_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +avg_tempest_device::avg_tempest_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : avg_device(mconfig, AVG_TEMPEST, "Atari AVG (Tempest)", tag, owner, clock, "avg_tempest", __FILE__) { } -avg_mhavoc_device::avg_mhavoc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +avg_mhavoc_device::avg_mhavoc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : avg_device(mconfig, AVG_MHAVOC, "Atari AVG (Major Havoc)", tag, owner, clock, "avg_mhavoc", __FILE__) { } -avg_starwars_device::avg_starwars_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +avg_starwars_device::avg_starwars_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : avg_device(mconfig, AVG_STARWARS, "Atari AVG (Star Wars)", tag, owner, clock, "avg_starwars", __FILE__) { } -avg_quantum_device::avg_quantum_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +avg_quantum_device::avg_quantum_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : avg_device(mconfig, AVG_QUANTUM, "Atari AVG (Quantum)", tag, owner, clock, "avg_quantum", __FILE__) { } -avg_bzone_device::avg_bzone_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +avg_bzone_device::avg_bzone_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : avg_device(mconfig, AVG_BZONE, "Atari AVG (Battle Zone)", tag, owner, clock, "avg_bzone", __FILE__) { } -avg_tomcat_device::avg_tomcat_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +avg_tomcat_device::avg_tomcat_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : avg_device(mconfig, AVG_TOMCAT, "Atari AVG (TomCat)", tag, owner, clock, "avg_tomcat", __FILE__) { } diff --git a/src/mame/video/avgdvg.h b/src/mame/video/avgdvg.h index ddd657c775b..8c15bde31d5 100644 --- a/src/mame/video/avgdvg.h +++ b/src/mame/video/avgdvg.h @@ -25,9 +25,9 @@ class avgdvg_device : public device_t { public: // construction/destruction - avgdvg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + avgdvg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - static void static_set_vector_tag(device_t &device, std::string tag); + static void static_set_vector_tag(device_t &device, const char *tag); DECLARE_CUSTOM_INPUT_MEMBER(done_r); DECLARE_WRITE8_MEMBER(go_w); @@ -127,7 +127,7 @@ class dvg_device : public avgdvg_device { public: // construction/destruction - dvg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dvg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void dvg_draw_to(int x, int y, int intensity); @@ -154,8 +154,8 @@ class avg_device : public avgdvg_device { public: // construction/destruction - avg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - avg_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + avg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + avg_device(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 avg_common_strobe1(); int avg_common_strobe2(); @@ -184,7 +184,7 @@ class avg_tempest_device : public avg_device { public: // construction/destruction - avg_tempest_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + avg_tempest_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual int handler_6() override; virtual int handler_7() override; @@ -198,7 +198,7 @@ class avg_mhavoc_device : public avg_device { public: // construction/destruction - avg_mhavoc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + avg_mhavoc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual int handler_1() override; virtual int handler_6() override; @@ -214,7 +214,7 @@ class avg_starwars_device : public avg_device { public: // construction/destruction - avg_starwars_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + avg_starwars_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual int handler_6() override; virtual int handler_7() override; virtual void update_databus() override; @@ -227,7 +227,7 @@ class avg_quantum_device : public avg_device { public: // construction/destruction - avg_quantum_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + avg_quantum_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual int handler_0() override; virtual int handler_1() override; virtual int handler_2() override; @@ -247,7 +247,7 @@ class avg_bzone_device : public avg_device { public: // construction/destruction - avg_bzone_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + avg_bzone_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual int handler_1() override; virtual int handler_6() override; virtual int handler_7() override; @@ -260,7 +260,7 @@ class avg_tomcat_device : public avg_device { public: // construction/destruction - avg_tomcat_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + avg_tomcat_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual int handler_6() override; virtual int handler_7() override; diff --git a/src/mame/video/bfm_adr2.cpp b/src/mame/video/bfm_adr2.cpp index 068b980b473..bca9061ffc2 100644 --- a/src/mame/video/bfm_adr2.cpp +++ b/src/mame/video/bfm_adr2.cpp @@ -117,7 +117,7 @@ E000-FFFF | R | D D D D D D D D | 8K ROM const device_type BFM_ADDER2 = &device_creator; -bfm_adder2_device::bfm_adder2_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +bfm_adder2_device::bfm_adder2_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock ) : device_t(mconfig, BFM_ADDER2, "BFM ADDER2", tag, owner, clock, "bfm_adder2", __FILE__), m_cpu(*this, "adder2"), m_gfxdecode(*this, "gfxdecode"), diff --git a/src/mame/video/bfm_adr2.h b/src/mame/video/bfm_adr2.h index daafa394ee6..301ee7acf0d 100644 --- a/src/mame/video/bfm_adr2.h +++ b/src/mame/video/bfm_adr2.h @@ -7,7 +7,7 @@ class bfm_adder2_device : public device_t { public: // construction/destruction - bfm_adder2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + bfm_adder2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); TILE_GET_INFO_MEMBER( get_tile0_info ); TILE_GET_INFO_MEMBER( get_tile1_info ); diff --git a/src/mame/video/bfm_dm01.cpp b/src/mame/video/bfm_dm01.cpp index ecc31e4503d..c1977276f00 100644 --- a/src/mame/video/bfm_dm01.cpp +++ b/src/mame/video/bfm_dm01.cpp @@ -53,7 +53,7 @@ Standard dm01 memorymap const device_type BF_DM01 = &device_creator; -bfmdm01_device::bfmdm01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +bfmdm01_device::bfmdm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BF_DM01, "BFM Dotmatrix 01", tag, owner, clock, "bfm_dm01", __FILE__), m_data_avail(0), m_control(0), diff --git a/src/mame/video/bfm_dm01.h b/src/mame/video/bfm_dm01.h index a6623f1dfe6..29fe0f2fbf1 100644 --- a/src/mame/video/bfm_dm01.h +++ b/src/mame/video/bfm_dm01.h @@ -16,7 +16,7 @@ class bfmdm01_device : public device_t { public: - bfmdm01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + bfmdm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~bfmdm01_device() {} template static devcb_base &set_busy_callback(device_t &device, _Object object) { return downcast(device).m_busy_cb.set_callback(object); } diff --git a/src/mame/video/c116.cpp b/src/mame/video/c116.cpp index fbfc1bc6d0d..e9a1381462a 100644 --- a/src/mame/video/c116.cpp +++ b/src/mame/video/c116.cpp @@ -73,7 +73,7 @@ i960 CPU, needs to write its clip and raster values byteswapped. // namco_c116_device -- constructor //------------------------------------------------- -namco_c116_device::namco_c116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_c116_device::namco_c116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_C116, "Namco C116 Video Controller", tag, owner, clock, "namco_c116", __FILE__), device_gfx_interface(mconfig, *this), device_video_interface(mconfig, *this) diff --git a/src/mame/video/c116.h b/src/mame/video/c116.h index d8333feb579..2d48b4f123b 100644 --- a/src/mame/video/c116.h +++ b/src/mame/video/c116.h @@ -18,7 +18,7 @@ class namco_c116_device : { public: //construction/destruction - namco_c116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_c116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); //read/write handlers DECLARE_READ8_MEMBER( read ); diff --git a/src/mame/video/c45.cpp b/src/mame/video/c45.cpp index 7ed447227ad..6860961b4b7 100644 --- a/src/mame/video/c45.cpp +++ b/src/mame/video/c45.cpp @@ -76,7 +76,7 @@ ADDRESS_MAP_END // namco_c45_road_device -- constructor //------------------------------------------------- -namco_c45_road_device::namco_c45_road_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_c45_road_device::namco_c45_road_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_C45_ROAD, "Namco C45 Road", tag, owner, clock, "namco_c45_road", __FILE__), device_gfx_interface(mconfig, *this, gfxinfo), device_memory_interface(mconfig, *this), diff --git a/src/mame/video/c45.h b/src/mame/video/c45.h index 1e0d2e29022..665d87357d9 100644 --- a/src/mame/video/c45.h +++ b/src/mame/video/c45.h @@ -34,7 +34,7 @@ class namco_c45_road_device : public device_t, public device_gfx_interface, publ public: // construction/destruction - namco_c45_road_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_c45_road_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_ADDRESS_MAP(map, 16); diff --git a/src/mame/video/chihiro.cpp b/src/mame/video/chihiro.cpp index 397461fc7f6..d31e2150e4f 100644 --- a/src/mame/video/chihiro.cpp +++ b/src/mame/video/chihiro.cpp @@ -2655,7 +2655,7 @@ int nv2a_renderer::geforce_exec_method(address_space & space, UINT32 chanel, UIN } } else { - machine().logerror("Unsupported primitive %d for method 0x1810\n", (int)primitive_type); + machine().logerror("Unsupported primitive %d for method 0x1810\n", primitive_type); } countlen--; } @@ -2800,7 +2800,7 @@ int nv2a_renderer::geforce_exec_method(address_space & space, UINT32 chanel, UIN } } else { - machine().logerror("Unsupported primitive %d for method 0x1800/8\n", (int)primitive_type); + machine().logerror("Unsupported primitive %d for method 0x1800/8\n", primitive_type); countlen = 0; } while (countlen > 0) { @@ -2978,7 +2978,7 @@ int nv2a_renderer::geforce_exec_method(address_space & space, UINT32 chanel, UIN } } else { - machine().logerror("Unsupported primitive %d for method 0x1818\n", (int)primitive_type); + machine().logerror("Unsupported primitive %d for method 0x1818\n", primitive_type); countlen = 0; } } @@ -3108,7 +3108,7 @@ int nv2a_renderer::geforce_exec_method(address_space & space, UINT32 chanel, UIN bytespixel_rendertarget = 1; break; default: - machine().logerror("Unknown render target color format %d\n\r", (int)colorformat_rendertarget); + machine().logerror("Unknown render target color format %d\n\r", colorformat_rendertarget); bytespixel_rendertarget = 4; break; } diff --git a/src/mame/video/crt.cpp b/src/mame/video/crt.cpp index bcb42d0100d..524696f7e17 100644 --- a/src/mame/video/crt.cpp +++ b/src/mame/video/crt.cpp @@ -49,7 +49,7 @@ const device_type CRT = &device_creator; // crt_device - constructor //------------------------------------------------- -crt_device::crt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +crt_device::crt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CRT, "CRT Video", tag, owner, clock, "crt", __FILE__), m_list(nullptr), m_list_head(nullptr), diff --git a/src/mame/video/crt.h b/src/mame/video/crt.h index adc67e8f5ce..41eb10da2a1 100644 --- a/src/mame/video/crt.h +++ b/src/mame/video/crt.h @@ -46,7 +46,7 @@ struct crt_point class crt_device : public device_t { public: - crt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + crt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~crt_device() { } static void set_num_levels(device_t &device, int levels) { downcast(device).m_num_intensity_levels = levels; } diff --git a/src/mame/video/decbac06.cpp b/src/mame/video/decbac06.cpp index 2c38eba733c..c974c4adf13 100644 --- a/src/mame/video/decbac06.cpp +++ b/src/mame/video/decbac06.cpp @@ -67,7 +67,7 @@ Priority word (Midres): const device_type DECO_BAC06 = &device_creator; -deco_bac06_device::deco_bac06_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +deco_bac06_device::deco_bac06_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECO_BAC06, "DECO BAC06 Tilemap", tag, owner, clock, "deco_bac06", __FILE__), m_pf_data(nullptr), m_pf_rowscroll(nullptr), @@ -98,7 +98,7 @@ deco_bac06_device::deco_bac06_device(const machine_config &mconfig, std::string // gfx decoder //------------------------------------------------- -void deco_bac06_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void deco_bac06_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } diff --git a/src/mame/video/decbac06.h b/src/mame/video/decbac06.h index ed11db5ef37..51a991636fa 100644 --- a/src/mame/video/decbac06.h +++ b/src/mame/video/decbac06.h @@ -15,10 +15,10 @@ class deco_bac06_device : public device_t { public: - deco_bac06_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + deco_bac06_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void set_gfx_region_wide(device_t &device, int region8x8, int region16x16, int wide); std::unique_ptr m_pf_data; diff --git a/src/mame/video/deckarn.cpp b/src/mame/video/deckarn.cpp index 87238087c7b..795bf5894d6 100644 --- a/src/mame/video/deckarn.cpp +++ b/src/mame/video/deckarn.cpp @@ -14,7 +14,7 @@ void deco_karnovsprites_device::set_gfx_region(device_t &device, int region) const device_type DECO_KARNOVSPRITES = &device_creator; -deco_karnovsprites_device::deco_karnovsprites_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +deco_karnovsprites_device::deco_karnovsprites_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECO_KARNOVSPRITES, "DECO Karnov Sprites", tag, owner, clock, "deco_karnovsprites", __FILE__), m_gfxregion(0), m_gfxdecode(*this), @@ -27,7 +27,7 @@ deco_karnovsprites_device::deco_karnovsprites_device(const machine_config &mconf // gfx decoder //------------------------------------------------- -void deco_karnovsprites_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void deco_karnovsprites_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -118,7 +118,7 @@ void deco_karnovsprites_device::draw_sprites( bitmap_ind16 &bitmap, const rectan // palette device //------------------------------------------------- -void deco_karnovsprites_device::static_set_palette_tag(device_t &device, std::string tag) +void deco_karnovsprites_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/deckarn.h b/src/mame/video/deckarn.h index a25da8f07ef..560e0f87ba0 100644 --- a/src/mame/video/deckarn.h +++ b/src/mame/video/deckarn.h @@ -5,13 +5,13 @@ class deco_karnovsprites_device : public device_t { public: - deco_karnovsprites_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + deco_karnovsprites_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void set_gfxregion(int region) { m_gfxregion = region; }; void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16* spriteram, int size, int priority ); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_gfx_region(device_t &device, int region); protected: diff --git a/src/mame/video/decmxc06.cpp b/src/mame/video/decmxc06.cpp index cb396dd5245..888d5ae6ada 100644 --- a/src/mame/video/decmxc06.cpp +++ b/src/mame/video/decmxc06.cpp @@ -49,7 +49,7 @@ void deco_mxc06_device::set_gfx_region(device_t &device, int region) const device_type DECO_MXC06 = &device_creator; -deco_mxc06_device::deco_mxc06_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +deco_mxc06_device::deco_mxc06_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECO_MXC06, "DECO MXC06 Sprite", tag, owner, clock, "deco_mxc06", __FILE__), device_video_interface(mconfig, *this), m_gfxregion(0), @@ -64,7 +64,7 @@ deco_mxc06_device::deco_mxc06_device(const machine_config &mconfig, std::string // gfx decoder //------------------------------------------------- -void deco_mxc06_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void deco_mxc06_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -229,7 +229,7 @@ void deco_mxc06_device::device_reset() // palette device //------------------------------------------------- -void deco_mxc06_device::static_set_palette_tag(device_t &device, std::string tag) +void deco_mxc06_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/decmxc06.h b/src/mame/video/decmxc06.h index 6c5753fe419..a4b58a73195 100644 --- a/src/mame/video/decmxc06.h +++ b/src/mame/video/decmxc06.h @@ -7,11 +7,11 @@ class deco_mxc06_device : public device_t, public device_video_interface { public: - deco_mxc06_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + deco_mxc06_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_gfx_region(device_t &device, int region); static void set_ram_size(device_t &device, int size) { diff --git a/src/mame/video/deco16ic.cpp b/src/mame/video/deco16ic.cpp index d97f79d6cc2..fa5b1caba0a 100644 --- a/src/mame/video/deco16ic.cpp +++ b/src/mame/video/deco16ic.cpp @@ -177,7 +177,7 @@ Rowscroll style: const device_type DECO16IC = &device_creator; -deco16ic_device::deco16ic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +deco16ic_device::deco16ic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECO16IC, "DECO 55 / 56 / 74 / 141 IC", tag, owner, clock, "deco16ic", __FILE__), device_video_interface(mconfig, *this), m_pf1_data(nullptr), @@ -212,7 +212,7 @@ deco16ic_device::deco16ic_device(const machine_config &mconfig, std::string tag, // gfx decoder //------------------------------------------------- -void deco16ic_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void deco16ic_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -949,7 +949,7 @@ void deco16ic_device::tilemap_12_combine_draw(screen_device &screen, bitmap_rgb3 // palette device //------------------------------------------------- -void deco16ic_device::static_set_palette_tag(device_t &device, std::string tag) +void deco16ic_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/deco16ic.h b/src/mame/video/deco16ic.h index 2fc467123b2..5e45336c093 100644 --- a/src/mame/video/deco16ic.h +++ b/src/mame/video/deco16ic.h @@ -25,12 +25,12 @@ class deco16ic_device : public device_t, public device_video_interface { public: - deco16ic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + deco16ic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~deco16ic_device() {} // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_bank1_callback(device_t &device, deco16_bank_cb_delegate callback) { downcast(device).m_bank1_cb = callback; } static void set_bank2_callback(device_t &device, deco16_bank_cb_delegate callback) { downcast(device).m_bank2_cb = callback; } static void set_split(device_t &device, int split) { downcast(device).m_split = split; } diff --git a/src/mame/video/deco_zoomspr.cpp b/src/mame/video/deco_zoomspr.cpp index 26c6a3d5779..e1b5cfdb949 100644 --- a/src/mame/video/deco_zoomspr.cpp +++ b/src/mame/video/deco_zoomspr.cpp @@ -15,7 +15,7 @@ const device_type DECO_ZOOMSPR = &device_creator; -deco_zoomspr_device::deco_zoomspr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +deco_zoomspr_device::deco_zoomspr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECO_ZOOMSPR, "DECO Zooming Sprites", tag, owner, clock, "deco_zoomspr", __FILE__), m_palette(*this), m_gfxdecode(*this) @@ -27,7 +27,7 @@ deco_zoomspr_device::deco_zoomspr_device(const machine_config &mconfig, std::str // palette device //------------------------------------------------- -void deco_zoomspr_device::static_set_palette_tag(device_t &device, std::string tag) +void deco_zoomspr_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } @@ -37,7 +37,7 @@ void deco_zoomspr_device::static_set_palette_tag(device_t &device, std::string t // gfx decoder //------------------------------------------------- -void deco_zoomspr_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void deco_zoomspr_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } diff --git a/src/mame/video/deco_zoomspr.h b/src/mame/video/deco_zoomspr.h index aa758428f33..4283f3aa62e 100644 --- a/src/mame/video/deco_zoomspr.h +++ b/src/mame/video/deco_zoomspr.h @@ -5,10 +5,10 @@ class deco_zoomspr_device : public device_t { public: - deco_zoomspr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + deco_zoomspr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void static_set_palette_tag(device_t &device, std::string tag); - static void static_set_gfxdecode_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); void dragngun_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect, const UINT32 *spritedata, UINT32* dragngun_sprite_layout_0_ram, UINT32* dragngun_sprite_layout_1_ram, UINT32* dragngun_sprite_lookup_0_ram, UINT32* dragngun_sprite_lookup_1_ram, UINT32 dragngun_sprite_ctrl, bitmap_ind8 &pri_bitmap, bitmap_rgb32 &temp_bitmap); diff --git a/src/mame/video/decocomn.cpp b/src/mame/video/decocomn.cpp index 38a8817d6bf..f8bbb7f32bc 100644 --- a/src/mame/video/decocomn.cpp +++ b/src/mame/video/decocomn.cpp @@ -12,7 +12,7 @@ const device_type DECOCOMN = &device_creator; -decocomn_device::decocomn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +decocomn_device::decocomn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECOCOMN, "DECO Common Video Functions", tag, owner, clock, "decocomn", __FILE__), device_video_interface(mconfig, *this), m_dirty_palette(nullptr), @@ -27,7 +27,7 @@ decocomn_device::decocomn_device(const machine_config &mconfig, std::string tag, // palette device //------------------------------------------------- -void decocomn_device::static_set_palette_tag(device_t &device, std::string tag) +void decocomn_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/decocomn.h b/src/mame/video/decocomn.h index d7ea53956ec..b2c758c9d60 100644 --- a/src/mame/video/decocomn.h +++ b/src/mame/video/decocomn.h @@ -20,11 +20,11 @@ class decocomn_device : public device_t, public device_video_interface { public: - decocomn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + decocomn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~decocomn_device() {} // static configuration - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); DECLARE_WRITE16_MEMBER( nonbuffered_palette_w ); DECLARE_WRITE16_MEMBER( buffered_palette_w ); diff --git a/src/mame/video/decodmd1.cpp b/src/mame/video/decodmd1.cpp index d678435c28a..64a853fe61f 100644 --- a/src/mame/video/decodmd1.cpp +++ b/src/mame/video/decodmd1.cpp @@ -230,7 +230,7 @@ machine_config_constructor decodmd_type1_device::device_mconfig_additions() cons return MACHINE_CONFIG_NAME( decodmd1 ); } -decodmd_type1_device::decodmd_type1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +decodmd_type1_device::decodmd_type1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECODMD1, "Data East Pinball Dot Matrix Display Type 1", tag, owner, clock, "decodmd1", __FILE__), m_cpu(*this,"dmdcpu"), m_rombank1(*this,"dmdbank1"), @@ -266,7 +266,7 @@ void decodmd_type1_device::device_reset() m_frameswap = false; } -void decodmd_type1_device::static_set_gfxregion(device_t &device, std::string tag) +void decodmd_type1_device::static_set_gfxregion(device_t &device, const char *tag) { decodmd_type1_device &cpuboard = downcast(device); cpuboard.m_gfxtag = tag; diff --git a/src/mame/video/decodmd1.h b/src/mame/video/decodmd1.h index 7137cc2cf59..62247b91a82 100644 --- a/src/mame/video/decodmd1.h +++ b/src/mame/video/decodmd1.h @@ -22,7 +22,7 @@ class decodmd_type1_device : public device_t { public: - decodmd_type1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + decodmd_type1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_cpu; required_memory_bank m_rombank1; required_memory_bank m_rombank2; @@ -42,7 +42,7 @@ public: DECLARE_WRITE8_MEMBER(dmd_port_w); TIMER_DEVICE_CALLBACK_MEMBER(dmd_nmi); - static void static_set_gfxregion(device_t &device, std::string tag); + static void static_set_gfxregion(device_t &device, const char *tag); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -68,7 +68,7 @@ private: UINT32 m_pixels[0x200]; UINT8 m_busy_lines; UINT32 m_prevrow; - std::string m_gfxtag; + const char* m_gfxtag; void output_data(); void set_busy(UINT8 input, UINT8 val); diff --git a/src/mame/video/decodmd2.cpp b/src/mame/video/decodmd2.cpp index 02ab6f3d45a..48863b1c0fc 100644 --- a/src/mame/video/decodmd2.cpp +++ b/src/mame/video/decodmd2.cpp @@ -158,7 +158,7 @@ machine_config_constructor decodmd_type2_device::device_mconfig_additions() cons return MACHINE_CONFIG_NAME( decodmd2 ); } -decodmd_type2_device::decodmd_type2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +decodmd_type2_device::decodmd_type2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECODMD2, "Data East Pinball Dot Matrix Display Type 2", tag, owner, clock, "decodmd2", __FILE__), m_cpu(*this,"dmdcpu"), m_mc6845(*this,"dmd6845"), @@ -190,7 +190,7 @@ void decodmd_type2_device::device_reset() m_busy = false; } -void decodmd_type2_device::static_set_gfxregion(device_t &device, std::string tag) +void decodmd_type2_device::static_set_gfxregion(device_t &device, const char *tag) { decodmd_type2_device &cpuboard = downcast(device); cpuboard.m_gfxtag = tag; diff --git a/src/mame/video/decodmd2.h b/src/mame/video/decodmd2.h index 46d2092ef9b..1a1fb990c67 100644 --- a/src/mame/video/decodmd2.h +++ b/src/mame/video/decodmd2.h @@ -21,7 +21,7 @@ class decodmd_type2_device : public device_t { public: - decodmd_type2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + decodmd_type2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_cpu; required_device m_mc6845; required_memory_bank m_rombank1; @@ -44,7 +44,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(dmd_firq); MC6845_UPDATE_ROW(crtc_update_row); - static void static_set_gfxregion(device_t &device, std::string tag); + static void static_set_gfxregion(device_t &device, const char *tag); protected: virtual machine_config_constructor device_mconfig_additions() const override; @@ -59,7 +59,7 @@ private: UINT8 m_ctrl; UINT8 m_busy; UINT8 m_command; - std::string m_gfxtag; + const char* m_gfxtag; }; extern const device_type DECODMD2; diff --git a/src/mame/video/decodmd3.cpp b/src/mame/video/decodmd3.cpp index 68175003de9..18b41d4ce71 100644 --- a/src/mame/video/decodmd3.cpp +++ b/src/mame/video/decodmd3.cpp @@ -159,7 +159,7 @@ machine_config_constructor decodmd_type3_device::device_mconfig_additions() cons return MACHINE_CONFIG_NAME( decodmd3 ); } -decodmd_type3_device::decodmd_type3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +decodmd_type3_device::decodmd_type3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECODMD3, "Data East Pinball Dot Matrix Display Type 3", tag, owner, clock, "decodmd3", __FILE__), m_cpu(*this,"dmdcpu"), m_mc6845(*this,"dmd6845"), @@ -186,7 +186,7 @@ void decodmd_type3_device::device_reset() m_rombank->set_entry(0); } -void decodmd_type3_device::static_set_gfxregion(device_t &device, std::string tag) +void decodmd_type3_device::static_set_gfxregion(device_t &device, const char *tag) { decodmd_type3_device &cpuboard = downcast(device); cpuboard.m_gfxtag = tag; diff --git a/src/mame/video/decodmd3.h b/src/mame/video/decodmd3.h index e9ecde4c25d..949be275b49 100644 --- a/src/mame/video/decodmd3.h +++ b/src/mame/video/decodmd3.h @@ -19,7 +19,7 @@ class decodmd_type3_device : public device_t { public: - decodmd_type3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + decodmd_type3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); required_device m_cpu; required_device m_mc6845; required_device m_ram; @@ -38,7 +38,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(dmd_irq); MC6845_UPDATE_ROW(crtc_update_row); - static void static_set_gfxregion(device_t &device, std::string tag); + static void static_set_gfxregion(device_t &device, const char *tag); memory_region* m_rom; @@ -56,7 +56,7 @@ private: UINT8 m_busy; UINT8 m_command; - std::string m_gfxtag; + const char* m_gfxtag; }; extern const device_type DECODMD3; diff --git a/src/mame/video/decospr.cpp b/src/mame/video/decospr.cpp index ae9dc78fb49..304fba4a87b 100644 --- a/src/mame/video/decospr.cpp +++ b/src/mame/video/decospr.cpp @@ -147,7 +147,7 @@ void decospr_device::set_gfx_region(device_t &device, int gfxregion) const device_type DECO_SPRITE = &device_creator; -decospr_device::decospr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +decospr_device::decospr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DECO_SPRITE, "DECO 52 Sprite", tag, owner, clock, "decospr", __FILE__), device_video_interface(mconfig, *this), m_gfxregion(0), @@ -169,7 +169,7 @@ decospr_device::decospr_device(const machine_config &mconfig, std::string tag, d // gfx decoder //------------------------------------------------- -void decospr_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void decospr_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -629,7 +629,7 @@ void decospr_device::inefficient_copy_sprite_bitmap(bitmap_rgb32 &bitmap, const // palette device //------------------------------------------------- -void decospr_device::static_set_palette_tag(device_t &device, std::string tag) +void decospr_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/decospr.h b/src/mame/video/decospr.h index 58b16aa0beb..9679a22acc5 100644 --- a/src/mame/video/decospr.h +++ b/src/mame/video/decospr.h @@ -14,11 +14,11 @@ class decospr_device : public device_t, public device_video_interface { public: - decospr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + decospr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_gfx_region(device_t &device, int gfxregion); static void set_pri_callback(device_t &device, decospr_pri_cb_delegate callback) { downcast(device).m_pri_cb = callback; } static void set_col_callback(device_t &device, decospr_col_cb_delegate callback) { downcast(device).m_col_cb = callback; } diff --git a/src/mame/video/excellent_spr.cpp b/src/mame/video/excellent_spr.cpp index 68c611b346a..f58f80f69d6 100644 --- a/src/mame/video/excellent_spr.cpp +++ b/src/mame/video/excellent_spr.cpp @@ -21,7 +21,7 @@ const device_type EXCELLENT_SPRITE = &device_creator; -excellent_spr_device::excellent_spr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +excellent_spr_device::excellent_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, EXCELLENT_SPRITE, "Excellent 8-bit Sprite", tag, owner, clock, "excellent_spr", __FILE__), device_video_interface(mconfig, *this) { diff --git a/src/mame/video/excellent_spr.h b/src/mame/video/excellent_spr.h index a6c554cfcc9..6f713eac13d 100644 --- a/src/mame/video/excellent_spr.h +++ b/src/mame/video/excellent_spr.h @@ -5,7 +5,7 @@ class excellent_spr_device : public device_t, public device_video_interface { public: - excellent_spr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + excellent_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); diff --git a/src/mame/video/fuukifg.cpp b/src/mame/video/fuukifg.cpp index c76ea6ebece..bf891fc8201 100644 --- a/src/mame/video/fuukifg.cpp +++ b/src/mame/video/fuukifg.cpp @@ -8,14 +8,14 @@ const device_type FUUKI_VIDEO = &device_creator; -fuukivid_device::fuukivid_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +fuukivid_device::fuukivid_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, FUUKI_VIDEO, "Fuuki Video", tag, owner, clock, "fuukivid", __FILE__), device_video_interface(mconfig, *this), m_gfxdecode(*this) { } -void fuukivid_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void fuukivid_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } diff --git a/src/mame/video/fuukifg.h b/src/mame/video/fuukifg.h index c2b4d14056d..41668672abf 100644 --- a/src/mame/video/fuukifg.h +++ b/src/mame/video/fuukifg.h @@ -7,10 +7,10 @@ class fuukivid_device : public device_t, public device_video_interface { public: - fuukivid_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + fuukivid_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flip_screen, UINT32* tilebank); std::unique_ptr m_sprram; diff --git a/src/mame/video/gb_lcd.cpp b/src/mame/video/gb_lcd.cpp index a35573b387e..c7560b485bf 100644 --- a/src/mame/video/gb_lcd.cpp +++ b/src/mame/video/gb_lcd.cpp @@ -180,31 +180,31 @@ const device_type GB_LCD_CGB = &device_creator; -gb_lcd_device::gb_lcd_device(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_lcd_device::gb_lcd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), m_sgb_border_hack(0) { } -gb_lcd_device::gb_lcd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gb_lcd_device::gb_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GB_LCD_DMG, "DMG LCD", tag, owner, clock, "dmg_lcd", __FILE__), device_video_interface(mconfig, *this), m_sgb_border_hack(0) { } -mgb_lcd_device::mgb_lcd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mgb_lcd_device::mgb_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_lcd_device(mconfig, GB_LCD_MGB, "MGB LCD", tag, owner, clock, "mgb_lcd", __FILE__) { } -sgb_lcd_device::sgb_lcd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sgb_lcd_device::sgb_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_lcd_device(mconfig, GB_LCD_SGB, "SGB LCD", tag, owner, clock, "sgb_lcd", __FILE__) { } -cgb_lcd_device::cgb_lcd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cgb_lcd_device::cgb_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gb_lcd_device(mconfig, GB_LCD_CGB, "CGB LCD", tag, owner, clock, "cgb_lcd", __FILE__) { } diff --git a/src/mame/video/gb_lcd.h b/src/mame/video/gb_lcd.h index 15876138b44..4e512e3da79 100644 --- a/src/mame/video/gb_lcd.h +++ b/src/mame/video/gb_lcd.h @@ -33,8 +33,8 @@ class gb_lcd_device : public device_t, public device_video_interface { public: - gb_lcd_device(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_lcd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gb_lcd_device(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_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -141,7 +141,7 @@ protected: class mgb_lcd_device : public gb_lcd_device { public: - mgb_lcd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mgb_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: @@ -153,7 +153,7 @@ protected: class sgb_lcd_device : public gb_lcd_device { public: - sgb_lcd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sgb_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void sgb_io_write_pal(int offs, UINT8 *data); @@ -172,7 +172,7 @@ protected: class cgb_lcd_device : public gb_lcd_device { public: - cgb_lcd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cgb_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_READ8_MEMBER(video_r) override; virtual DECLARE_WRITE8_MEMBER(video_w) override; diff --git a/src/mame/video/gic.cpp b/src/mame/video/gic.cpp index b02bee5f756..6adcea87227 100644 --- a/src/mame/video/gic.cpp +++ b/src/mame/video/gic.cpp @@ -80,7 +80,7 @@ ROM_END // gic_device - constructor //------------------------------------------------- -gic_device::gic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gic_device::gic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GIC, "GIC", tag, owner, clock, "gic", __FILE__) , device_sound_interface(mconfig, *this) , device_video_interface(mconfig, *this) @@ -93,7 +93,7 @@ gic_device::gic_device(const machine_config &mconfig, std::string tag, device_t } -gic_device::gic_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) +gic_device::gic_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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , device_sound_interface(mconfig, *this) , device_video_interface(mconfig, *this) diff --git a/src/mame/video/gic.h b/src/mame/video/gic.h index d51640a9d78..3babca9fec8 100644 --- a/src/mame/video/gic.h +++ b/src/mame/video/gic.h @@ -54,8 +54,8 @@ class gic_device : public device_t { public: // construction/destruction - gic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - gic_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); + gic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gic_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); // static configuration helpers static void set_screen_tag(device_t &device, const char *screen_tag) { downcast(device).m_screen_tag = screen_tag; } diff --git a/src/mame/video/gime.cpp b/src/mame/video/gime.cpp index 621a63beb60..a98cd3d83cd 100644 --- a/src/mame/video/gime.cpp +++ b/src/mame/video/gime.cpp @@ -108,11 +108,14 @@ // ctor //------------------------------------------------- -gime_base_device::gime_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, const char *shortname, const char *source) +gime_base_device::gime_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, const char *shortname, const char *source) : mc6847_friend_device(mconfig, type, name, tag, owner, clock, fontdata, true, 263, 25+192+26+3, false, shortname, source), m_write_irq(*this), m_write_firq(*this), - m_read_floating_bus(*this) + m_read_floating_bus(*this), + m_maincpu_tag(nullptr), + m_ram_tag(nullptr), + m_ext_tag(nullptr) { } @@ -2057,7 +2060,7 @@ const device_type GIME_PAL = &device_creator; // gime_ntsc_device //------------------------------------------------- -gime_ntsc_device::gime_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gime_ntsc_device::gime_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gime_base_device(mconfig, GIME_NTSC, "GIME_NTSC", tag, owner, clock, ntsc_round_fontdata8x12, "gime_ntsc", __FILE__) { } @@ -2068,7 +2071,7 @@ gime_ntsc_device::gime_ntsc_device(const machine_config &mconfig, std::string ta // gime_pal_device //------------------------------------------------- -gime_pal_device::gime_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gime_pal_device::gime_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gime_base_device(mconfig, GIME_PAL, "GIME_PAL", tag, owner, clock, pal_round_fontdata8x12, "gime_pal", __FILE__) { } diff --git a/src/mame/video/gime.h b/src/mame/video/gime.h index 4db783fc1aa..b73c64440e7 100644 --- a/src/mame/video/gime.h +++ b/src/mame/video/gime.h @@ -58,9 +58,9 @@ public: template static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_irq.set_callback(object); } template static devcb_base &set_firq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_firq.set_callback(object); } template static devcb_base &set_floating_bus_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_floating_bus.set_callback(object); } - static void set_maincpu_tag(device_t &device, std::string tag) { downcast(device).m_maincpu_tag = tag; } - static void set_ram_tag(device_t &device, std::string tag) { downcast(device).m_ram_tag = tag; } - static void set_ext_tag(device_t &device, std::string tag) { downcast(device).m_ext_tag = tag; } + static void set_maincpu_tag(device_t &device, const char *tag) { downcast(device).m_maincpu_tag = tag; } + static void set_ram_tag(device_t &device, const char *tag) { downcast(device).m_ram_tag = tag; } + static void set_ext_tag(device_t &device, const char *tag) { downcast(device).m_ext_tag = tag; } // read/write DECLARE_READ8_MEMBER( read ) { return read(offset); } @@ -91,7 +91,7 @@ public: void set_il2(bool value) { set_interrupt_value(INTERRUPT_EI2, value); } protected: - gime_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, const char *shortname, const char *source); + gime_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, const char *shortname, const char *source); // device-level overrides virtual void device_start(void) override; @@ -202,9 +202,9 @@ private: pixel_t m_rgb_palette[64]; UINT8 m_dummy_bank[0x2000]; - std::string m_maincpu_tag; /* tag of main CPU */ - std::string m_ram_tag; /* tag of RAM device */ - std::string m_ext_tag; /* tag of expansion device */ + const char *m_maincpu_tag; /* tag of main CPU */ + const char *m_ram_tag; /* tag of RAM device */ + const char *m_ext_tag; /* tag of expansion device */ // timer constants static const device_timer_id TIMER_FRAME = 0; @@ -295,13 +295,13 @@ private: class gime_ntsc_device : public gime_base_device { public: - gime_ntsc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gime_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class gime_pal_device : public gime_base_device { public: - gime_pal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gime_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type GIME_NTSC; diff --git a/src/mame/video/gp9001.cpp b/src/mame/video/gp9001.cpp index 5c3850d5ae2..31d939db1dd 100644 --- a/src/mame/video/gp9001.cpp +++ b/src/mame/video/gp9001.cpp @@ -213,7 +213,7 @@ GFXDECODE_END const device_type GP9001_VDP = &device_creator; -gp9001vdp_device::gp9001vdp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gp9001vdp_device::gp9001vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GP9001_VDP, "GP9001 VDP", tag, owner, clock, "gp9001vdp", __FILE__), device_gfx_interface(mconfig, *this, gfxinfo), device_video_interface(mconfig, *this), diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h index 09873810181..f7dcebe491c 100644 --- a/src/mame/video/gp9001.h +++ b/src/mame/video/gp9001.h @@ -39,7 +39,7 @@ class gp9001vdp_device : public device_t, DECLARE_GFXDECODE_MEMBER(gfxinfo); public: - gp9001vdp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gp9001vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); UINT16 gp9001_voffs; UINT16 gp9001_scroll_reg; diff --git a/src/mame/video/gtia.cpp b/src/mame/video/gtia.cpp index 47cc4ea41ae..2d9e0b08378 100644 --- a/src/mame/video/gtia.cpp +++ b/src/mame/video/gtia.cpp @@ -117,7 +117,7 @@ const device_type ATARI_GTIA = &device_creator; // upd7220_device - constructor //------------------------------------------------- -gtia_device::gtia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +gtia_device::gtia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ATARI_GTIA, "Atari GTIA", tag, owner, clock, "gtia", __FILE__), m_read_cb(*this), m_write_cb(*this) diff --git a/src/mame/video/gtia.h b/src/mame/video/gtia.h index 77f857b566d..4504175cb46 100644 --- a/src/mame/video/gtia.h +++ b/src/mame/video/gtia.h @@ -128,7 +128,7 @@ class gtia_device : public device_t { public: // construction/destruction - gtia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gtia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_read_callback(device_t &device, _Object object) { return downcast(device).m_read_cb.set_callback(object); } template static devcb_base &set_write_callback(device_t &device, _Object object) { return downcast(device).m_write_cb.set_callback(object); } diff --git a/src/mame/video/igs017_igs031.cpp b/src/mame/video/igs017_igs031.cpp index e67f9dc92b1..8e8993e0fa7 100644 --- a/src/mame/video/igs017_igs031.cpp +++ b/src/mame/video/igs017_igs031.cpp @@ -75,7 +75,7 @@ GFXDECODE_END const device_type IGS017_IGS031 = &device_creator; -igs017_igs031_device::igs017_igs031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +igs017_igs031_device::igs017_igs031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IGS017_IGS031, "IGS017_IGS031", tag, owner, clock, "igs017_igs031", __FILE__), device_gfx_interface(mconfig, *this, gfxinfo), device_video_interface(mconfig, *this), diff --git a/src/mame/video/igs017_igs031.h b/src/mame/video/igs017_igs031.h index d264c24bd13..4c3b2c66ed3 100644 --- a/src/mame/video/igs017_igs031.h +++ b/src/mame/video/igs017_igs031.h @@ -20,7 +20,7 @@ class igs017_igs031_device : public device_t, DECLARE_GFXDECODE_MEMBER(gfxinfo); public: - igs017_igs031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + igs017_igs031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_palette_scramble_cb(device_t &device,igs017_igs031_palette_scramble_delegate newtilecb); diff --git a/src/mame/video/itech32.cpp b/src/mame/video/itech32.cpp index ed857dea91f..3c882ac757b 100644 --- a/src/mame/video/itech32.cpp +++ b/src/mame/video/itech32.cpp @@ -321,14 +321,14 @@ WRITE16_MEMBER(itech32_state::bloodstm_paletteram_w) * *************************************/ -void itech32_state::logblit(std::string tag) +void itech32_state::logblit(const char *tag) { if (!machine().input().code_pressed(KEYCODE_L)) return; if (m_is_drivedge && VIDEO_TRANSFER_FLAGS == 0x5490) { /* polygon drawing */ - logerror("%s: e=%d%d f=%04x s=(%03x-%03x,%03x) w=%03x h=%03x b=%02x%04x c=%02x%02x ss=%04x,%04x ds=%04x,%04x ls=%04x%04x rs=%04x%04x u80=%04x", tag.c_str(), + logerror("%s: e=%d%d f=%04x s=(%03x-%03x,%03x) w=%03x h=%03x b=%02x%04x c=%02x%02x ss=%04x,%04x ds=%04x,%04x ls=%04x%04x rs=%04x%04x u80=%04x", tag, m_enable_latch[0], m_enable_latch[1], VIDEO_TRANSFER_FLAGS, VIDEO_TRANSFER_X, VIDEO_RIGHTCLIP, VIDEO_TRANSFER_Y, VIDEO_TRANSFER_WIDTH, VIDEO_TRANSFER_HEIGHT, @@ -344,7 +344,7 @@ void itech32_state::logblit(std::string tag) m_video[0x1a/2] == 0x000 && m_video[0x1c/2] == 0x100 && m_video[0x1e/2] == 0x000 && m_video[0x20/2] == 0x000) { - logerror("%s: e=%d%d f=%04x c=%02x%02x %02x%04x -> (%03x,%03x) %3dx%3dc=(%03x,%03x)-(%03x,%03x)", tag.c_str(), + logerror("%s: e=%d%d f=%04x c=%02x%02x %02x%04x -> (%03x,%03x) %3dx%3dc=(%03x,%03x)-(%03x,%03x)", tag, m_enable_latch[0], m_enable_latch[1], VIDEO_TRANSFER_FLAGS, m_color_latch[0] >> 8, m_color_latch[1] >> 8, @@ -355,7 +355,7 @@ void itech32_state::logblit(std::string tag) } else { - logerror("%s: e=%d%d f=%04x c=%02x%02x %02x%04x -> (%03x,%03x) %3dx%3d c=(%03x,%03x)-(%03x,%03x) s=%04x %04x %04x %04x %04x %04x", tag.c_str(), + logerror("%s: e=%d%d f=%04x c=%02x%02x %02x%04x -> (%03x,%03x) %3dx%3d c=(%03x,%03x)-(%03x,%03x) s=%04x %04x %04x %04x %04x %04x", tag, m_enable_latch[0], m_enable_latch[1], VIDEO_TRANSFER_FLAGS, m_color_latch[0] >> 8, m_color_latch[1] >> 8, diff --git a/src/mame/video/jalblend.cpp b/src/mame/video/jalblend.cpp index d07eb4bb843..93359334934 100644 --- a/src/mame/video/jalblend.cpp +++ b/src/mame/video/jalblend.cpp @@ -24,7 +24,7 @@ const device_type JALECO_BLEND = &device_creator; -jaleco_blend_device::jaleco_blend_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +jaleco_blend_device::jaleco_blend_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, JALECO_BLEND, "Jaleco Blending Device", tag, owner, clock, "jaleco_blend", __FILE__), m_table(nullptr) { diff --git a/src/mame/video/jalblend.h b/src/mame/video/jalblend.h index 1620183f185..721bf320676 100644 --- a/src/mame/video/jalblend.h +++ b/src/mame/video/jalblend.h @@ -3,7 +3,7 @@ class jaleco_blend_device : public device_t { public: - jaleco_blend_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + jaleco_blend_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~jaleco_blend_device() {} void set(int color, UINT8 val); diff --git a/src/mame/video/k001005.cpp b/src/mame/video/k001005.cpp index 12071cb5589..fad84787317 100644 --- a/src/mame/video/k001005.cpp +++ b/src/mame/video/k001005.cpp @@ -1170,7 +1170,7 @@ void k001005_renderer::draw(bitmap_rgb32 &bitmap, const rectangle &cliprect) const device_type K001005 = &device_creator; -k001005_device::k001005_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k001005_device::k001005_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K001005, "K001005 Polygon Renderer", tag, owner, clock, "k001005", __FILE__), device_video_interface(mconfig, *this), m_k001006(nullptr), @@ -1457,7 +1457,7 @@ void k001005_device::draw( bitmap_rgb32 &bitmap, const rectangle &cliprect ) m_renderer->draw(bitmap, cliprect); } -void k001005_device::set_texel_chip(device_t &device, std::string tag) +void k001005_device::set_texel_chip(device_t &device, const char *tag) { downcast(device).m_k001006_tag = tag; } diff --git a/src/mame/video/k001005.h b/src/mame/video/k001005.h index c3629819c70..b863ffdc8de 100644 --- a/src/mame/video/k001005.h +++ b/src/mame/video/k001005.h @@ -103,10 +103,10 @@ class k001005_device : public device_t, public device_video_interface { public: - k001005_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k001005_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k001005_device() {} - static void set_texel_chip(device_t &device, std::string tag); + static void set_texel_chip(device_t &device, const char *tag); void draw(bitmap_rgb32 &bitmap, const rectangle &cliprect); void swap_buffers(); @@ -124,7 +124,7 @@ protected: private: // internal state device_t *m_k001006; - std::string m_k001006_tag; + const char *m_k001006_tag; std::unique_ptr m_ram[2]; std::unique_ptr m_fifo; diff --git a/src/mame/video/k001006.cpp b/src/mame/video/k001006.cpp index f5fa90ac859..1c60d4b56b0 100644 --- a/src/mame/video/k001006.cpp +++ b/src/mame/video/k001006.cpp @@ -14,14 +14,13 @@ const device_type K001006 = &device_creator; -k001006_device::k001006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k001006_device::k001006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K001006, "K001006 Texel Unit", tag, owner, clock, "k001006", __FILE__), m_pal_ram(nullptr), m_unknown_ram(nullptr), m_addr(0), m_device_sel(0), - m_palette(nullptr), - m_gfxrom(nullptr), + m_palette(nullptr), m_gfx_region(nullptr), m_gfxrom(nullptr), m_tex_layout(0) { } diff --git a/src/mame/video/k001006.h b/src/mame/video/k001006.h index 5368a4d2cbd..6b3b23e41c2 100644 --- a/src/mame/video/k001006.h +++ b/src/mame/video/k001006.h @@ -9,11 +9,11 @@ class k001006_device : public device_t { public: - k001006_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k001006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k001006_device() {} // static configuration - static void set_gfx_region(device_t &device, std::string tag) { downcast(device).m_gfx_region = tag; } + static void set_gfx_region(device_t &device, const char *tag) { downcast(device).m_gfx_region = tag; } static void set_tex_layout(device_t &device, int layout) { downcast(device).m_tex_layout = layout; } UINT32 fetch_texel(int page, int pal_index, int u, int v); @@ -39,7 +39,7 @@ private: std::unique_ptr m_palette; - std::string m_gfx_region; + const char * m_gfx_region; UINT8 * m_gfxrom; //int m_tex_width; //int m_tex_height; diff --git a/src/mame/video/k001604.cpp b/src/mame/video/k001604.cpp index d34083efee0..6308e9f2736 100644 --- a/src/mame/video/k001604.cpp +++ b/src/mame/video/k001604.cpp @@ -17,7 +17,7 @@ const device_type K001604 = &device_creator; -k001604_device::k001604_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k001604_device::k001604_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K001604, "K001604 2D tilemaps + 2x ROZ", tag, owner, clock, "k001604", __FILE__), m_gfx_index_1(0), m_gfx_index_2(0), @@ -41,7 +41,7 @@ k001604_device::k001604_device(const machine_config &mconfig, std::string tag, d // gfx decoder //------------------------------------------------- -void k001604_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void k001604_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -425,7 +425,7 @@ WRITE32_MEMBER( k001604_device::reg_w ) // palette device //------------------------------------------------- -void k001604_device::static_set_palette_tag(device_t &device, std::string tag) +void k001604_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/k001604.h b/src/mame/video/k001604.h index 14480539cc3..d0719936029 100644 --- a/src/mame/video/k001604.h +++ b/src/mame/video/k001604.h @@ -8,12 +8,12 @@ class k001604_device : public device_t { public: - k001604_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k001604_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k001604_device() {} // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_gfx_index_1(device_t &device, int idx) { downcast(device).m_gfx_index_1 = idx; } static void set_gfx_index_2(device_t &device, int idx) { downcast(device).m_gfx_index_2 = idx; } static void set_layer_size(device_t &device, int size) { downcast(device).m_layer_size = size; } diff --git a/src/mame/video/k007121.cpp b/src/mame/video/k007121.cpp index 6a1d3b2fe99..6914945baa5 100644 --- a/src/mame/video/k007121.cpp +++ b/src/mame/video/k007121.cpp @@ -121,7 +121,7 @@ control registers const device_type K007121 = &device_creator; -k007121_device::k007121_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k007121_device::k007121_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K007121, "K007121 Sprite/Tilemap Controller", tag, owner, clock, "k007121", __FILE__), m_flipscreen(0), m_palette(*this) @@ -364,7 +364,7 @@ void k007121_device::sprites_draw( bitmap_ind16 &bitmap, const rectangle &clipre // palette device //------------------------------------------------- -void k007121_device::static_set_palette_tag(device_t &device, std::string tag) +void k007121_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/k007121.h b/src/mame/video/k007121.h index 6d1b41f8bc7..0f1188b21fa 100644 --- a/src/mame/video/k007121.h +++ b/src/mame/video/k007121.h @@ -7,10 +7,10 @@ class k007121_device : public device_t { public: - k007121_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k007121_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k007121_device() {} - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); DECLARE_READ8_MEMBER( ctrlram_r ); DECLARE_WRITE8_MEMBER( ctrl_w ); diff --git a/src/mame/video/k007342.cpp b/src/mame/video/k007342.cpp index 3ef9db0e4dd..e44dd84e068 100644 --- a/src/mame/video/k007342.cpp +++ b/src/mame/video/k007342.cpp @@ -37,7 +37,7 @@ control registers const device_type K007342 = &device_creator; -k007342_device::k007342_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k007342_device::k007342_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K007342, "K007342 Video Controller", tag, owner, clock, "k007342", __FILE__), m_ram(nullptr), m_scroll_ram(nullptr), @@ -61,7 +61,7 @@ k007342_device::k007342_device(const machine_config &mconfig, std::string tag, d // gfx decoder //------------------------------------------------- -void k007342_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void k007342_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } diff --git a/src/mame/video/k007342.h b/src/mame/video/k007342.h index 0d10b163f3d..edc307868fa 100644 --- a/src/mame/video/k007342.h +++ b/src/mame/video/k007342.h @@ -9,11 +9,11 @@ typedef device_delegate(device).m_gfxnum = gfxnum; } static void static_set_callback(device_t &device, k007342_delegate callback) { downcast(device).m_callback = callback; } diff --git a/src/mame/video/k007420.cpp b/src/mame/video/k007420.cpp index 29c00aa38fc..9b539f23669 100644 --- a/src/mame/video/k007420.cpp +++ b/src/mame/video/k007420.cpp @@ -18,7 +18,7 @@ and a variable amount of ROM. Nothing is known about its external interface. const device_type K007420 = &device_creator; -k007420_device::k007420_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k007420_device::k007420_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K007420, "K007420 Sprite Generator", tag, owner, clock, "k007420", __FILE__), m_ram(nullptr), m_flipscreen(0), @@ -251,7 +251,7 @@ void k007420_device::sprites_draw( bitmap_ind16 &bitmap, const rectangle &clipre // palette device //------------------------------------------------- -void k007420_device::static_set_palette_tag(device_t &device, std::string tag) +void k007420_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/k007420.h b/src/mame/video/k007420.h index 6484a21555f..471efe297b6 100644 --- a/src/mame/video/k007420.h +++ b/src/mame/video/k007420.h @@ -9,10 +9,10 @@ typedef device_delegate k007420_delegate; class k007420_device : public device_t { public: - k007420_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k007420_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k007420_device() {} - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); static void static_set_bank_limit(device_t &device, int limit) { downcast(device).m_banklimit = limit; } static void static_set_callback(device_t &device, k007420_delegate callback) { downcast(device).m_callback = callback; } diff --git a/src/mame/video/k037122.cpp b/src/mame/video/k037122.cpp index c6d732fdb8b..e7f57786174 100644 --- a/src/mame/video/k037122.cpp +++ b/src/mame/video/k037122.cpp @@ -15,7 +15,7 @@ Konami 037122 const device_type K037122 = &device_creator; -k037122_device::k037122_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k037122_device::k037122_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K037122, "K037122 2D Tilemap", tag, owner, clock, "k037122", __FILE__), device_video_interface(mconfig, *this), m_tile_ram(nullptr), @@ -32,7 +32,7 @@ k037122_device::k037122_device(const machine_config &mconfig, std::string tag, d // gfx decoder //------------------------------------------------- -void k037122_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void k037122_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -42,7 +42,7 @@ void k037122_device::static_set_gfxdecode_tag(device_t &device, std::string tag) // palette device //------------------------------------------------- -void k037122_device::static_set_palette_tag(device_t &device, std::string tag) +void k037122_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/k037122.h b/src/mame/video/k037122.h index 13ed75d2868..181f28e355d 100644 --- a/src/mame/video/k037122.h +++ b/src/mame/video/k037122.h @@ -8,12 +8,12 @@ class k037122_device : public device_t, public device_video_interface { public: - k037122_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k037122_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k037122_device() {} // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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_gfx_index(device_t &device, int index) { downcast(device).m_gfx_index = index; } void tile_draw( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect ); diff --git a/src/mame/video/k051316.cpp b/src/mame/video/k051316.cpp index a01ac24a1b3..958b38fab3f 100644 --- a/src/mame/video/k051316.cpp +++ b/src/mame/video/k051316.cpp @@ -103,7 +103,7 @@ GFXDECODE_MEMBER( k051316_device::gfxinfo4_ram ) GFXDECODE_END -k051316_device::k051316_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k051316_device::k051316_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K051316, "K051316 PSAC", tag, owner, clock, "k051316", __FILE__), device_gfx_interface(mconfig, *this, gfxinfo), m_zoom_rom(nullptr), diff --git a/src/mame/video/k051316.h b/src/mame/video/k051316.h index 9984494903c..03d040340f1 100644 --- a/src/mame/video/k051316.h +++ b/src/mame/video/k051316.h @@ -28,7 +28,7 @@ class k051316_device : public device_t, public device_gfx_interface { public: - k051316_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k051316_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k051316_device() {} static const gfx_layout charlayout4; diff --git a/src/mame/video/k051733.cpp b/src/mame/video/k051733.cpp index 5cf332226da..8456e0d2ea7 100644 --- a/src/mame/video/k051733.cpp +++ b/src/mame/video/k051733.cpp @@ -64,7 +64,7 @@ reads from 0x0006, and only uses bit 1. const device_type K051733 = &device_creator; -k051733_device::k051733_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k051733_device::k051733_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K051733, "K051733 Protection", tag, owner, clock, "k051733", __FILE__), //m_ram[0x20], m_rng(0) diff --git a/src/mame/video/k051733.h b/src/mame/video/k051733.h index 75f069a4d8b..6e0ef7708d0 100644 --- a/src/mame/video/k051733.h +++ b/src/mame/video/k051733.h @@ -7,7 +7,7 @@ class k051733_device : public device_t { public: - k051733_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k051733_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k051733_device() {} DECLARE_WRITE8_MEMBER( write ); diff --git a/src/mame/video/k051960.cpp b/src/mame/video/k051960.cpp index 27e2bb2efe9..81eb58f45af 100644 --- a/src/mame/video/k051960.cpp +++ b/src/mame/video/k051960.cpp @@ -125,12 +125,13 @@ GFXDECODE_MEMBER( k051960_device::gfxinfo_gradius3 ) GFXDECODE_END -k051960_device::k051960_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k051960_device::k051960_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K051960, "K051960 Sprite Generator", tag, owner, clock, "k051960", __FILE__), device_gfx_interface(mconfig, *this, gfxinfo), m_ram(nullptr), m_sprite_rom(nullptr), m_sprite_size(0), + m_screen_tag(nullptr), m_screen(nullptr), m_scanline_timer(nullptr), m_irq_handler(*this), @@ -170,7 +171,7 @@ void k051960_device::set_plane_order(device_t &device, int order) // set_screen_tag - set screen we are attached to //------------------------------------------------- -void k051960_device::set_screen_tag(device_t &device, device_t *owner, std::string tag) +void k051960_device::set_screen_tag(device_t &device, device_t *owner, const char *tag) { k051960_device &dev = dynamic_cast(device); dev.m_screen_tag = tag; diff --git a/src/mame/video/k051960.h b/src/mame/video/k051960.h index 8302244362b..069f0f48440 100644 --- a/src/mame/video/k051960.h +++ b/src/mame/video/k051960.h @@ -42,7 +42,7 @@ class k051960_device : public device_t, DECLARE_GFXDECODE_MEMBER(gfxinfo_gradius3); public: - k051960_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k051960_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k051960_device() {} template static devcb_base &set_irq_handler(device_t &device, _Object object) @@ -54,7 +54,7 @@ public: // static configuration static void set_k051960_callback(device_t &device, k051960_cb_delegate callback) { downcast(device).m_k051960_cb = callback; } static void set_plane_order(device_t &device, int order); - static void set_screen_tag(device_t &device, device_t *owner, std::string tag); + static void set_screen_tag(device_t &device, device_t *owner, const char *tag); /* The callback is passed: @@ -92,7 +92,7 @@ private: UINT8 *m_sprite_rom; UINT32 m_sprite_size; - std::string m_screen_tag; + const char *m_screen_tag; screen_device *m_screen; emu_timer *m_scanline_timer; diff --git a/src/mame/video/k052109.cpp b/src/mame/video/k052109.cpp index 83c417afeb9..f0e3c640051 100644 --- a/src/mame/video/k052109.cpp +++ b/src/mame/video/k052109.cpp @@ -159,7 +159,7 @@ GFXDECODE_MEMBER( k052109_device::gfxinfo_ram ) GFXDECODE_END -k052109_device::k052109_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k052109_device::k052109_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K052109, "K052109 Tilemap Generator", tag, owner, clock, "k052109", __FILE__), device_gfx_interface(mconfig, *this, gfxinfo), m_ram(nullptr), @@ -180,6 +180,7 @@ k052109_device::k052109_device(const machine_config &mconfig, std::string tag, d m_scrollctrl(0), m_char_rom(nullptr), m_char_size(0), + m_screen_tag(nullptr), m_irq_handler(*this), m_firq_handler(*this), m_nmi_handler(*this) @@ -204,7 +205,7 @@ void k052109_device::set_ram(device_t &device, bool ram) void k052109_device::device_start() { - if (!m_screen_tag.empty()) + if (m_screen_tag != nullptr) { // make sure our screen is started screen_device *screen = m_owner->subdevice(m_screen_tag); @@ -287,7 +288,7 @@ void k052109_device::device_reset() // set_screen_tag - set screen we are attached to //------------------------------------------------- -void k052109_device::set_screen_tag(device_t &device, device_t *owner, std::string tag) +void k052109_device::set_screen_tag(device_t &device, device_t *owner, const char *tag) { k052109_device &dev = dynamic_cast(device); dev.m_screen_tag = tag; diff --git a/src/mame/video/k052109.h b/src/mame/video/k052109.h index 5d081a9e251..96f25882fa4 100644 --- a/src/mame/video/k052109.h +++ b/src/mame/video/k052109.h @@ -28,7 +28,7 @@ class k052109_device : public device_t, public device_gfx_interface DECLARE_GFXDECODE_MEMBER(gfxinfo_ram); public: - k052109_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k052109_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k052109_device() {} template static devcb_base &set_irq_handler(device_t &device, _Object object) @@ -36,7 +36,7 @@ public: static void set_k052109_callback(device_t &device, k052109_cb_delegate callback) { downcast(device).m_k052109_cb = callback; } static void set_ram(device_t &device, bool ram); - static void set_screen_tag(device_t &device, device_t *owner, std::string tag); + static void set_screen_tag(device_t &device, device_t *owner, const char *tag); /* The callback is passed: @@ -99,7 +99,7 @@ private: UINT8 *m_char_rom; UINT32 m_char_size; - std::string m_screen_tag; + const char *m_screen_tag; k052109_cb_delegate m_k052109_cb; diff --git a/src/mame/video/k053244_k053245.cpp b/src/mame/video/k053244_k053245.cpp index c4ee02496bf..66846c73aa6 100644 --- a/src/mame/video/k053244_k053245.cpp +++ b/src/mame/video/k053244_k053245.cpp @@ -81,7 +81,7 @@ GFXDECODE_MEMBER( k05324x_device::gfxinfo_6bpp ) GFXDECODE_END -k05324x_device::k05324x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k05324x_device::k05324x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K053244, "K053244 & 053245 Sprite Generator", tag, owner, clock, "k05324x", __FILE__), device_gfx_interface(mconfig, *this, gfxinfo), m_ram(nullptr), diff --git a/src/mame/video/k053244_k053245.h b/src/mame/video/k053244_k053245.h index 9d50197ddca..924edc2a37f 100644 --- a/src/mame/video/k053244_k053245.h +++ b/src/mame/video/k053244_k053245.h @@ -28,7 +28,7 @@ class k05324x_device : public device_t, DECLARE_GFXDECODE_MEMBER(gfxinfo_6bpp); public: - k05324x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k05324x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k05324x_device() {} // static configuration diff --git a/src/mame/video/k053246_k053247_k055673.cpp b/src/mame/video/k053246_k053247_k055673.cpp index cea687071e7..fc9bc1581eb 100644 --- a/src/mame/video/k053246_k053247_k055673.cpp +++ b/src/mame/video/k053246_k053247_k055673.cpp @@ -902,7 +902,7 @@ void k053247_device::zdrawgfxzoom32GP( const device_type K055673 = &device_creator; -k055673_device::k055673_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k055673_device::k055673_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : k053247_device(mconfig, K055673, "K053246 & K055673 Sprite Generator", tag, owner, clock, "k055673", __FILE__) { } @@ -1043,7 +1043,7 @@ void k055673_device::device_start() const device_type K053246 = &device_creator; -k053247_device::k053247_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k053247_device::k053247_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K053246, "K053246 & K053247 Sprite Generator", tag, owner, clock, "k053247", __FILE__), device_video_interface(mconfig, *this), m_gfxdecode(*this), @@ -1052,7 +1052,7 @@ k053247_device::k053247_device(const machine_config &mconfig, std::string tag, d clear_all(); } -k053247_device::k053247_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +k053247_device::k053247_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), m_gfxdecode(*this), @@ -1066,7 +1066,7 @@ k053247_device::k053247_device(const machine_config &mconfig, device_type type, // gfx decoder //------------------------------------------------- -void k053247_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void k053247_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -1076,7 +1076,7 @@ void k053247_device::static_set_gfxdecode_tag(device_t &device, std::string tag) // palette device //------------------------------------------------- -void k053247_device::static_set_palette_tag(device_t &device, std::string tag) +void k053247_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/k053246_k053247_k055673.h b/src/mame/video/k053246_k053247_k055673.h index 0bec1c786af..96e41f00893 100644 --- a/src/mame/video/k053246_k053247_k055673.h +++ b/src/mame/video/k053246_k053247_k055673.h @@ -61,14 +61,14 @@ class k053247_device : public device_t, public device_video_interface { public: - k053247_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - k053247_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + k053247_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + k053247_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~k053247_device() { } // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_k053247_callback(device_t &device, k053247_cb_delegate callback) { downcast(device).m_k053247_cb = callback; } static void set_config(device_t &device, const char *gfx_reg, int gfx_num, int bpp, int dx, int dy) { @@ -486,7 +486,7 @@ extern const device_type K053246; class k055673_device : public k053247_device { public: - k055673_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k055673_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k055673_device() { } protected: diff --git a/src/mame/video/k053250.cpp b/src/mame/video/k053250.cpp index b0a876e4cdd..bb3c02805fc 100644 --- a/src/mame/video/k053250.cpp +++ b/src/mame/video/k053250.cpp @@ -4,7 +4,7 @@ const device_type K053250 = &device_creator; -k053250_device::k053250_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k053250_device::k053250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K053250, "K053250 LVC", tag, owner, clock, "k053250", __FILE__), device_gfx_interface(mconfig, *this), device_video_interface(mconfig, *this) @@ -21,7 +21,7 @@ void k053250_device::static_set_offsets(device_t &device, int offx, int offy) void k053250_device::unpack_nibbles() { if(!m_region) - throw emu_fatalerror("k053250 %s: no associated region found\n", tag().c_str()); + throw emu_fatalerror("k053250 %s: no associated region found\n", tag()); const UINT8 *base = m_region->base(); int size = m_region->bytes(); diff --git a/src/mame/video/k053250.h b/src/mame/video/k053250.h index 21641314aef..610c8577507 100644 --- a/src/mame/video/k053250.h +++ b/src/mame/video/k053250.h @@ -20,7 +20,7 @@ class k053250_device : public device_t, public device_video_interface { public: - k053250_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k053250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_offsets(device_t &device, int offx, int offy); diff --git a/src/mame/video/k053251.cpp b/src/mame/video/k053251.cpp index 3283a95dc21..b11eb7002e1 100644 --- a/src/mame/video/k053251.cpp +++ b/src/mame/video/k053251.cpp @@ -126,7 +126,7 @@ actually used, since the priority is taken from the external ports. const device_type K053251 = &device_creator; -k053251_device::k053251_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k053251_device::k053251_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K053251, "K053251 Priority Encoder", tag, owner, clock, "k053251", __FILE__), //m_dirty_tmap[5], //m_ram[16], diff --git a/src/mame/video/k053251.h b/src/mame/video/k053251.h index 8e51f8b7cbc..de5feffc3de 100644 --- a/src/mame/video/k053251.h +++ b/src/mame/video/k053251.h @@ -15,7 +15,7 @@ class k053251_device : public device_t { public: - k053251_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k053251_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k053251_device() {} /* diff --git a/src/mame/video/k053936.cpp b/src/mame/video/k053936.cpp index 35728d0b8b8..8e851c14e82 100644 --- a/src/mame/video/k053936.cpp +++ b/src/mame/video/k053936.cpp @@ -229,7 +229,7 @@ void K053936_set_offset(int chip, int xoffs, int yoffs) const device_type K053936 = &device_creator; -k053936_device::k053936_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k053936_device::k053936_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K053936, "K053936 Video Controller", tag, owner, clock, "k053936", __FILE__), m_ctrl(nullptr), m_linectrl(nullptr), diff --git a/src/mame/video/k053936.h b/src/mame/video/k053936.h index af50957aa72..311b2e198d9 100644 --- a/src/mame/video/k053936.h +++ b/src/mame/video/k053936.h @@ -19,7 +19,7 @@ void K053936GP_0_zoom_draw(running_machine &machine, bitmap_rgb32 &bitmap, const class k053936_device : public device_t { public: - k053936_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k053936_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k053936_device() {} // static configuration diff --git a/src/mame/video/k054000.cpp b/src/mame/video/k054000.cpp index f01d16098d9..235f72ea1ea 100644 --- a/src/mame/video/k054000.cpp +++ b/src/mame/video/k054000.cpp @@ -54,7 +54,7 @@ Memory map: const device_type K054000 = &device_creator; -k054000_device::k054000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k054000_device::k054000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K054000, "K054000 Protection", tag, owner, clock, "k054000", __FILE__) { } diff --git a/src/mame/video/k054000.h b/src/mame/video/k054000.h index bafb8d7869a..05ce76b3da6 100644 --- a/src/mame/video/k054000.h +++ b/src/mame/video/k054000.h @@ -11,7 +11,7 @@ class k054000_device : public device_t { public: - k054000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k054000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k054000_device() {} DECLARE_WRITE8_MEMBER( write ); diff --git a/src/mame/video/k054156_k054157_k056832.cpp b/src/mame/video/k054156_k054157_k056832.cpp index 135d789e1aa..9167a3e571a 100644 --- a/src/mame/video/k054156_k054157_k056832.cpp +++ b/src/mame/video/k054156_k054157_k056832.cpp @@ -181,7 +181,7 @@ ones. The other 7 words are ignored. Global scrollx is ignored. const device_type K056832 = &device_creator; -k056832_device::k056832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k056832_device::k056832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K056832, "K056832 Tilemap Generator", tag, owner, clock, "k056832", __FILE__), //m_tilemap[K056832_PAGE_COUNT], //*m_pixmap[K056832_PAGE_COUNT], @@ -195,6 +195,7 @@ k056832_device::k056832_device(const machine_config &mconfig, std::string tag, d m_bpp(-1), m_big(0), m_djmain_hack(0), + m_k055555_tag(nullptr), //m_layer_assoc_with_page[K056832_PAGE_COUNT], //m_layer_offs[8][2], //m_lsram_page[8][2], @@ -229,7 +230,7 @@ k056832_device::k056832_device(const machine_config &mconfig, std::string tag, d // gfx decoder //------------------------------------------------- -void k056832_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void k056832_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -240,7 +241,7 @@ void k056832_device::static_set_gfxdecode_tag(device_t &device, std::string tag) // palette device //------------------------------------------------- -void k056832_device::static_set_palette_tag(device_t &device, std::string tag) +void k056832_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/k054156_k054157_k056832.h b/src/mame/video/k054156_k054157_k056832.h index 7cb6f342145..d043a4f9525 100644 --- a/src/mame/video/k054156_k054157_k056832.h +++ b/src/mame/video/k054156_k054157_k056832.h @@ -38,7 +38,7 @@ typedef device_delegate k05 class k056832_device : public device_t { public: - k056832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k056832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k056832_device() { m_k055555 = nullptr; @@ -57,8 +57,8 @@ public: } // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); + static void static_set_palette_tag(device_t &device, const char *tag); void SetExtLinescroll(); /* Lethal Enforcers */ diff --git a/src/mame/video/k054338.cpp b/src/mame/video/k054338.cpp index 49b8b12e45b..928f331991f 100644 --- a/src/mame/video/k054338.cpp +++ b/src/mame/video/k054338.cpp @@ -20,10 +20,11 @@ const device_type K054338 = &device_creator; -k054338_device::k054338_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k054338_device::k054338_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K054338, "K054338 Mixer", tag, owner, clock, "k054338", __FILE__), device_video_interface(mconfig, *this), - m_alpha_inv(0) + m_alpha_inv(0), + m_k055555_tag(nullptr) { memset(&m_regs, 0, sizeof(m_regs)); memset(&m_shd_rgb, 0, sizeof(m_shd_rgb)); diff --git a/src/mame/video/k054338.h b/src/mame/video/k054338.h index 0ad9bfa180e..ad4f95a590e 100644 --- a/src/mame/video/k054338.h +++ b/src/mame/video/k054338.h @@ -25,7 +25,7 @@ class k054338_device : public device_t, public device_video_interface { public: - k054338_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k054338_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k054338_device() {} // static configuration diff --git a/src/mame/video/k055555.cpp b/src/mame/video/k055555.cpp index edfdf5ebf7c..adebdf0fe10 100644 --- a/src/mame/video/k055555.cpp +++ b/src/mame/video/k055555.cpp @@ -142,7 +142,7 @@ int k055555_device::K055555_get_palette_index(int idx) const device_type K055555 = &device_creator; -k055555_device::k055555_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k055555_device::k055555_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K055555, "K055555 Priority Encoder", tag, owner, clock, "k055555", __FILE__) { } diff --git a/src/mame/video/k055555.h b/src/mame/video/k055555.h index 9e553d7b5b6..cc3d8dd602c 100644 --- a/src/mame/video/k055555.h +++ b/src/mame/video/k055555.h @@ -80,7 +80,7 @@ class k055555_device : public device_t { public: - k055555_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k055555_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k055555_device() { } void K055555_write_reg(UINT8 regnum, UINT8 regdat); diff --git a/src/mame/video/k057714.cpp b/src/mame/video/k057714.cpp index a715d9f6f01..8676e3a5a37 100644 --- a/src/mame/video/k057714.cpp +++ b/src/mame/video/k057714.cpp @@ -13,7 +13,7 @@ const device_type K057714 = &device_creator; -k057714_device::k057714_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k057714_device::k057714_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K057714, "K057714 GCU", tag, owner, clock, "k057714", __FILE__), m_irq(*this) { diff --git a/src/mame/video/k057714.h b/src/mame/video/k057714.h index e531728feb1..a0ca6007385 100644 --- a/src/mame/video/k057714.h +++ b/src/mame/video/k057714.h @@ -8,7 +8,7 @@ class k057714_device : public device_t { public: - k057714_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k057714_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &static_set_irq_callback(device_t &device, _Object object) { return downcast(device).m_irq.set_callback(object); } int draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/video/k1ge.cpp b/src/mame/video/k1ge.cpp index 20c587d360f..a32e760b385 100644 --- a/src/mame/video/k1ge.cpp +++ b/src/mame/video/k1ge.cpp @@ -863,7 +863,7 @@ void k1ge_device::device_reset() const device_type K1GE = &device_creator; -k1ge_device::k1ge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k1ge_device::k1ge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K1GE, "K1GE Monochrome Graphics + LCD", tag, owner, clock, "k1ge", __FILE__) , device_video_interface(mconfig, *this) , m_vblank_pin_w(*this) @@ -871,7 +871,7 @@ k1ge_device::k1ge_device(const machine_config &mconfig, std::string tag, device_ { } -k1ge_device::k1ge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +k1ge_device::k1ge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , device_video_interface(mconfig, *this) , m_vblank_pin_w(*this) @@ -897,7 +897,7 @@ machine_config_constructor k1ge_device::device_mconfig_additions() const const device_type K2GE = &device_creator; -k2ge_device::k2ge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k2ge_device::k2ge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : k1ge_device(mconfig, K2GE, "K2GE Color Graphics + LCD", tag, owner, clock, "k2ge", __FILE__) { } diff --git a/src/mame/video/k1ge.h b/src/mame/video/k1ge.h index 3cb4df83dc1..81f79d9eb3c 100644 --- a/src/mame/video/k1ge.h +++ b/src/mame/video/k1ge.h @@ -27,8 +27,8 @@ class k1ge_device : public device_t, public device_video_interface { public: - k1ge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - k1ge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + k1ge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + k1ge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -70,7 +70,7 @@ protected: class k2ge_device : public k1ge_device { public: - k2ge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k2ge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_PALETTE_INIT(k2ge); protected: diff --git a/src/mame/video/kan_pand.cpp b/src/mame/video/kan_pand.cpp index 21ae4d57094..181de04020d 100644 --- a/src/mame/video/kan_pand.cpp +++ b/src/mame/video/kan_pand.cpp @@ -54,7 +54,7 @@ const device_type KANEKO_PANDORA = &device_creator; -kaneko_pandora_device::kaneko_pandora_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kaneko_pandora_device::kaneko_pandora_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KANEKO_PANDORA, "Kaneko PANDORA GFX", tag, owner, clock, "kaneko_pandora", __FILE__), device_video_interface(mconfig, *this), m_gfx_region(0), @@ -70,7 +70,7 @@ kaneko_pandora_device::kaneko_pandora_device(const machine_config &mconfig, std: // gfx decoder //------------------------------------------------- -void kaneko_pandora_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void kaneko_pandora_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -80,7 +80,7 @@ void kaneko_pandora_device::static_set_gfxdecode_tag(device_t &device, std::stri // palette device //------------------------------------------------- -void kaneko_pandora_device::static_set_palette_tag(device_t &device, std::string tag) +void kaneko_pandora_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/kan_pand.h b/src/mame/video/kan_pand.h index d4e04fab0b4..f29c5ef3605 100644 --- a/src/mame/video/kan_pand.h +++ b/src/mame/video/kan_pand.h @@ -19,12 +19,12 @@ class kaneko_pandora_device : public device_t, public device_video_interface { public: - kaneko_pandora_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kaneko_pandora_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~kaneko_pandora_device() {} // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_gfx_region(device_t &device, int gfxregion) { downcast(device).m_gfx_region = gfxregion; } static void set_offsets(device_t &device, int x_offset, int y_offset) { diff --git a/src/mame/video/kaneko_grap2.cpp b/src/mame/video/kaneko_grap2.cpp index 95cbb5b0db1..7a5bd2de907 100644 --- a/src/mame/video/kaneko_grap2.cpp +++ b/src/mame/video/kaneko_grap2.cpp @@ -16,7 +16,7 @@ const device_type KANEKO_GRAP2 = &device_creator; -kaneko_grap2_device::kaneko_grap2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kaneko_grap2_device::kaneko_grap2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KANEKO_GRAP2, "Kaneko GRAP2", tag, owner, clock, "kaneko_grap2", __FILE__), m_palette(*this) { @@ -35,7 +35,7 @@ void kaneko_grap2_device::set_chipnum(device_t &device, int chipnum) // palette device //------------------------------------------------- -void kaneko_grap2_device::static_set_palette_tag(device_t &device, std::string tag) +void kaneko_grap2_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } @@ -93,7 +93,7 @@ READ16_MEMBER(kaneko_grap2_device::galpani3_regs1_r) } default: - logerror("cpu '%s' (PC=%06X): galpani3_regs1_r %02x %04x\n", space.device().tag().c_str(), space.device().safe_pcbase(), offset, mem_mask); + logerror("cpu '%s' (PC=%06X): galpani3_regs1_r %02x %04x\n", space.device().tag(), space.device().safe_pcbase(), offset, mem_mask); break; } diff --git a/src/mame/video/kaneko_grap2.h b/src/mame/video/kaneko_grap2.h index 7c9f6643989..cd801ad3b45 100644 --- a/src/mame/video/kaneko_grap2.h +++ b/src/mame/video/kaneko_grap2.h @@ -22,13 +22,13 @@ class kaneko_grap2_device : public device_t { public: - kaneko_grap2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kaneko_grap2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); int m_chipnum; // used to decide where we write the palette static void set_chipnum(device_t &device, int chipnum); - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); DECLARE_READ16_MEMBER(galpani3_regs1_r); DECLARE_WRITE16_MEMBER(galpani3_regs1_go_w); diff --git a/src/mame/video/kaneko_spr.cpp b/src/mame/video/kaneko_spr.cpp index 5eb985c0df5..304800130a4 100644 --- a/src/mame/video/kaneko_spr.cpp +++ b/src/mame/video/kaneko_spr.cpp @@ -31,7 +31,7 @@ const device_type KANEKO_VU002_SPRITE = &device_creator; const device_type KANEKO_KC002_SPRITE = &device_creator; -kaneko16_sprite_device::kaneko16_sprite_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, device_type type) +kaneko16_sprite_device::kaneko16_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type) : device_t(mconfig, type, "Kaneko 16-bit Sprites", tag, owner, clock, "kaneko16_sprite", __FILE__), device_video_interface(mconfig, *this), m_gfxdecode(*this) @@ -63,7 +63,7 @@ kaneko16_sprite_device::kaneko16_sprite_device(const machine_config &mconfig, st // gfx decoder //------------------------------------------------- -void kaneko16_sprite_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void kaneko16_sprite_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -616,12 +616,12 @@ void kaneko16_sprite_device::kaneko16_render_sprites_common(_BitmapClass &bitmap } } -kaneko_vu002_sprite_device::kaneko_vu002_sprite_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kaneko_vu002_sprite_device::kaneko_vu002_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : kaneko16_sprite_device(mconfig, tag, owner, clock, KANEKO_VU002_SPRITE) { } -kaneko_kc002_sprite_device::kaneko_kc002_sprite_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kaneko_kc002_sprite_device::kaneko_kc002_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : kaneko16_sprite_device(mconfig, tag, owner, clock, KANEKO_KC002_SPRITE) { } diff --git a/src/mame/video/kaneko_spr.h b/src/mame/video/kaneko_spr.h index 3558637536e..44639a2351c 100644 --- a/src/mame/video/kaneko_spr.h +++ b/src/mame/video/kaneko_spr.h @@ -31,10 +31,10 @@ class kaneko16_sprite_device : public device_t, public device_video_interface { public: - kaneko16_sprite_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, device_type type); + kaneko16_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void set_fliptype(device_t &device, int fliptype); static void set_offsets(device_t &device, int xoffs, int yoffs); static void set_priorities(device_t &device, int pri0, int pri1, int pri2, int pri3); @@ -113,7 +113,7 @@ private: class kaneko_vu002_sprite_device : public kaneko16_sprite_device { public: - kaneko_vu002_sprite_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kaneko_vu002_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void get_sprite_attributes(struct kan_tempsprite *s, UINT16 attr) override; int get_sprite_type(void) override{ return 0; }; }; @@ -123,7 +123,7 @@ extern const device_type KANEKO_VU002_SPRITE; class kaneko_kc002_sprite_device : public kaneko16_sprite_device { public: - kaneko_kc002_sprite_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kaneko_kc002_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void get_sprite_attributes(struct kan_tempsprite *s, UINT16 attr) override; int get_sprite_type(void) override{ return 1; }; }; diff --git a/src/mame/video/kaneko_tmap.cpp b/src/mame/video/kaneko_tmap.cpp index 91394e5e54b..634753975c0 100644 --- a/src/mame/video/kaneko_tmap.cpp +++ b/src/mame/video/kaneko_tmap.cpp @@ -96,7 +96,7 @@ There are more! const device_type KANEKO_TMAP = &device_creator; -kaneko_view2_tilemap_device::kaneko_view2_tilemap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +kaneko_view2_tilemap_device::kaneko_view2_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, KANEKO_TMAP, "Kaneko VIEW2 Tilemaps", tag, owner, clock, "kaneko_view2_tilemap", __FILE__), m_gfxdecode(*this) { @@ -108,7 +108,7 @@ kaneko_view2_tilemap_device::kaneko_view2_tilemap_device(const machine_config &m // gfx decoder //------------------------------------------------- -void kaneko_view2_tilemap_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void kaneko_view2_tilemap_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } diff --git a/src/mame/video/kaneko_tmap.h b/src/mame/video/kaneko_tmap.h index 3a47b1a956c..75a05e3039d 100644 --- a/src/mame/video/kaneko_tmap.h +++ b/src/mame/video/kaneko_tmap.h @@ -5,10 +5,10 @@ class kaneko_view2_tilemap_device : public device_t { public: - kaneko_view2_tilemap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + kaneko_view2_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void set_gfx_region(device_t &device, int region); static void set_offset(device_t &device, int dx, int dy, int xdim, int ydim); static void set_invert_flip(device_t &device, int invert_flip); // for fantasia (bootleg) diff --git a/src/mame/video/maria.cpp b/src/mame/video/maria.cpp index 40ba9646f5e..a5501989e4b 100644 --- a/src/mame/video/maria.cpp +++ b/src/mame/video/maria.cpp @@ -58,7 +58,7 @@ const device_type ATARI_MARIA = &device_creator; -atari_maria_device::atari_maria_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +atari_maria_device::atari_maria_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ATARI_MARIA, "Atari MARIA", tag, owner, clock, "atari_maria", __FILE__) { } diff --git a/src/mame/video/maria.h b/src/mame/video/maria.h index a0e9d803045..ee01856e7b8 100644 --- a/src/mame/video/maria.h +++ b/src/mame/video/maria.h @@ -11,9 +11,9 @@ class atari_maria_device : public device_t { public: // construction/destruction - atari_maria_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + atari_maria_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu_tag = tag; } + static void set_cpu_tag(device_t &device, const char *tag) { downcast(device).m_cpu_tag = tag; } void interrupt(int lines); void startdma(int lines); @@ -55,7 +55,7 @@ private: int is_holey(unsigned int addr); int write_line_ram(int addr, UINT8 offset, int pal); - std::string m_cpu_tag; + const char *m_cpu_tag; cpu_device *m_cpu; // CPU whose space(AS_PROGRAM) serves as DMA source screen_device *m_screen; }; diff --git a/src/mame/video/mb60553.cpp b/src/mame/video/mb60553.cpp index 76710f9c71d..f13a8f3e26c 100644 --- a/src/mame/video/mb60553.cpp +++ b/src/mame/video/mb60553.cpp @@ -14,7 +14,7 @@ const device_type MB60553 = &device_creator; -mb60553_zooming_tilemap_device::mb60553_zooming_tilemap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mb60553_zooming_tilemap_device::mb60553_zooming_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MB60553, "MB60553 Zooming Tilemap", tag, owner, clock, "mb60553", __FILE__), m_vram(nullptr), m_pal_base(0), @@ -59,7 +59,7 @@ void mb60553_zooming_tilemap_device::set_gfx_region(device_t &device, int gfxreg dev.m_gfx_region = gfxregion; } -void mb60553_zooming_tilemap_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void mb60553_zooming_tilemap_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } diff --git a/src/mame/video/mb60553.h b/src/mame/video/mb60553.h index 50e1e166745..1c9c84e725c 100644 --- a/src/mame/video/mb60553.h +++ b/src/mame/video/mb60553.h @@ -7,8 +7,8 @@ class mb60553_zooming_tilemap_device : public device_t { public: - mb60553_zooming_tilemap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - static void static_set_gfxdecode_tag(device_t &device, std::string tag); + mb60553_zooming_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void set_gfx_region(device_t &device, int gfxregion); tilemap_t* m_tmap; diff --git a/src/mame/video/mcd212.cpp b/src/mame/video/mcd212.cpp index b5f9610f64c..f380914a74e 100644 --- a/src/mame/video/mcd212.cpp +++ b/src/mame/video/mcd212.cpp @@ -1514,7 +1514,7 @@ void mcd212_device::device_reset() // mcd212_device - constructor //------------------------------------------------- -mcd212_device::mcd212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mcd212_device::mcd212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MACHINE_MCD212, "MCD212 Video", tag, owner, clock, "mcd212", __FILE__), device_video_interface(mconfig, *this) { diff --git a/src/mame/video/mcd212.h b/src/mame/video/mcd212.h index 08f16bdf237..3e6968b9fe2 100644 --- a/src/mame/video/mcd212.h +++ b/src/mame/video/mcd212.h @@ -129,7 +129,7 @@ class mcd212_device : public device_t, { public: // construction/destruction - mcd212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mcd212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device members DECLARE_READ16_MEMBER( regs_r ); diff --git a/src/mame/video/neogeo_spr.cpp b/src/mame/video/neogeo_spr.cpp index 26881f79b59..7f075b28797 100644 --- a/src/mame/video/neogeo_spr.cpp +++ b/src/mame/video/neogeo_spr.cpp @@ -11,7 +11,7 @@ //const device_type NEOGEO_SPRITE_BASE = &device_creator; /* -neosprite_base_device::neosprite_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +neosprite_base_device::neosprite_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NEOGEO_SPRITE_BASE, "NeoGeo Sprites", tag, owner, clock, "neospritebase", __FILE__), m_bppshift(4) { @@ -19,7 +19,7 @@ neosprite_base_device::neosprite_base_device(const machine_config &mconfig, std: } */ -neosprite_base_device::neosprite_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, device_type type) +neosprite_base_device::neosprite_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type) : device_t(mconfig, type, "Neogeo Sprites", tag, owner, clock, "neosprite", __FILE__), m_bppshift(4) { @@ -654,7 +654,7 @@ void neosprite_base_device::set_pens(const pen_t* pens) const device_type NEOGEO_SPRITE_REGULAR = &device_creator; -neosprite_regular_device::neosprite_regular_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +neosprite_regular_device::neosprite_regular_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neosprite_base_device(mconfig, tag, owner, clock, NEOGEO_SPRITE_REGULAR) { } @@ -704,7 +704,7 @@ inline void neosprite_regular_device::draw_pixel(int romaddr, UINT32* dst, const const device_type NEOGEO_SPRITE_OPTIMZIED = &device_creator; -neosprite_optimized_device::neosprite_optimized_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +neosprite_optimized_device::neosprite_optimized_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neosprite_base_device(mconfig, tag, owner, clock, NEOGEO_SPRITE_OPTIMZIED), m_spritegfx8(nullptr) { @@ -742,7 +742,7 @@ inline void neosprite_optimized_device::draw_pixel(int romaddr, UINT32* dst, con const device_type NEOGEO_SPRITE_MIDAS = &device_creator; -neosprite_midas_device::neosprite_midas_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +neosprite_midas_device::neosprite_midas_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : neosprite_base_device(mconfig, tag, owner, clock, NEOGEO_SPRITE_MIDAS) { m_bppshift = 8; diff --git a/src/mame/video/neogeo_spr.h b/src/mame/video/neogeo_spr.h index f2e9ec5abf1..6c2f525544f 100644 --- a/src/mame/video/neogeo_spr.h +++ b/src/mame/video/neogeo_spr.h @@ -21,8 +21,8 @@ class neosprite_base_device : public device_t { public: - neosprite_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock, device_type type); -// neosprite_base_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + neosprite_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type); +// neosprite_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void optimize_sprite_data(); virtual void set_optimized_sprite_data(UINT8* sprdata, UINT32 mask); @@ -99,7 +99,7 @@ private: class neosprite_regular_device : public neosprite_base_device { public: - neosprite_regular_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + neosprite_regular_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void draw_pixel(int romaddr, UINT32* dst, const pen_t *line_pens) override; virtual void set_sprite_region(UINT8* region_sprites, UINT32 region_sprites_size) override; @@ -111,7 +111,7 @@ extern const device_type NEOGEO_SPRITE_REGULAR; class neosprite_optimized_device : public neosprite_base_device { public: - neosprite_optimized_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + neosprite_optimized_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void optimize_sprite_data() override; virtual void set_optimized_sprite_data(UINT8* sprdata, UINT32 mask) override; virtual void draw_pixel(int romaddr, UINT32* dst, const pen_t *line_pens) override; @@ -129,7 +129,7 @@ extern const device_type NEOGEO_SPRITE_OPTIMZIED; class neosprite_midas_device : public neosprite_base_device { public: - neosprite_midas_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + neosprite_midas_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void draw_pixel(int romaddr, UINT32* dst, const pen_t *line_pens) override; diff --git a/src/mame/video/newport.cpp b/src/mame/video/newport.cpp index 3558dadc151..51604b79326 100644 --- a/src/mame/video/newport.cpp +++ b/src/mame/video/newport.cpp @@ -83,7 +83,7 @@ static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_l const device_type NEWPORT_VIDEO = &device_creator; -newport_video_device::newport_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +newport_video_device::newport_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NEWPORT_VIDEO, "SGI Newport graphics board", tag, owner, clock, "newport_video", __FILE__) { } diff --git a/src/mame/video/newport.h b/src/mame/video/newport.h index 83af92cd27f..1764913a85d 100644 --- a/src/mame/video/newport.h +++ b/src/mame/video/newport.h @@ -113,7 +113,7 @@ struct CMAP_t class newport_video_device : public device_t { public: - newport_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + newport_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~newport_video_device() {} diff --git a/src/mame/video/nick.cpp b/src/mame/video/nick.cpp index eee5aeaedce..68b9011d31c 100644 --- a/src/mame/video/nick.cpp +++ b/src/mame/video/nick.cpp @@ -101,7 +101,7 @@ ADDRESS_MAP_END // nick_device - constructor //------------------------------------------------- -nick_device::nick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nick_device::nick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NICK, "NICK", tag, owner, clock, "nick", __FILE__), device_memory_interface(mconfig, *this), device_video_interface(mconfig, *this), diff --git a/src/mame/video/nick.h b/src/mame/video/nick.h index b21df35662d..ba701283cd9 100644 --- a/src/mame/video/nick.h +++ b/src/mame/video/nick.h @@ -73,7 +73,7 @@ class nick_device : public device_t, { public: // construction/destruction - nick_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_virq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_virq.set_callback(object); } diff --git a/src/mame/video/pc080sn.cpp b/src/mame/video/pc080sn.cpp index e84a4a8c2f1..62736eecae8 100644 --- a/src/mame/video/pc080sn.cpp +++ b/src/mame/video/pc080sn.cpp @@ -50,7 +50,7 @@ Control registers const device_type PC080SN = &device_creator; -pc080sn_device::pc080sn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pc080sn_device::pc080sn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC080SN, "Taito PC080SN", tag, owner, clock, "pc080sn", __FILE__), m_ram(nullptr), m_gfxnum(0), @@ -78,7 +78,7 @@ pc080sn_device::pc080sn_device(const machine_config &mconfig, std::string tag, d // gfx decoder //------------------------------------------------- -void pc080sn_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void pc080sn_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -88,7 +88,7 @@ void pc080sn_device::static_set_gfxdecode_tag(device_t &device, std::string tag) // palette device //------------------------------------------------- -void pc080sn_device::static_set_palette_tag(device_t &device, std::string tag) +void pc080sn_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/pc080sn.h b/src/mame/video/pc080sn.h index aa25ab4e496..b181fbd134e 100644 --- a/src/mame/video/pc080sn.h +++ b/src/mame/video/pc080sn.h @@ -6,12 +6,12 @@ class pc080sn_device : public device_t { public: - pc080sn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pc080sn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~pc080sn_device() {} // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_gfx_region(device_t &device, int gfxregion) { downcast(device).m_gfxnum = gfxregion; } static void set_yinvert(device_t &device, int y_inv) { downcast(device).m_y_invert = y_inv; } static void set_dblwidth(device_t &device, int dblwidth) { downcast(device).m_dblwidth = dblwidth; } diff --git a/src/mame/video/pc090oj.cpp b/src/mame/video/pc090oj.cpp index dc03ed469a8..d7dc21c19c7 100644 --- a/src/mame/video/pc090oj.cpp +++ b/src/mame/video/pc090oj.cpp @@ -74,7 +74,7 @@ Taito pc090oj const device_type PC090OJ = &device_creator; -pc090oj_device::pc090oj_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pc090oj_device::pc090oj_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC090OJ, "Taito PC090OJ", tag, owner, clock, "pc090oj", __FILE__), m_ctrl(0), m_sprite_ctrl(0), @@ -94,7 +94,7 @@ pc090oj_device::pc090oj_device(const machine_config &mconfig, std::string tag, d // gfx decoder //------------------------------------------------- -void pc090oj_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void pc090oj_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -104,7 +104,7 @@ void pc090oj_device::static_set_gfxdecode_tag(device_t &device, std::string tag) // palette device //------------------------------------------------- -void pc090oj_device::static_set_palette_tag(device_t &device, std::string tag) +void pc090oj_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/pc090oj.h b/src/mame/video/pc090oj.h index 04ceeb120c1..d1b63b1c7ea 100644 --- a/src/mame/video/pc090oj.h +++ b/src/mame/video/pc090oj.h @@ -6,12 +6,12 @@ class pc090oj_device : public device_t { public: - pc090oj_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pc090oj_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~pc090oj_device() {} // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_gfx_region(device_t &device, int gfxregion) { downcast(device).m_gfxnum = gfxregion; } static void set_usebuffer(device_t &device, int use_buf) { downcast(device).m_use_buffer = use_buf; } static void set_offsets(device_t &device, int x_offset, int y_offset) diff --git a/src/mame/video/pc_t1t.cpp b/src/mame/video/pc_t1t.cpp index f6628d2e186..b5931d4daba 100644 --- a/src/mame/video/pc_t1t.cpp +++ b/src/mame/video/pc_t1t.cpp @@ -31,7 +31,7 @@ enum const device_type PCVIDEO_T1000 = &device_creator; const device_type PCVIDEO_PCJR = &device_creator; -pc_t1t_device::pc_t1t_device(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_t1t_device::pc_t1t_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), m_mc6845(*this, T1000_MC6845_NAME), @@ -53,13 +53,13 @@ pc_t1t_device::pc_t1t_device(const machine_config &mconfig, device_type type, co { } -pcvideo_t1000_device::pcvideo_t1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pcvideo_t1000_device::pcvideo_t1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pc_t1t_device(mconfig, PCVIDEO_T1000, "Tandy 1000 Graphics Adapter", tag, owner, clock, "tandy_1000_graphics_adapter", __FILE__), m_t1_displayram(nullptr) { } -pcvideo_pcjr_device::pcvideo_pcjr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pcvideo_pcjr_device::pcvideo_pcjr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pc_t1t_device(mconfig, PCVIDEO_PCJR, "PC Jr Graphics Adapter", tag, owner, clock, "pcjr_graphics_adapter", __FILE__), m_jxkanji(nullptr) { diff --git a/src/mame/video/pc_t1t.h b/src/mame/video/pc_t1t.h index bf9fbb3781b..7dc6f981762 100644 --- a/src/mame/video/pc_t1t.h +++ b/src/mame/video/pc_t1t.h @@ -34,7 +34,7 @@ class pc_t1t_device : public device_t, { public: // construction/destruction - pc_t1t_device(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_t1t_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); DECLARE_PALETTE_INIT( pcjr ); @@ -88,7 +88,7 @@ class pcvideo_t1000_device : public pc_t1t_device { public: // construction/destruction - pcvideo_t1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pcvideo_t1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( write ); DECLARE_READ8_MEMBER( videoram_r ); @@ -116,7 +116,7 @@ class pcvideo_pcjr_device : public pc_t1t_device { public: // construction/destruction - pcvideo_pcjr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pcvideo_pcjr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( write ); DECLARE_WRITE_LINE_MEMBER( pcjr_vsync_changed ); diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp index 9b292ea1449..d8c6d2b95e5 100644 --- a/src/mame/video/pcd.cpp +++ b/src/mame/video/pcd.cpp @@ -8,7 +8,7 @@ const device_type PCD_VIDEO = &device_creator; const device_type PCX_VIDEO = &device_creator; -pcdx_video_device::pcdx_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) : +pcdx_video_device::pcdx_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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(*this, ":maincpu"), m_mcu(*this, "graphics"), @@ -19,7 +19,7 @@ pcdx_video_device::pcdx_video_device(const machine_config &mconfig, device_type { } -pcd_video_device::pcd_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pcd_video_device::pcd_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pcdx_video_device(mconfig, PCD_VIDEO, "Siemens PC-D Video", tag, owner, clock, "pcd_video", __FILE__), m_mouse_btn(*this, "MOUSE"), m_mouse_x(*this, "MOUSEX"), @@ -29,7 +29,7 @@ pcd_video_device::pcd_video_device(const machine_config &mconfig, std::string ta { } -pcx_video_device::pcx_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +pcx_video_device::pcx_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pcdx_video_device(mconfig, PCX_VIDEO, "Siemens PC-X Video", tag, owner, clock, "pcx_video", __FILE__), device_serial_interface(mconfig, *this), m_vram(4*1024), diff --git a/src/mame/video/pcd.h b/src/mame/video/pcd.h index ecb22fa307e..f22c2707569 100644 --- a/src/mame/video/pcd.h +++ b/src/mame/video/pcd.h @@ -14,7 +14,7 @@ class pcdx_video_device : public device_t { public: - pcdx_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); + pcdx_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual DECLARE_ADDRESS_MAP(map, 16) = 0; DECLARE_READ8_MEMBER(detect_r); @@ -33,7 +33,7 @@ protected: class pcd_video_device : public pcdx_video_device { public: - pcd_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pcd_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual DECLARE_ADDRESS_MAP(map, 16) override; DECLARE_WRITE8_MEMBER(vram_sw_w); @@ -78,7 +78,7 @@ class pcx_video_device : public pcdx_video_device, public device_serial_interface { public: - pcx_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pcx_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast(device).m_txd_handler.set_callback(object); } virtual DECLARE_ADDRESS_MAP(map, 16) override; diff --git a/src/mame/video/powervr2.cpp b/src/mame/video/powervr2.cpp index 4942a3ab432..4907b985f86 100644 --- a/src/mame/video/powervr2.cpp +++ b/src/mame/video/powervr2.cpp @@ -912,13 +912,13 @@ WRITE32_MEMBER( powervr2_device::softreset_w ) COMBINE_DATA(&softreset); if (softreset & 1) { #if DEBUG_PVRTA - logerror("%s: TA soft reset\n", tag().c_str()); + logerror("%s: TA soft reset\n", tag()); #endif listtype_used=0; } if (softreset & 2) { #if DEBUG_PVRTA - logerror("%s: Core Pipeline soft reset\n", tag().c_str()); + logerror("%s: Core Pipeline soft reset\n", tag()); #endif if (start_render_received == 1) { for (auto & elem : grab) @@ -929,7 +929,7 @@ WRITE32_MEMBER( powervr2_device::softreset_w ) } if (softreset & 4) { #if DEBUG_PVRTA - logerror("%s: sdram I/F soft reset\n", tag().c_str()); + logerror("%s: sdram I/F soft reset\n", tag()); #endif } } @@ -939,7 +939,7 @@ WRITE32_MEMBER( powervr2_device::startrender_w ) dc_state *state = machine().driver_data(); g_profiler.start(PROFILER_USER1); #if DEBUG_PVRTA - logerror("%s: Start render, region=%08x, params=%08x\n", tag().c_str(), region_base, param_base); + logerror("%s: Start render, region=%08x, params=%08x\n", tag(), region_base, param_base); #endif // select buffer to draw using param_base @@ -1458,7 +1458,7 @@ READ32_MEMBER( powervr2_device::ta_yuv_tex_base_r ) WRITE32_MEMBER( powervr2_device::ta_yuv_tex_base_w ) { COMBINE_DATA(&ta_yuv_tex_base); - logerror("%s: ta_yuv_tex_base = %08x\n", tag().c_str(), ta_yuv_tex_base); + logerror("%s: ta_yuv_tex_base = %08x\n", tag(), ta_yuv_tex_base); ta_yuv_index = 0; ta_yuv_x = 0; @@ -1476,7 +1476,7 @@ WRITE32_MEMBER( powervr2_device::ta_yuv_tex_ctrl_w ) COMBINE_DATA(&ta_yuv_tex_ctrl); ta_yuv_x_size = ((ta_yuv_tex_ctrl & 0x3f)+1)*16; ta_yuv_y_size = (((ta_yuv_tex_ctrl>>8) & 0x3f)+1)*16; - logerror("%s: ta_yuv_tex_ctrl = %08x\n", tag().c_str(), ta_yuv_tex_ctrl); + logerror("%s: ta_yuv_tex_ctrl = %08x\n", tag(), ta_yuv_tex_ctrl); if(ta_yuv_tex_ctrl & 0x01010000) fatalerror("YUV with setting %08x",ta_yuv_tex_ctrl); } @@ -3599,7 +3599,7 @@ void powervr2_device::pvr_dma_execute(address_space &space) machine().scheduler().timer_set(state->m_maincpu->cycles_to_attotime(m_pvr_dma.size/4), timer_expired_delegate(FUNC(powervr2_device::pvr_dma_irq), this)); } -powervr2_device::powervr2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +powervr2_device::powervr2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, POWERVR2, "PowerVR 2", tag, owner, clock, "powervr2", __FILE__), device_video_interface(mconfig, *this), irq_cb(*this), diff --git a/src/mame/video/powervr2.h b/src/mame/video/powervr2.h index 1474f65455c..fede10e2061 100644 --- a/src/mame/video/powervr2.h +++ b/src/mame/video/powervr2.h @@ -136,7 +136,7 @@ public: int scanline; int next_y; - powervr2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + powervr2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template void set_irq_cb(_cb cb) { irq_cb.set_callback(cb); } DECLARE_READ32_MEMBER( id_r ); diff --git a/src/mame/video/ppu2c0x.cpp b/src/mame/video/ppu2c0x.cpp index b7bdc9575be..0c15efb3c70 100644 --- a/src/mame/video/ppu2c0x.cpp +++ b/src/mame/video/ppu2c0x.cpp @@ -120,7 +120,7 @@ void ppu2c0x_device::device_config_complete() m_vidaccess_callback_proc = ppu2c0x_vidaccess_delegate(); } -ppu2c0x_device::ppu2c0x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +ppu2c0x_device::ppu2c0x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), device_video_interface(mconfig, *this), @@ -159,44 +159,44 @@ ppu2c0x_device::ppu2c0x_device(const machine_config &mconfig, device_type type, // NTSC NES -ppu2c02_device::ppu2c02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C02, "2C02 PPU", tag, owner, clock, "ppu2c02", __FILE__) +ppu2c02_device::ppu2c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C02, "2C02 PPU", tag, owner, clock, "ppu2c02", __FILE__) { } // Playchoice 10 -ppu2c03b_device::ppu2c03b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C03B, "2C03B PPU", tag, owner, clock, "ppu2c03b", __FILE__) +ppu2c03b_device::ppu2c03b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C03B, "2C03B PPU", tag, owner, clock, "ppu2c03b", __FILE__) { } // Vs. Unisystem -ppu2c04_device::ppu2c04_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C04, "2C04 PPU", tag, owner, clock, "ppu2c04", __FILE__) +ppu2c04_device::ppu2c04_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C04, "2C04 PPU", tag, owner, clock, "ppu2c04", __FILE__) { } // PAL NES -ppu2c07_device::ppu2c07_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C07, "2C07 PPU", tag, owner, clock, "ppu2c07", __FILE__) +ppu2c07_device::ppu2c07_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C07, "2C07 PPU", tag, owner, clock, "ppu2c07", __FILE__) { m_scanlines_per_frame = PPU_PAL_SCANLINES_PER_FRAME; } // The PPU_2C05 variants have different protection value, set at device start, but otherwise are all the same... // Vs. Unisystem (Ninja Jajamaru Kun) -ppu2c05_01_device::ppu2c05_01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_01, "2C05_01 PPU", tag, owner, clock, "ppu2c05_01", __FILE__) +ppu2c05_01_device::ppu2c05_01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_01, "2C05_01 PPU", tag, owner, clock, "ppu2c05_01", __FILE__) { m_security_value = 0x1b; // game (jajamaru) doesn't seem to ever actually check it } // Vs. Unisystem (Mighty Bomb Jack) -ppu2c05_02_device::ppu2c05_02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_02, "2C05_02 PPU", tag, owner, clock, "ppu2c05_02", __FILE__) +ppu2c05_02_device::ppu2c05_02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_02, "2C05_02 PPU", tag, owner, clock, "ppu2c05_02", __FILE__) { m_security_value = 0x3d; } // Vs. Unisystem (Gumshoe) -ppu2c05_03_device::ppu2c05_03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_03, "2C05_03 PPU", tag, owner, clock, "ppu2c05_03", __FILE__) +ppu2c05_03_device::ppu2c05_03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_03, "2C05_03 PPU", tag, owner, clock, "ppu2c05_03", __FILE__) { m_security_value = 0x1c; } // Vs. Unisystem (Top Gun) -ppu2c05_04_device::ppu2c05_04_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_04, "2C05_04 PPU", tag, owner, clock, "ppu2c05_04", __FILE__) +ppu2c05_04_device::ppu2c05_04_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_04, "2C05_04 PPU", tag, owner, clock, "ppu2c05_04", __FILE__) { m_security_value = 0x1b; } @@ -1064,7 +1064,7 @@ READ8_MEMBER( ppu2c0x_device::read ) { if (offset >= PPU_MAX_REG) { - logerror("PPU %s: Attempting to read past the chip: offset %x\n", this->tag().c_str(), offset); + logerror("PPU %s: Attempting to read past the chip: offset %x\n", this->tag(), offset); offset &= PPU_MAX_REG - 1; } @@ -1132,7 +1132,7 @@ WRITE8_MEMBER( ppu2c0x_device::write ) if (offset >= PPU_MAX_REG) { - logerror("PPU %s: Attempting to write past the chip: offset %x, data %x\n", this->tag().c_str(), offset, data); + logerror("PPU %s: Attempting to write past the chip: offset %x, data %x\n", this->tag(), offset, data); offset &= PPU_MAX_REG - 1; } diff --git a/src/mame/video/ppu2c0x.h b/src/mame/video/ppu2c0x.h index 9a99fed53ff..8a21d51f0b8 100644 --- a/src/mame/video/ppu2c0x.h +++ b/src/mame/video/ppu2c0x.h @@ -137,7 +137,7 @@ class ppu2c0x_device : public device_t, { public: // construction/destruction - ppu2c0x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ppu2c0x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -152,7 +152,7 @@ public: // address space configurations const address_space_config m_space_config; - static void set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu.set_tag(tag); } + static void set_cpu_tag(device_t &device, const char *tag) { downcast(device).m_cpu.set_tag(tag); } static void set_color_base(device_t &device, int colorbase) { downcast(device).m_color_base = colorbase; } static void set_nmi_delegate(device_t &device, ppu2c0x_nmi_delegate cb); @@ -243,42 +243,42 @@ private: class ppu2c02_device : public ppu2c0x_device { public: - ppu2c02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppu2c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppu2c03b_device : public ppu2c0x_device { public: - ppu2c03b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppu2c03b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppu2c04_device : public ppu2c0x_device { public: - ppu2c04_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppu2c04_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppu2c07_device : public ppu2c0x_device { public: - ppu2c07_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppu2c07_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppu2c05_01_device : public ppu2c0x_device { public: - ppu2c05_01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppu2c05_01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppu2c05_02_device : public ppu2c0x_device { public: - ppu2c05_02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppu2c05_02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppu2c05_03_device : public ppu2c0x_device { public: - ppu2c05_03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppu2c05_03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class ppu2c05_04_device : public ppu2c0x_device { public: - ppu2c05_04_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ppu2c05_04_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/mame/video/sega16sp.cpp b/src/mame/video/sega16sp.cpp index 389016c36d7..4b7e19a1c81 100644 --- a/src/mame/video/sega16sp.cpp +++ b/src/mame/video/sega16sp.cpp @@ -36,7 +36,7 @@ const device_type SEGA_YBOARD_SPRITES = &device_creator; -segaic16_video_device::segaic16_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segaic16_video_device::segaic16_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGAIC16VID, "Sega 16-bit Video", tag, owner, clock, "segaic16_video", __FILE__), device_video_interface(mconfig, *this), m_display_enable(0), @@ -391,7 +391,7 @@ segaic16_video_device::segaic16_video_device(const machine_config &mconfig, std: // gfx decoder //------------------------------------------------- -void segaic16_video_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void segaic16_video_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } diff --git a/src/mame/video/segaic16.h b/src/mame/video/segaic16.h index 4e2fdc58409..ff0c4f754e1 100644 --- a/src/mame/video/segaic16.h +++ b/src/mame/video/segaic16.h @@ -95,11 +95,11 @@ class segaic16_video_device : public device_t, public device_video_interface { public: - segaic16_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segaic16_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~segaic16_video_device() {} // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); UINT8 m_display_enable; optional_shared_ptr m_tileram; diff --git a/src/mame/video/segaic16_road.cpp b/src/mame/video/segaic16_road.cpp index ae38386b7fb..699370ac0c6 100644 --- a/src/mame/video/segaic16_road.cpp +++ b/src/mame/video/segaic16_road.cpp @@ -8,7 +8,7 @@ const device_type SEGAIC16_ROAD = &device_creator; -segaic16_road_device::segaic16_road_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segaic16_road_device::segaic16_road_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGAIC16_ROAD, "Sega 16-bit Road Generator", tag, owner, clock, "segaic16_road", __FILE__) { } diff --git a/src/mame/video/segaic16_road.h b/src/mame/video/segaic16_road.h index 0292ea73fc5..c37bb5ef279 100644 --- a/src/mame/video/segaic16_road.h +++ b/src/mame/video/segaic16_road.h @@ -41,7 +41,7 @@ struct road_info class segaic16_road_device : public device_t { public: - segaic16_road_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segaic16_road_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~segaic16_road_device() {} UINT16 *segaic16_roadram_0; diff --git a/src/mame/video/segaic24.cpp b/src/mame/video/segaic24.cpp index 8f699286e7c..57c848287dc 100644 --- a/src/mame/video/segaic24.cpp +++ b/src/mame/video/segaic24.cpp @@ -23,7 +23,7 @@ const device_type S24SPRITE = &device_creator; const device_type S24MIXER = &device_creator; -segas24_tile::segas24_tile(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segas24_tile::segas24_tile(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, S24TILE, "Sega System 24 Tilemap", tag, owner, clock, "segas24_tile", __FILE__), m_gfxdecode(*this), m_palette(*this) @@ -35,7 +35,7 @@ segas24_tile::segas24_tile(const machine_config &mconfig, std::string tag, devic // gfx decoder //------------------------------------------------- -void segas24_tile::static_set_gfxdecode_tag(device_t &device, std::string tag) +void segas24_tile::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -45,7 +45,7 @@ void segas24_tile::static_set_gfxdecode_tag(device_t &device, std::string tag) // palette device //------------------------------------------------- -void segas24_tile::static_set_palette_tag(device_t &device, std::string tag) +void segas24_tile::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } @@ -602,7 +602,7 @@ WRITE32_MEMBER(segas24_tile::char32_w) } -segas24_sprite::segas24_sprite(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segas24_sprite::segas24_sprite(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, S24SPRITE, "Sega System 24 Sprites", tag, owner, clock, "segas24_sprite", __FILE__) { } @@ -847,7 +847,7 @@ READ16_MEMBER(segas24_sprite::read) } -segas24_mixer::segas24_mixer(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segas24_mixer::segas24_mixer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, S24MIXER, "Sega System 24 Mixer", tag, owner, clock, "segas24_mixer", __FILE__) { } diff --git a/src/mame/video/segaic24.h b/src/mame/video/segaic24.h index cf0cee6f1b0..51165e32ac1 100644 --- a/src/mame/video/segaic24.h +++ b/src/mame/video/segaic24.h @@ -30,11 +30,11 @@ class segas24_tile : public device_t friend class segas24_tile_config; public: - segas24_tile(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segas24_tile(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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_tile_mask(device_t &device, UINT16 tile_mask); DECLARE_READ16_MEMBER(tile_r); @@ -88,7 +88,7 @@ class segas24_sprite : public device_t friend class segas24_sprite_config; public: - segas24_sprite(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segas24_sprite(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ16_MEMBER(read); DECLARE_WRITE16_MEMBER(write); @@ -108,7 +108,7 @@ class segas24_mixer : public device_t friend class segas24_mixer_config; public: - segas24_mixer(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segas24_mixer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ16_MEMBER(read); DECLARE_WRITE16_MEMBER(write); diff --git a/src/mame/video/seibu_crtc.cpp b/src/mame/video/seibu_crtc.cpp index 48a0c5791a8..c0a4bdc3872 100644 --- a/src/mame/video/seibu_crtc.cpp +++ b/src/mame/video/seibu_crtc.cpp @@ -220,7 +220,7 @@ WRITE16_MEMBER( seibu_crtc_device::layer_scroll_base_w) // seibu_crtc_device - constructor //------------------------------------------------- -seibu_crtc_device::seibu_crtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +seibu_crtc_device::seibu_crtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEIBU_CRTC, "Seibu CRT Controller", tag, owner, clock, "seibu_crtc", __FILE__), device_memory_interface(mconfig, *this), device_video_interface(mconfig, *this), diff --git a/src/mame/video/seibu_crtc.h b/src/mame/video/seibu_crtc.h index 06ba7f58966..37f04e31177 100644 --- a/src/mame/video/seibu_crtc.h +++ b/src/mame/video/seibu_crtc.h @@ -41,7 +41,7 @@ class seibu_crtc_device : public device_t, { public: // construction/destruction - seibu_crtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + seibu_crtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_layer_en_callback(device_t &device, _Object object) { return downcast(device).m_layer_en_cb.set_callback(object); } template static devcb_base &set_layer_scroll_callback(device_t &device, _Object object) { return downcast(device).m_layer_scroll_cb.set_callback(object); } diff --git a/src/mame/video/seta001.cpp b/src/mame/video/seta001.cpp index dfdddb0d178..d0ff7874fb3 100644 --- a/src/mame/video/seta001.cpp +++ b/src/mame/video/seta001.cpp @@ -31,7 +31,7 @@ const device_type SETA001_SPRITE = &device_creator; -seta001_device::seta001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +seta001_device::seta001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SETA001_SPRITE, "Seta SETA001 Sprite", tag, owner, clock, "seta001", __FILE__), m_gfxdecode(*this), m_palette(*this) @@ -43,7 +43,7 @@ seta001_device::seta001_device(const machine_config &mconfig, std::string tag, d // gfx decoder //------------------------------------------------- -void seta001_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void seta001_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -53,7 +53,7 @@ void seta001_device::static_set_gfxdecode_tag(device_t &device, std::string tag) // palette device //------------------------------------------------- -void seta001_device::static_set_palette_tag(device_t &device, std::string tag) +void seta001_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/seta001.h b/src/mame/video/seta001.h index 04c4af6317d..b7fea3ce96e 100644 --- a/src/mame/video/seta001.h +++ b/src/mame/video/seta001.h @@ -11,11 +11,11 @@ typedef device_delegate gfxbank_cb_delegate; class seta001_device : public device_t { public: - seta001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + seta001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_gfxbank_callback(device_t &device, gfxbank_cb_delegate callback) { downcast(device).m_gfxbank_cb = callback; } DECLARE_WRITE8_MEMBER( spritebgflag_w8 ); diff --git a/src/mame/video/sknsspr.cpp b/src/mame/video/sknsspr.cpp index e81c023f4ac..1431edd20bb 100644 --- a/src/mame/video/sknsspr.cpp +++ b/src/mame/video/sknsspr.cpp @@ -21,7 +21,7 @@ const device_type SKNS_SPRITE = &device_creator; -sknsspr_device::sknsspr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sknsspr_device::sknsspr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SKNS_SPRITE, "SKNS Sprite", tag, owner, clock, "sknsspr", __FILE__), device_video_interface(mconfig, *this) { diff --git a/src/mame/video/sknsspr.h b/src/mame/video/sknsspr.h index 2195ff2ebc9..2e998be79ae 100644 --- a/src/mame/video/sknsspr.h +++ b/src/mame/video/sknsspr.h @@ -5,7 +5,7 @@ class sknsspr_device : public device_t, public device_video_interface { public: - sknsspr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sknsspr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void skns_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT32* spriteram_source, size_t spriteram_size, UINT8* gfx_source, size_t gfx_length, UINT32* sprite_regs); void skns_sprite_kludge(int x, int y); diff --git a/src/mame/video/st0020.cpp b/src/mame/video/st0020.cpp index b0d35189a43..8d61d56d56f 100644 --- a/src/mame/video/st0020.cpp +++ b/src/mame/video/st0020.cpp @@ -15,7 +15,7 @@ const device_type ST0020_SPRITES = &device_creator; -st0020_device::st0020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +st0020_device::st0020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ST0020_SPRITES, "Seta ST0020 Sprites", tag, owner, clock, "st0020", __FILE__), m_gfxdecode(*this), m_palette(*this) @@ -29,7 +29,7 @@ st0020_device::st0020_device(const machine_config &mconfig, std::string tag, dev // gfx decoder //------------------------------------------------- -void st0020_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void st0020_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -39,7 +39,7 @@ void st0020_device::static_set_gfxdecode_tag(device_t &device, std::string tag) // palette device //------------------------------------------------- -void st0020_device::static_set_palette_tag(device_t &device, std::string tag) +void st0020_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/st0020.h b/src/mame/video/st0020.h index 34e2526595c..0282acd7699 100644 --- a/src/mame/video/st0020.h +++ b/src/mame/video/st0020.h @@ -6,11 +6,11 @@ class st0020_device : public device_t { public: - st0020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + st0020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_is_st0032(device_t &device, int is_st0032); static void set_is_jclub2o(device_t &device, int is_jclub2o); diff --git a/src/mame/video/stic.cpp b/src/mame/video/stic.cpp index 65d9db01eb0..350544e8f90 100644 --- a/src/mame/video/stic.cpp +++ b/src/mame/video/stic.cpp @@ -17,7 +17,7 @@ const device_type STIC = &device_creator; // stic_device - constructor //------------------------------------------------- -stic_device::stic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +stic_device::stic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, STIC, "STIC (Standard Television Interface Chip) Video Chip", tag, owner, clock, "stic", __FILE__), m_grom(*this, "grom"), m_x_scale(1), diff --git a/src/mame/video/stic.h b/src/mame/video/stic.h index df1538cb6f2..41d39a3790d 100644 --- a/src/mame/video/stic.h +++ b/src/mame/video/stic.h @@ -476,7 +476,7 @@ class stic_device : public device_t { public: // construction/destruction - stic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + stic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~stic_device(); DECLARE_READ16_MEMBER(read); diff --git a/src/mame/video/tc0080vco.cpp b/src/mame/video/tc0080vco.cpp index 7e5f8358a5c..0bf5aec9b62 100644 --- a/src/mame/video/tc0080vco.cpp +++ b/src/mame/video/tc0080vco.cpp @@ -77,7 +77,7 @@ this seems to be the only zoom feature actually used in the games. const device_type TC0080VCO = &device_creator; -tc0080vco_device::tc0080vco_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0080vco_device::tc0080vco_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0080VCO, "Taito TC0080VCO", tag, owner, clock, "tc0080vco", __FILE__), m_ram(nullptr), m_bg0_ram_0(nullptr), @@ -113,7 +113,7 @@ tc0080vco_device::tc0080vco_device(const machine_config &mconfig, std::string ta // gfx decoder //------------------------------------------------- -void tc0080vco_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void tc0080vco_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -123,7 +123,7 @@ void tc0080vco_device::static_set_gfxdecode_tag(device_t &device, std::string ta // palette device //------------------------------------------------- -void tc0080vco_device::static_set_palette_tag(device_t &device, std::string tag) +void tc0080vco_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/tc0080vco.h b/src/mame/video/tc0080vco.h index c51baf4eb7c..c842e3a57b5 100644 --- a/src/mame/video/tc0080vco.h +++ b/src/mame/video/tc0080vco.h @@ -6,12 +6,12 @@ class tc0080vco_device : public device_t { public: - tc0080vco_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0080vco_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0080vco_device() {} // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_gfx_region(device_t &device, int gfxnum) { downcast(device).m_gfxnum = gfxnum; } static void set_tx_region(device_t &device, int txnum) { downcast(device).m_txnum = txnum; } static void set_offsets(device_t &device, int x_offset, int y_offset) diff --git a/src/mame/video/tc0100scn.cpp b/src/mame/video/tc0100scn.cpp index 772d4e2ebd7..eeaf74a7dd4 100644 --- a/src/mame/video/tc0100scn.cpp +++ b/src/mame/video/tc0100scn.cpp @@ -148,7 +148,7 @@ the wide tilemap mode) const device_type TC0100SCN = &device_creator; -tc0100scn_device::tc0100scn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0100scn_device::tc0100scn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0100SCN, "Taito TC0100SCN", tag, owner, clock, "tc0100scn", __FILE__), m_ram(nullptr), m_bg_ram(nullptr), @@ -188,7 +188,7 @@ tc0100scn_device::tc0100scn_device(const machine_config &mconfig, std::string ta // gfx decoder //------------------------------------------------- -void tc0100scn_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void tc0100scn_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -198,7 +198,7 @@ void tc0100scn_device::static_set_gfxdecode_tag(device_t &device, std::string ta // palette device //------------------------------------------------- -void tc0100scn_device::static_set_palette_tag(device_t &device, std::string tag) +void tc0100scn_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/tc0100scn.h b/src/mame/video/tc0100scn.h index 9d3acb41dae..5f07bbee7f2 100644 --- a/src/mame/video/tc0100scn.h +++ b/src/mame/video/tc0100scn.h @@ -6,12 +6,12 @@ class tc0100scn_device : public device_t { public: - tc0100scn_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0100scn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0100scn_device() {} // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_gfx_region(device_t &device, int gfxregion) { downcast(device).m_gfxnum = gfxregion; } static void set_tx_region(device_t &device, int txregion) { downcast(device).m_txnum = txregion; } static void set_multiscr_xoffs(device_t &device, int xoffs) { downcast(device).m_multiscrn_xoffs = xoffs; } diff --git a/src/mame/video/tc0110pcr.cpp b/src/mame/video/tc0110pcr.cpp index 203eba4da94..19eb43d7938 100644 --- a/src/mame/video/tc0110pcr.cpp +++ b/src/mame/video/tc0110pcr.cpp @@ -20,7 +20,7 @@ The data bus is 16 bits wide. const device_type TC0110PCR = &device_creator; -tc0110pcr_device::tc0110pcr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0110pcr_device::tc0110pcr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0110PCR, "Taito TC0110PCR", tag, owner, clock, "tc0110pcr", __FILE__), m_ram(nullptr), m_type(0), @@ -34,7 +34,7 @@ tc0110pcr_device::tc0110pcr_device(const machine_config &mconfig, std::string ta // palette device //------------------------------------------------- -void tc0110pcr_device::static_set_palette_tag(device_t &device, std::string tag) +void tc0110pcr_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/tc0110pcr.h b/src/mame/video/tc0110pcr.h index a9e21260c6d..1e8df12c79f 100644 --- a/src/mame/video/tc0110pcr.h +++ b/src/mame/video/tc0110pcr.h @@ -7,7 +7,7 @@ class tc0110pcr_device : public device_t { public: - tc0110pcr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0110pcr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0110pcr_device() {} DECLARE_READ16_MEMBER( word_r ); @@ -18,7 +18,7 @@ public: void restore_colors(); - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_palette_tag(device_t &device, const char *tag); protected: // device-level overrides diff --git a/src/mame/video/tc0150rod.cpp b/src/mame/video/tc0150rod.cpp index c37ecbaabcb..6077df445e3 100644 --- a/src/mame/video/tc0150rod.cpp +++ b/src/mame/video/tc0150rod.cpp @@ -14,7 +14,7 @@ Road generator. Two roads allow for forking. Gfx data fetched from ROM. Refer to const device_type TC0150ROD = &device_creator; -tc0150rod_device::tc0150rod_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0150rod_device::tc0150rod_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0150ROD, "Taito TC0150ROD", tag, owner, clock, "tc0150rod", __FILE__), m_roadgfx(nullptr) { diff --git a/src/mame/video/tc0150rod.h b/src/mame/video/tc0150rod.h index 11f9275c6b0..723e97dea7c 100644 --- a/src/mame/video/tc0150rod.h +++ b/src/mame/video/tc0150rod.h @@ -6,7 +6,7 @@ class tc0150rod_device : public device_t { public: - tc0150rod_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0150rod_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0150rod_device() {} DECLARE_READ16_MEMBER( word_r ); diff --git a/src/mame/video/tc0180vcu.cpp b/src/mame/video/tc0180vcu.cpp index 1da84ea316c..9420114b3d9 100644 --- a/src/mame/video/tc0180vcu.cpp +++ b/src/mame/video/tc0180vcu.cpp @@ -11,7 +11,7 @@ const device_type TC0180VCU = &device_creator; -tc0180vcu_device::tc0180vcu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0180vcu_device::tc0180vcu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0180VCU, "Taito TC0180VCU", tag, owner, clock, "tc0180vcu", __FILE__), m_ram(nullptr), //m_scrollram(NULL), @@ -32,7 +32,7 @@ tc0180vcu_device::tc0180vcu_device(const machine_config &mconfig, std::string ta // gfx decoder //------------------------------------------------- -void tc0180vcu_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void tc0180vcu_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } diff --git a/src/mame/video/tc0180vcu.h b/src/mame/video/tc0180vcu.h index 33e817f6a73..ddd7fbe92b4 100644 --- a/src/mame/video/tc0180vcu.h +++ b/src/mame/video/tc0180vcu.h @@ -6,11 +6,11 @@ class tc0180vcu_device : public device_t { public: - tc0180vcu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0180vcu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0180vcu_device() {} // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void set_bg_colorbase(device_t &device, int color) { downcast(device).m_bg_color_base = color; } static void set_fg_colorbase(device_t &device, int color) { downcast(device).m_fg_color_base = color; } static void set_tx_colorbase(device_t &device, int color) { downcast(device).m_tx_color_base = color; } diff --git a/src/mame/video/tc0280grd.cpp b/src/mame/video/tc0280grd.cpp index ee7abe45cc6..d021893c1a7 100644 --- a/src/mame/video/tc0280grd.cpp +++ b/src/mame/video/tc0280grd.cpp @@ -27,7 +27,7 @@ control registers: const device_type TC0280GRD = &device_creator; -tc0280grd_device::tc0280grd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0280grd_device::tc0280grd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0280GRD, "Taito TC0280GRD & TC0430GRW", tag, owner, clock, "tc0280grd", __FILE__), m_ram(nullptr), //m_ctrl[8](0), @@ -41,7 +41,7 @@ tc0280grd_device::tc0280grd_device(const machine_config &mconfig, std::string ta // gfx decoder //------------------------------------------------- -void tc0280grd_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void tc0280grd_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } diff --git a/src/mame/video/tc0280grd.h b/src/mame/video/tc0280grd.h index ea8017e3132..d9f8ffc2ee4 100644 --- a/src/mame/video/tc0280grd.h +++ b/src/mame/video/tc0280grd.h @@ -6,11 +6,11 @@ class tc0280grd_device : public device_t { public: - tc0280grd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0280grd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0280grd_device() {} // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void set_gfx_region(device_t &device, int gfxregion) { downcast(device).m_gfxnum = gfxregion; } DECLARE_READ16_MEMBER( tc0280grd_word_r ); diff --git a/src/mame/video/tc0360pri.cpp b/src/mame/video/tc0360pri.cpp index 4a92c24ecbe..e3620cb74ac 100644 --- a/src/mame/video/tc0360pri.cpp +++ b/src/mame/video/tc0360pri.cpp @@ -45,7 +45,7 @@ each one of them can declare to have four different priority levels. const device_type TC0360PRI = &device_creator; -tc0360pri_device::tc0360pri_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0360pri_device::tc0360pri_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0360PRI, "Taito TC0360PRI", tag, owner, clock, "tc0360pri", __FILE__) { } diff --git a/src/mame/video/tc0360pri.h b/src/mame/video/tc0360pri.h index 2c871dcefa3..3a3981a0f4c 100644 --- a/src/mame/video/tc0360pri.h +++ b/src/mame/video/tc0360pri.h @@ -6,7 +6,7 @@ class tc0360pri_device : public device_t { public: - tc0360pri_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0360pri_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0360pri_device() {} DECLARE_WRITE8_MEMBER( write ); diff --git a/src/mame/video/tc0480scp.cpp b/src/mame/video/tc0480scp.cpp index d76ba1ed0a4..83b0ede8c18 100644 --- a/src/mame/video/tc0480scp.cpp +++ b/src/mame/video/tc0480scp.cpp @@ -151,7 +151,7 @@ Control registers const device_type TC0480SCP = &device_creator; -tc0480scp_device::tc0480scp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0480scp_device::tc0480scp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0480SCP, "Taito TC0480SCP", tag, owner, clock, "tc0480scp", __FILE__), m_tx_ram(nullptr), m_char_ram(nullptr), @@ -187,7 +187,7 @@ tc0480scp_device::tc0480scp_device(const machine_config &mconfig, std::string ta // gfx decoder //------------------------------------------------- -void tc0480scp_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void tc0480scp_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -197,7 +197,7 @@ void tc0480scp_device::static_set_gfxdecode_tag(device_t &device, std::string ta // palette device //------------------------------------------------- -void tc0480scp_device::static_set_palette_tag(device_t &device, std::string tag) +void tc0480scp_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/tc0480scp.h b/src/mame/video/tc0480scp.h index 4025408af78..12c83523234 100644 --- a/src/mame/video/tc0480scp.h +++ b/src/mame/video/tc0480scp.h @@ -6,12 +6,12 @@ class tc0480scp_device : public device_t { public: - tc0480scp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0480scp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0480scp_device() {} // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_gfx_region(device_t &device, int gfxregion) { downcast(device).m_gfxnum = gfxregion; } static void set_tx_region(device_t &device, int txregion) { downcast(device).m_txnum = txregion; } static void set_col_base(device_t &device, int col) { downcast(device).m_col_base = col; } diff --git a/src/mame/video/tc0780fpa.cpp b/src/mame/video/tc0780fpa.cpp index bad0a52bbc1..9f9dab9b92f 100644 --- a/src/mame/video/tc0780fpa.cpp +++ b/src/mame/video/tc0780fpa.cpp @@ -392,7 +392,7 @@ void tc0780fpa_renderer::render(UINT16 *polygon_fifo, int length) const device_type TC0780FPA = &device_creator; -tc0780fpa_device::tc0780fpa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc0780fpa_device::tc0780fpa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC0780FPA, "TC0780FPA Polygon Renderer", tag, owner, clock, "tc0780fpa", __FILE__), device_video_interface(mconfig, *this) { diff --git a/src/mame/video/tc0780fpa.h b/src/mame/video/tc0780fpa.h index 314b074bd2c..40d5955ef9c 100644 --- a/src/mame/video/tc0780fpa.h +++ b/src/mame/video/tc0780fpa.h @@ -45,7 +45,7 @@ private: class tc0780fpa_device : public device_t, public device_video_interface { public: - tc0780fpa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc0780fpa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0780fpa_device() {} void draw(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/video/tecmo_mix.cpp b/src/mame/video/tecmo_mix.cpp index 425a8c734d2..7e1a4414fa5 100644 --- a/src/mame/video/tecmo_mix.cpp +++ b/src/mame/video/tecmo_mix.cpp @@ -7,7 +7,7 @@ const device_type TECMO_MIXER = &device_creator; -tecmo_mix_device::tecmo_mix_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tecmo_mix_device::tecmo_mix_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TECMO_MIXER, "Tecmo 16-bit Mixer", tag, owner, clock, "tecmo_mix", __FILE__), device_video_interface(mconfig, *this), m_sprpri_shift(0), diff --git a/src/mame/video/tecmo_mix.h b/src/mame/video/tecmo_mix.h index 9fa762b1367..21ac7b83bf6 100644 --- a/src/mame/video/tecmo_mix.h +++ b/src/mame/video/tecmo_mix.h @@ -8,7 +8,7 @@ class tecmo_mix_device : public device_t, public device_video_interface { public: - tecmo_mix_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tecmo_mix_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void mix_bitmaps(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, palette_device* palette, bitmap_ind16* bitmap_bg, bitmap_ind16* bitmap_fg, bitmap_ind16* bitmap_tx, bitmap_ind16* bitmap_sp); static void set_mixer_shifts(device_t &device, int sprpri_shift, int sprbln_shift, int sprcol_shift); diff --git a/src/mame/video/tecmo_spr.cpp b/src/mame/video/tecmo_spr.cpp index bfc448f2a8a..8c763935cbd 100644 --- a/src/mame/video/tecmo_spr.cpp +++ b/src/mame/video/tecmo_spr.cpp @@ -17,7 +17,7 @@ const device_type TECMO_SPRITE = &device_creator; -tecmo_spr_device::tecmo_spr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tecmo_spr_device::tecmo_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TECMO_SPRITE, "Tecmo Chained Sprites", tag, owner, clock, "tecmo_spr", __FILE__), m_gfxregion(0), m_bootleg(0), diff --git a/src/mame/video/tecmo_spr.h b/src/mame/video/tecmo_spr.h index 05c5f38616b..f98a09e93bc 100644 --- a/src/mame/video/tecmo_spr.h +++ b/src/mame/video/tecmo_spr.h @@ -7,7 +7,7 @@ class tecmo_spr_device : public device_t { public: - tecmo_spr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tecmo_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_gfx_region(device_t &device, int gfxregion); static void set_bootleg(device_t &device, int bootleg); static void set_yoffset(device_t &device, int bootleg); diff --git a/src/mame/video/tia.cpp b/src/mame/video/tia.cpp index 46caf9509d7..c616ce695b0 100644 --- a/src/mame/video/tia.cpp +++ b/src/mame/video/tia.cpp @@ -351,7 +351,7 @@ PALETTE_INIT_MEMBER(tia_pal_video_device, tia_pal) extend_palette( palette ); } -tia_video_device::tia_video_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, std::string tag, device_t *owner, UINT32 clock) +tia_video_device::tia_video_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_video_interface(mconfig, *this), m_read_input_port_cb(*this), @@ -367,7 +367,7 @@ const device_type TIA_PAL_VIDEO = &device_creator; // tia_pal_video_device - constructor //------------------------------------------------- -tia_pal_video_device::tia_pal_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tia_pal_video_device::tia_pal_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tia_video_device(mconfig, TIA_PAL_VIDEO, "TIA Video (PAL)", "tia_pal_video", tag, owner, clock) { } @@ -394,7 +394,7 @@ const device_type TIA_NTSC_VIDEO = &device_creator; // tia_ntsc_video_device - constructor //------------------------------------------------- -tia_ntsc_video_device::tia_ntsc_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tia_ntsc_video_device::tia_ntsc_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tia_video_device(mconfig, TIA_NTSC_VIDEO, "TIA Video (NTSC)", "tia_ntsc_video", tag, owner, clock) { } diff --git a/src/mame/video/tia.h b/src/mame/video/tia.h index 13d8831c8c6..4ed1797cd2f 100644 --- a/src/mame/video/tia.h +++ b/src/mame/video/tia.h @@ -61,7 +61,7 @@ public: protected: // construction/destruction - tia_video_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, std::string tag, device_t *owner, UINT32 clock); + tia_video_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, UINT32 clock); // device-level overrides virtual void device_start() override; @@ -208,7 +208,7 @@ private: class tia_pal_video_device : public tia_video_device { public: - tia_pal_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tia_pal_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_PALETTE_INIT(tia_pal); @@ -219,7 +219,7 @@ protected: class tia_ntsc_video_device : public tia_video_device { public: - tia_ntsc_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tia_ntsc_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_PALETTE_INIT(tia_ntsc); diff --git a/src/mame/video/tigeroad_spr.cpp b/src/mame/video/tigeroad_spr.cpp index cb747823300..95c06e40e12 100644 --- a/src/mame/video/tigeroad_spr.cpp +++ b/src/mame/video/tigeroad_spr.cpp @@ -21,7 +21,7 @@ const device_type TIGEROAD_SPRITE = &device_creator; -tigeroad_spr_device::tigeroad_spr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tigeroad_spr_device::tigeroad_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TIGEROAD_SPRITE, "Simple Capcom (Tiger Road) Sprite", tag, owner, clock, "tigeroad_spr", __FILE__) { } diff --git a/src/mame/video/tigeroad_spr.h b/src/mame/video/tigeroad_spr.h index 68ac547b111..b64442f7942 100644 --- a/src/mame/video/tigeroad_spr.h +++ b/src/mame/video/tigeroad_spr.h @@ -4,7 +4,7 @@ class tigeroad_spr_device : public device_t { public: - tigeroad_spr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tigeroad_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, gfxdecode_device *gfxdecode, int region, UINT16* ram, UINT32 size, int flip_screen, int rev_y); diff --git a/src/mame/video/toaplan_scu.cpp b/src/mame/video/toaplan_scu.cpp index 676034c7230..0fe17964308 100644 --- a/src/mame/video/toaplan_scu.cpp +++ b/src/mame/video/toaplan_scu.cpp @@ -28,7 +28,7 @@ GFXDECODE_MEMBER( toaplan_scu_device::gfxinfo ) GFXDECODE_END -toaplan_scu_device::toaplan_scu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +toaplan_scu_device::toaplan_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TOAPLAN_SCU, "Toaplan SCU", tag, owner, clock, "toaplan_scu", __FILE__), device_gfx_interface(mconfig, *this, gfxinfo ) { diff --git a/src/mame/video/toaplan_scu.h b/src/mame/video/toaplan_scu.h index f6e5f5a1fe3..15f451f094b 100644 --- a/src/mame/video/toaplan_scu.h +++ b/src/mame/video/toaplan_scu.h @@ -10,7 +10,7 @@ class toaplan_scu_device : public device_t, public device_gfx_interface DECLARE_GFXDECODE_MEMBER(gfxinfo); public: - toaplan_scu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + toaplan_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration static void static_set_xoffsets(device_t &device, int xoffs, int xoffs_flipped); diff --git a/src/mame/video/uv201.cpp b/src/mame/video/uv201.cpp index 3b2d63386df..ae18cee5d2d 100644 --- a/src/mame/video/uv201.cpp +++ b/src/mame/video/uv201.cpp @@ -96,7 +96,7 @@ const device_type UV201 = &device_creator; // uv201_device - constructor //------------------------------------------------- -uv201_device::uv201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +uv201_device::uv201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, UV201, "UV201", tag, owner, clock, "uv201", __FILE__), device_video_interface(mconfig, *this), m_write_ext_int(*this), diff --git a/src/mame/video/uv201.h b/src/mame/video/uv201.h index a4cc7ba2813..873d6683d99 100644 --- a/src/mame/video/uv201.h +++ b/src/mame/video/uv201.h @@ -94,7 +94,7 @@ class uv201_device : public device_t, { public: // construction/destruction - uv201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + uv201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_ext_int_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_ext_int.set_callback(object); } template static devcb_base &set_hblank_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_hblank.set_callback(object); } diff --git a/src/mame/video/vrender0.cpp b/src/mame/video/vrender0.cpp index 6a3e3313ec7..7b2af322548 100644 --- a/src/mame/video/vrender0.cpp +++ b/src/mame/video/vrender0.cpp @@ -25,7 +25,7 @@ const device_type VIDEO_VRENDER0 = &device_creator; -vr0video_device::vr0video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vr0video_device::vr0video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VIDEO_VRENDER0, "VRender0 Video", tag, owner, clock, "vr0video", __FILE__), m_cpu(*this) { diff --git a/src/mame/video/vrender0.h b/src/mame/video/vrender0.h index ddb0968a49b..b990afb8a45 100644 --- a/src/mame/video/vrender0.h +++ b/src/mame/video/vrender0.h @@ -35,12 +35,12 @@ struct RenderStateInfo class vr0video_device : public device_t { public: - vr0video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + vr0video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~vr0video_device() {} int vrender0_ProcessPacket(UINT32 PacketPtr, UINT16 *Dest, UINT8 *TEXTURE); - static void set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu.set_tag(tag); } + static void set_cpu_tag(device_t &device, const char *tag) { downcast(device).m_cpu.set_tag(tag); } protected: // device-level overrides diff --git a/src/mame/video/vs920a.cpp b/src/mame/video/vs920a.cpp index df5c8c2fbf7..7d1c973af55 100644 --- a/src/mame/video/vs920a.cpp +++ b/src/mame/video/vs920a.cpp @@ -32,7 +32,7 @@ t=tile, p=palette const device_type VS920A = &device_creator; -vs920a_text_tilemap_device::vs920a_text_tilemap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vs920a_text_tilemap_device::vs920a_text_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VS920A, "VS920A Text Tilemap", tag, owner, clock, "vs920a", __FILE__), m_vram(nullptr), m_pal_base(0), @@ -68,7 +68,7 @@ void vs920a_text_tilemap_device::set_gfx_region(device_t &device, int gfxregion) dev.m_gfx_region = gfxregion; } -void vs920a_text_tilemap_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void vs920a_text_tilemap_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } diff --git a/src/mame/video/vs920a.h b/src/mame/video/vs920a.h index f8c810e5d97..5d945a86631 100644 --- a/src/mame/video/vs920a.h +++ b/src/mame/video/vs920a.h @@ -5,8 +5,8 @@ class vs920a_text_tilemap_device : public device_t { public: - vs920a_text_tilemap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - static void static_set_gfxdecode_tag(device_t &device, std::string tag); + vs920a_text_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); static void set_gfx_region(device_t &device, int gfxregion); tilemap_t* m_tmap; diff --git a/src/mame/video/vsystem_spr.cpp b/src/mame/video/vsystem_spr.cpp index 83a50c66641..7b74e66851c 100644 --- a/src/mame/video/vsystem_spr.cpp +++ b/src/mame/video/vsystem_spr.cpp @@ -71,7 +71,7 @@ Abstracts the VS9210 const device_type VSYSTEM_SPR = &device_creator; -vsystem_spr_device::vsystem_spr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vsystem_spr_device::vsystem_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VSYSTEM_SPR, "Video System Sprites", tag, owner, clock, "vsystem_spr", __FILE__), m_gfxdecode(*this), m_palette(*this) @@ -94,7 +94,7 @@ vsystem_spr_device::vsystem_spr_device(const machine_config &mconfig, std::strin // gfx decoder //------------------------------------------------- -void vsystem_spr_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void vsystem_spr_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -104,7 +104,7 @@ void vsystem_spr_device::static_set_gfxdecode_tag(device_t &device, std::string // palette device //------------------------------------------------- -void vsystem_spr_device::static_set_palette_tag(device_t &device, std::string tag) +void vsystem_spr_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/vsystem_spr.h b/src/mame/video/vsystem_spr.h index e2e1e9596c6..3e8574c9350 100644 --- a/src/mame/video/vsystem_spr.h +++ b/src/mame/video/vsystem_spr.h @@ -25,11 +25,11 @@ typedef device_delegate vsystem_tile_indirection_delegate; class vsystem_spr_device : public device_t { public: - vsystem_spr_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + vsystem_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_offsets(device_t &device, int xoffs, int yoffs); static void set_pdraw(device_t &device, bool pdraw); static void set_tile_indirect_cb(device_t &device,vsystem_tile_indirection_delegate newtilecb); diff --git a/src/mame/video/vsystem_spr2.cpp b/src/mame/video/vsystem_spr2.cpp index 2794e65bed1..68d1b8ff323 100644 --- a/src/mame/video/vsystem_spr2.cpp +++ b/src/mame/video/vsystem_spr2.cpp @@ -29,7 +29,7 @@ const device_type VSYSTEM_SPR2 = &device_creator; -vsystem_spr2_device::vsystem_spr2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vsystem_spr2_device::vsystem_spr2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VSYSTEM_SPR2, "Video System Sprites Type 2", tag, owner, clock, "vsystem_spr2", __FILE__), m_gfxdecode(*this), m_palette(*this) @@ -46,7 +46,7 @@ vsystem_spr2_device::vsystem_spr2_device(const machine_config &mconfig, std::str // gfx decoder //------------------------------------------------- -void vsystem_spr2_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void vsystem_spr2_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -56,7 +56,7 @@ void vsystem_spr2_device::static_set_gfxdecode_tag(device_t &device, std::string // palette device //------------------------------------------------- -void vsystem_spr2_device::static_set_palette_tag(device_t &device, std::string tag) +void vsystem_spr2_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/vsystem_spr2.h b/src/mame/video/vsystem_spr2.h index 070c7635e7e..967d6dc69bb 100644 --- a/src/mame/video/vsystem_spr2.h +++ b/src/mame/video/vsystem_spr2.h @@ -20,11 +20,11 @@ typedef device_delegate vsystem_tile2_indirection_delegate; class vsystem_spr2_device : public device_t { public: - vsystem_spr2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + vsystem_spr2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + 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 set_tile_indirect_cb(device_t &device,vsystem_tile2_indirection_delegate newtilecb); static void set_pritype(device_t &device, int pritype); static void set_gfx_region(device_t &device, int gfx_region); diff --git a/src/mame/video/vtvideo.cpp b/src/mame/video/vtvideo.cpp index b28f4d7d2a9..b4d5b40ab55 100644 --- a/src/mame/video/vtvideo.cpp +++ b/src/mame/video/vtvideo.cpp @@ -73,27 +73,29 @@ const device_type VT100_VIDEO = &device_creator; const device_type RAINBOW_VIDEO = &device_creator; -vt100_video_device::vt100_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) +vt100_video_device::vt100_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) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_video_interface(mconfig, *this), m_read_ram(*this), m_write_clear_video_interrupt(*this), +m_char_rom_tag(""), m_palette(*this, "palette") { } -vt100_video_device::vt100_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vt100_video_device::vt100_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VT100_VIDEO, "VT100 Video", tag, owner, clock, "vt100_video", __FILE__), device_video_interface(mconfig, *this), m_read_ram(*this), m_write_clear_video_interrupt(*this), +m_char_rom_tag(""), m_palette(*this, "palette") { } -rainbow_video_device::rainbow_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rainbow_video_device::rainbow_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : vt100_video_device(mconfig, RAINBOW_VIDEO, "Rainbow Video", tag, owner, clock, "rainbow_video", __FILE__) { } diff --git a/src/mame/video/vtvideo.h b/src/mame/video/vtvideo.h index cc995a4357a..0c29e0637e8 100644 --- a/src/mame/video/vtvideo.h +++ b/src/mame/video/vtvideo.h @@ -18,14 +18,14 @@ class vt100_video_device : public device_t, public device_video_interface { public: - vt100_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); - vt100_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + vt100_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); + vt100_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~vt100_video_device() {} template static devcb_base &set_ram_rd_callback(device_t &device, _Object object) { return downcast(device).m_read_ram.set_callback(object); } template static devcb_base &set_clear_video_irq_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_clear_video_interrupt.set_callback(object); } - static void set_chargen_tag(device_t &device, std::string tag) { downcast(device).m_char_rom_tag = tag; } + static void set_chargen_tag(device_t &device, const char *tag) { downcast(device).m_char_rom_tag = tag; } DECLARE_READ8_MEMBER(lba7_r); DECLARE_WRITE8_MEMBER(dc012_w); @@ -68,7 +68,7 @@ protected: UINT8 m_frequency; UINT8 m_interlaced; - std::string m_char_rom_tag; /* character rom region */ + const char *m_char_rom_tag; /* character rom region */ required_device m_palette; bool m_notify_vblank; @@ -81,7 +81,7 @@ protected: class rainbow_video_device : public vt100_video_device { public: - rainbow_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + rainbow_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect) override; virtual void video_blanking(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/video/wpc_dmd.cpp b/src/mame/video/wpc_dmd.cpp index 7857c7fe7b1..40047d9316d 100644 --- a/src/mame/video/wpc_dmd.cpp +++ b/src/mame/video/wpc_dmd.cpp @@ -30,7 +30,7 @@ static MACHINE_CONFIG_FRAGMENT( wpc_dmd ) MACHINE_CONFIG_END -wpc_dmd_device::wpc_dmd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +wpc_dmd_device::wpc_dmd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WPC_DMD, "Williams Pinball Controller Dot Matrix Display", tag, owner, clock, "wpc_dmd", __FILE__), scanline_cb(*this), dmd0(*this, ":dmd0"), diff --git a/src/mame/video/wpc_dmd.h b/src/mame/video/wpc_dmd.h index 1d58c2d2030..7524e2e7e3f 100644 --- a/src/mame/video/wpc_dmd.h +++ b/src/mame/video/wpc_dmd.h @@ -15,7 +15,7 @@ class wpc_dmd_device : public device_t { public: - wpc_dmd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wpc_dmd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~wpc_dmd_device(); DECLARE_ADDRESS_MAP(registers, 8); diff --git a/src/mame/video/wswan_video.cpp b/src/mame/video/wswan_video.cpp index a7c3e324b94..8dbb60f0db8 100644 --- a/src/mame/video/wswan_video.cpp +++ b/src/mame/video/wswan_video.cpp @@ -20,7 +20,7 @@ const device_type WSWAN_VIDEO = &device_creator; -wswan_video_device::wswan_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +wswan_video_device::wswan_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WSWAN_VIDEO, "Bandai WonderSwan VDP", tag, owner, clock, "wswan_video", __FILE__), m_vdp_type(VDP_TYPE_WSWAN) { diff --git a/src/mame/video/wswan_video.h b/src/mame/video/wswan_video.h index 91fc57b75a7..3cad1155075 100644 --- a/src/mame/video/wswan_video.h +++ b/src/mame/video/wswan_video.h @@ -46,7 +46,7 @@ typedef device_delegate wswan_video_dmasnd_cb_delegate; class wswan_video_device : public device_t { public: - wswan_video_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wswan_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~wswan_video_device() {} // static configuration diff --git a/src/mame/video/ygv608.cpp b/src/mame/video/ygv608.cpp index 13ec2eb4169..1b70da162ee 100644 --- a/src/mame/video/ygv608.cpp +++ b/src/mame/video/ygv608.cpp @@ -51,14 +51,14 @@ const device_type YGV608 = &device_creator; -ygv608_device::ygv608_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock ) +ygv608_device::ygv608_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock ) : device_t(mconfig, YGV608, "YGV608 VDP", tag, owner, clock, "ygv608", __FILE__), m_gfxdecode(*this), m_palette(*this) { } -void ygv608_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void ygv608_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast(device).m_gfxdecode.set_tag(tag); } @@ -68,7 +68,7 @@ void ygv608_device::static_set_gfxdecode_tag(device_t &device, std::string tag) // palette device //------------------------------------------------- -void ygv608_device::static_set_palette_tag(device_t &device, std::string tag) +void ygv608_device::static_set_palette_tag(device_t &device, const char *tag) { downcast(device).m_palette.set_tag(tag); } diff --git a/src/mame/video/ygv608.h b/src/mame/video/ygv608.h index b16888cf5c0..b4360a4e5e4 100644 --- a/src/mame/video/ygv608.h +++ b/src/mame/video/ygv608.h @@ -286,11 +286,11 @@ class ygv608_device : public device_t { public: // construction/destruction - ygv608_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ygv608_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration - static void static_set_gfxdecode_tag(device_t &device, std::string tag); - static void static_set_palette_tag(device_t &device, std::string tag); + static void static_set_gfxdecode_tag(device_t &device, const char *tag); + static void static_set_palette_tag(device_t &device, const char *tag); DECLARE_WRITE16_MEMBER( write ); DECLARE_READ16_MEMBER( read ); diff --git a/src/mame/video/zx8301.cpp b/src/mame/video/zx8301.cpp index 173330a1e54..708b8c4879f 100644 --- a/src/mame/video/zx8301.cpp +++ b/src/mame/video/zx8301.cpp @@ -104,7 +104,7 @@ inline void zx8301_device::writebyte(offs_t address, UINT8 data) // zx8301_device - constructor //------------------------------------------------- -zx8301_device::zx8301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +zx8301_device::zx8301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ZX8301, "Sinclair ZX8301", tag, owner, clock, "zx8301", __FILE__), device_memory_interface(mconfig, *this), device_video_interface(mconfig, *this), diff --git a/src/mame/video/zx8301.h b/src/mame/video/zx8301.h index e00183a1524..f4c402e387a 100644 --- a/src/mame/video/zx8301.h +++ b/src/mame/video/zx8301.h @@ -62,10 +62,10 @@ class zx8301_device : public device_t, { public: // construction/destruction - zx8301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + zx8301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template static devcb_base &set_vsync_wr_callback(device_t &device, _Object object) { return downcast(device).m_write_vsync.set_callback(object); } - static void static_set_cpu_tag(device_t &device, std::string tag) { downcast(device).m_cpu.set_tag(tag); } + static void static_set_cpu_tag(device_t &device, const char *tag) { downcast(device).m_cpu.set_tag(tag); } DECLARE_WRITE8_MEMBER( control_w ); DECLARE_READ8_MEMBER( data_r ); diff --git a/src/osd/modules/debugger/osx/debugconsole.mm b/src/osd/modules/debugger/osx/debugconsole.mm index f5023a2b76d..4bd7e029295 100644 --- a/src/osd/modules/debugger/osx/debugconsole.mm +++ b/src/osd/modules/debugger/osx/debugconsole.mm @@ -205,7 +205,7 @@ [window setTitle:[NSString stringWithFormat:@"Debug: %s - %s '%s'", device->machine().system().name, device->name(), - device->tag().c_str()]]; + device->tag()]]; } diff --git a/src/osd/modules/debugger/osx/deviceinfoviewer.mm b/src/osd/modules/debugger/osx/deviceinfoviewer.mm index 15c166e4d5d..99d13fd9b6c 100644 --- a/src/osd/modules/debugger/osx/deviceinfoviewer.mm +++ b/src/osd/modules/debugger/osx/deviceinfoviewer.mm @@ -153,7 +153,7 @@ // add the stuff that's always present [self addLabel:@"Tag:" withWidth:100 - andField:[NSString stringWithUTF8String:device->tag().c_str()] + andField:[NSString stringWithUTF8String:device->tag()] toView:contentView]; [self addLabel:@"Name:" withWidth:100 diff --git a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp index 3e610486b23..54cc4406d23 100644 --- a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp +++ b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp @@ -30,7 +30,7 @@ DeviceInformationWindow::~DeviceInformationWindow() void DeviceInformationWindow::fill_device_information() { char title[4069]; - sprintf(title, "Debug: Device %s", m_device->tag().c_str()); + sprintf(title, "Debug: Device %s", m_device->tag()); setWindowTitle(title); @@ -44,7 +44,7 @@ void DeviceInformationWindow::fill_device_information() primaryFrame->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); QGridLayout *gl1 = new QGridLayout(primaryFrame); gl1->addWidget(new QLabel(QString("Tag"), primaryFrame), 0, 0); - gl1->addWidget(new QLabel(QString(m_device->tag().c_str()), primaryFrame), 0, 1); + gl1->addWidget(new QLabel(QString(m_device->tag()), primaryFrame), 0, 1); gl1->addWidget(new QLabel(QString("Name"), primaryFrame), 1, 0); gl1->addWidget(new QLabel(QString(m_device->name()), primaryFrame), 1, 1); gl1->addWidget(new QLabel(QString("Shortname"), primaryFrame), 2, 0); @@ -89,7 +89,7 @@ void DeviceInformationWindow::fill_device_information() setCentralWidget(mainWindowFrame); } -void DeviceInformationWindow::set_device(std::string tag) +void DeviceInformationWindow::set_device(const char *tag) { m_device = m_machine->device(tag); if(!m_device) @@ -99,7 +99,7 @@ void DeviceInformationWindow::set_device(std::string tag) const char *DeviceInformationWindow::device_tag() const { - return m_device->tag().c_str(); + return m_device->tag(); } diff --git a/src/osd/modules/debugger/qt/deviceinformationwindow.h b/src/osd/modules/debugger/qt/deviceinformationwindow.h index 8477458cf8b..b0d9898488a 100644 --- a/src/osd/modules/debugger/qt/deviceinformationwindow.h +++ b/src/osd/modules/debugger/qt/deviceinformationwindow.h @@ -16,7 +16,7 @@ public: DeviceInformationWindow(running_machine* machine, device_t* device = NULL, QWidget* parent=NULL); virtual ~DeviceInformationWindow(); - void set_device(std::string tag); + void set_device(const char *tag); const char *device_tag() const; private: diff --git a/src/osd/modules/debugger/qt/mainwindow.cpp b/src/osd/modules/debugger/qt/mainwindow.cpp index b3ff2bf7861..ef4a3ea809c 100644 --- a/src/osd/modules/debugger/qt/mainwindow.cpp +++ b/src/osd/modules/debugger/qt/mainwindow.cpp @@ -145,7 +145,7 @@ void MainWindow::setProcessor(device_t* processor) // Window title std::string title; - strprintf(title,"Debug: %s - %s '%s'", m_machine->system().name, processor->name(), processor->tag().c_str()); + strprintf(title,"Debug: %s - %s '%s'", m_machine->system().name, processor->name(), processor->tag()); setWindowTitle(title.c_str()); } diff --git a/src/osd/modules/debugger/win/consolewininfo.cpp b/src/osd/modules/debugger/win/consolewininfo.cpp index 8491d1768a8..50c0fced670 100644 --- a/src/osd/modules/debugger/win/consolewininfo.cpp +++ b/src/osd/modules/debugger/win/consolewininfo.cpp @@ -108,7 +108,7 @@ void consolewin_info::set_cpu(device_t &device) char curtitle[256]; std::string title; - strprintf(title, "Debug: %s - %s '%s'", device.machine().system().name, device.name(), device.tag().c_str()); + strprintf(title, "Debug: %s - %s '%s'", device.machine().system().name, device.name(), device.tag()); win_get_window_text_utf8(window(), curtitle, ARRAY_LENGTH(curtitle)); if (title.compare(curtitle) != 0) win_set_window_text_utf8(window(), title.c_str()); -- cgit v1.2.3