summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine')
-rw-r--r--src/devices/machine/40105.cpp2
-rw-r--r--src/devices/machine/40105.h2
-rw-r--r--src/devices/machine/53c7xx.cpp2
-rw-r--r--src/devices/machine/53c7xx.h2
-rw-r--r--src/devices/machine/53c810.cpp2
-rw-r--r--src/devices/machine/53c810.h2
-rw-r--r--src/devices/machine/64h156.cpp2
-rw-r--r--src/devices/machine/64h156.h2
-rw-r--r--src/devices/machine/6522via.cpp10
-rw-r--r--src/devices/machine/6522via.h2
-rw-r--r--src/devices/machine/6525tpi.cpp12
-rw-r--r--src/devices/machine/6525tpi.h2
-rw-r--r--src/devices/machine/6532riot.cpp2
-rw-r--r--src/devices/machine/6532riot.h2
-rw-r--r--src/devices/machine/6821pia.cpp74
-rw-r--r--src/devices/machine/6821pia.h2
-rw-r--r--src/devices/machine/68230pit.cpp4
-rw-r--r--src/devices/machine/68230pit.h4
-rw-r--r--src/devices/machine/68307.cpp2
-rw-r--r--src/devices/machine/68307.h2
-rw-r--r--src/devices/machine/68340.cpp2
-rw-r--r--src/devices/machine/68340.h2
-rw-r--r--src/devices/machine/6840ptm.cpp36
-rw-r--r--src/devices/machine/6840ptm.h2
-rw-r--r--src/devices/machine/6850acia.cpp28
-rw-r--r--src/devices/machine/6850acia.h4
-rw-r--r--src/devices/machine/68561mpcc.cpp2
-rw-r--r--src/devices/machine/68561mpcc.h2
-rw-r--r--src/devices/machine/7200fifo.cpp6
-rw-r--r--src/devices/machine/7200fifo.h2
-rw-r--r--src/devices/machine/74123.cpp12
-rw-r--r--src/devices/machine/74123.h2
-rw-r--r--src/devices/machine/74145.cpp2
-rw-r--r--src/devices/machine/74145.h2
-rw-r--r--src/devices/machine/74148.cpp2
-rw-r--r--src/devices/machine/74148.h7
-rw-r--r--src/devices/machine/74153.cpp2
-rw-r--r--src/devices/machine/74153.h2
-rw-r--r--src/devices/machine/74181.cpp2
-rw-r--r--src/devices/machine/74181.h2
-rw-r--r--src/devices/machine/7474.cpp2
-rw-r--r--src/devices/machine/7474.h2
-rw-r--r--src/devices/machine/8042kbdc.cpp2
-rw-r--r--src/devices/machine/8042kbdc.h2
-rw-r--r--src/devices/machine/8530scc.cpp2
-rw-r--r--src/devices/machine/8530scc.h2
-rw-r--r--src/devices/machine/aakart.cpp2
-rw-r--r--src/devices/machine/aakart.h2
-rw-r--r--src/devices/machine/adc0808.cpp2
-rw-r--r--src/devices/machine/adc0808.h2
-rw-r--r--src/devices/machine/adc083x.cpp44
-rw-r--r--src/devices/machine/adc083x.h10
-rw-r--r--src/devices/machine/adc1038.cpp2
-rw-r--r--src/devices/machine/adc1038.h2
-rw-r--r--src/devices/machine/adc1213x.cpp8
-rw-r--r--src/devices/machine/adc1213x.h8
-rw-r--r--src/devices/machine/aicartc.cpp2
-rw-r--r--src/devices/machine/aicartc.h2
-rw-r--r--src/devices/machine/akiko.cpp4
-rw-r--r--src/devices/machine/akiko.h6
-rw-r--r--src/devices/machine/am53cf96.cpp2
-rw-r--r--src/devices/machine/am53cf96.h2
-rw-r--r--src/devices/machine/am9517a.cpp36
-rw-r--r--src/devices/machine/am9517a.h6
-rw-r--r--src/devices/machine/amigafdc.cpp2
-rw-r--r--src/devices/machine/amigafdc.h2
-rw-r--r--src/devices/machine/at28c16.cpp6
-rw-r--r--src/devices/machine/at28c16.h2
-rw-r--r--src/devices/machine/at29x.cpp68
-rw-r--r--src/devices/machine/at29x.h8
-rw-r--r--src/devices/machine/at45dbxx.cpp8
-rw-r--r--src/devices/machine/at45dbxx.h8
-rw-r--r--src/devices/machine/at_keybc.cpp2
-rw-r--r--src/devices/machine/at_keybc.h2
-rw-r--r--src/devices/machine/ataflash.cpp2
-rw-r--r--src/devices/machine/ataflash.h2
-rw-r--r--src/devices/machine/atahle.cpp50
-rw-r--r--src/devices/machine/atahle.h2
-rw-r--r--src/devices/machine/ataintf.cpp6
-rw-r--r--src/devices/machine/ataintf.h6
-rw-r--r--src/devices/machine/atapicdr.cpp4
-rw-r--r--src/devices/machine/atapicdr.h4
-rw-r--r--src/devices/machine/atapihle.cpp2
-rw-r--r--src/devices/machine/atapihle.h2
-rw-r--r--src/devices/machine/ay31015.cpp6
-rw-r--r--src/devices/machine/ay31015.h6
-rw-r--r--src/devices/machine/bankdev.cpp2
-rw-r--r--src/devices/machine/bankdev.h2
-rw-r--r--src/devices/machine/bcreader.cpp2
-rw-r--r--src/devices/machine/bcreader.h2
-rw-r--r--src/devices/machine/buffer.cpp2
-rw-r--r--src/devices/machine/buffer.h2
-rw-r--r--src/devices/machine/cdp1852.cpp2
-rw-r--r--src/devices/machine/cdp1852.h2
-rw-r--r--src/devices/machine/cdp1871.cpp2
-rw-r--r--src/devices/machine/cdp1871.h2
-rw-r--r--src/devices/machine/clock.cpp2
-rw-r--r--src/devices/machine/clock.h2
-rw-r--r--src/devices/machine/com8116.cpp6
-rw-r--r--src/devices/machine/com8116.h2
-rw-r--r--src/devices/machine/corvushd.cpp2
-rw-r--r--src/devices/machine/corvushd.h2
-rw-r--r--src/devices/machine/cr511b.cpp2
-rw-r--r--src/devices/machine/cr511b.h2
-rw-r--r--src/devices/machine/cr589.cpp2
-rw-r--r--src/devices/machine/cr589.h2
-rw-r--r--src/devices/machine/cs4031.cpp10
-rw-r--r--src/devices/machine/cs4031.h18
-rw-r--r--src/devices/machine/cs8221.cpp8
-rw-r--r--src/devices/machine/cs8221.h14
-rw-r--r--src/devices/machine/diablo_hd.cpp4
-rw-r--r--src/devices/machine/diablo_hd.h2
-rw-r--r--src/devices/machine/dmac.cpp2
-rw-r--r--src/devices/machine/dmac.h2
-rw-r--r--src/devices/machine/dp8390.cpp6
-rw-r--r--src/devices/machine/dp8390.h6
-rw-r--r--src/devices/machine/ds1204.cpp8
-rw-r--r--src/devices/machine/ds1204.h2
-rw-r--r--src/devices/machine/ds128x.cpp2
-rw-r--r--src/devices/machine/ds128x.h2
-rw-r--r--src/devices/machine/ds1302.cpp20
-rw-r--r--src/devices/machine/ds1302.h2
-rw-r--r--src/devices/machine/ds1315.cpp2
-rw-r--r--src/devices/machine/ds1315.h2
-rw-r--r--src/devices/machine/ds2401.cpp8
-rw-r--r--src/devices/machine/ds2401.h2
-rw-r--r--src/devices/machine/ds2404.cpp2
-rw-r--r--src/devices/machine/ds2404.h2
-rw-r--r--src/devices/machine/ds75160a.cpp2
-rw-r--r--src/devices/machine/ds75160a.h2
-rw-r--r--src/devices/machine/ds75161a.cpp2
-rw-r--r--src/devices/machine/ds75161a.h2
-rw-r--r--src/devices/machine/e0516.cpp14
-rw-r--r--src/devices/machine/e0516.h2
-rw-r--r--src/devices/machine/e05a03.cpp2
-rw-r--r--src/devices/machine/e05a03.h2
-rw-r--r--src/devices/machine/e05a30.cpp2
-rw-r--r--src/devices/machine/e05a30.h2
-rw-r--r--src/devices/machine/eeprom.cpp10
-rw-r--r--src/devices/machine/eeprom.h2
-rw-r--r--src/devices/machine/eeprompar.cpp6
-rw-r--r--src/devices/machine/eeprompar.h6
-rw-r--r--src/devices/machine/eepromser.cpp10
-rw-r--r--src/devices/machine/eepromser.h10
-rw-r--r--src/devices/machine/er2055.cpp6
-rw-r--r--src/devices/machine/er2055.h2
-rw-r--r--src/devices/machine/f3853.cpp2
-rw-r--r--src/devices/machine/f3853.h2
-rw-r--r--src/devices/machine/fdc37c665gt.cpp2
-rw-r--r--src/devices/machine/fdc37c665gt.h2
-rw-r--r--src/devices/machine/gayle.cpp2
-rw-r--r--src/devices/machine/gayle.h2
-rw-r--r--src/devices/machine/hd63450.cpp3
-rw-r--r--src/devices/machine/hd63450.h6
-rw-r--r--src/devices/machine/hd64610.cpp24
-rw-r--r--src/devices/machine/hd64610.h2
-rw-r--r--src/devices/machine/hdc92x4.cpp422
-rw-r--r--src/devices/machine/hdc92x4.h6
-rw-r--r--src/devices/machine/i2cmem.cpp8
-rw-r--r--src/devices/machine/i2cmem.h2
-rw-r--r--src/devices/machine/i6300esb.cpp116
-rw-r--r--src/devices/machine/i6300esb.h4
-rw-r--r--src/devices/machine/i80130.cpp2
-rw-r--r--src/devices/machine/i80130.h2
-rw-r--r--src/devices/machine/i8155.cpp44
-rw-r--r--src/devices/machine/i8155.h2
-rw-r--r--src/devices/machine/i8212.cpp10
-rw-r--r--src/devices/machine/i8212.h2
-rw-r--r--src/devices/machine/i8214.cpp16
-rw-r--r--src/devices/machine/i8214.h2
-rw-r--r--src/devices/machine/i8243.cpp2
-rw-r--r--src/devices/machine/i8243.h2
-rw-r--r--src/devices/machine/i8251.cpp6
-rw-r--r--src/devices/machine/i8251.h6
-rw-r--r--src/devices/machine/i82541.cpp2
-rw-r--r--src/devices/machine/i82541.h2
-rw-r--r--src/devices/machine/i8255.cpp52
-rw-r--r--src/devices/machine/i8255.h2
-rw-r--r--src/devices/machine/i8257.cpp12
-rw-r--r--src/devices/machine/i8257.h2
-rw-r--r--src/devices/machine/i8271.cpp28
-rw-r--r--src/devices/machine/i8271.h2
-rw-r--r--src/devices/machine/i8279.cpp8
-rw-r--r--src/devices/machine/i8279.h2
-rw-r--r--src/devices/machine/i82875p.cpp34
-rw-r--r--src/devices/machine/i82875p.h10
-rw-r--r--src/devices/machine/i8355.cpp6
-rw-r--r--src/devices/machine/i8355.h2
-rw-r--r--src/devices/machine/idectrl.cpp14
-rw-r--r--src/devices/machine/idectrl.h10
-rw-r--r--src/devices/machine/idehd.cpp6
-rw-r--r--src/devices/machine/idehd.h6
-rw-r--r--src/devices/machine/im6402.cpp22
-rw-r--r--src/devices/machine/im6402.h2
-rw-r--r--src/devices/machine/ins8154.cpp12
-rw-r--r--src/devices/machine/ins8154.h2
-rw-r--r--src/devices/machine/ins8250.cpp10
-rw-r--r--src/devices/machine/ins8250.h10
-rw-r--r--src/devices/machine/intelfsh.cpp60
-rw-r--r--src/devices/machine/intelfsh.h60
-rw-r--r--src/devices/machine/jvsdev.cpp4
-rw-r--r--src/devices/machine/jvsdev.h2
-rw-r--r--src/devices/machine/jvshost.cpp2
-rw-r--r--src/devices/machine/jvshost.h2
-rw-r--r--src/devices/machine/k033906.cpp4
-rw-r--r--src/devices/machine/k033906.h6
-rw-r--r--src/devices/machine/k053252.cpp7
-rw-r--r--src/devices/machine/k053252.h6
-rw-r--r--src/devices/machine/k056230.cpp2
-rw-r--r--src/devices/machine/k056230.h4
-rw-r--r--src/devices/machine/kb3600.cpp2
-rw-r--r--src/devices/machine/kb3600.h2
-rw-r--r--src/devices/machine/keyboard.cpp4
-rw-r--r--src/devices/machine/keyboard.h4
-rw-r--r--src/devices/machine/kr2376.cpp2
-rw-r--r--src/devices/machine/kr2376.h2
-rw-r--r--src/devices/machine/laserdsc.cpp10
-rw-r--r--src/devices/machine/laserdsc.h4
-rw-r--r--src/devices/machine/latch.cpp2
-rw-r--r--src/devices/machine/latch.h2
-rw-r--r--src/devices/machine/latch8.cpp18
-rw-r--r--src/devices/machine/latch8.h2
-rw-r--r--src/devices/machine/lc89510.cpp2
-rw-r--r--src/devices/machine/lc89510.h2
-rw-r--r--src/devices/machine/ldpr8210.cpp6
-rw-r--r--src/devices/machine/ldpr8210.h6
-rw-r--r--src/devices/machine/ldstub.h6
-rw-r--r--src/devices/machine/ldv1000.cpp2
-rw-r--r--src/devices/machine/ldv1000.h2
-rw-r--r--src/devices/machine/ldvp931.cpp2
-rw-r--r--src/devices/machine/ldvp931.h2
-rw-r--r--src/devices/machine/legscsi.cpp14
-rw-r--r--src/devices/machine/legscsi.h4
-rw-r--r--src/devices/machine/lh5810.cpp2
-rw-r--r--src/devices/machine/lh5810.h2
-rw-r--r--src/devices/machine/linflash.cpp8
-rw-r--r--src/devices/machine/linflash.h8
-rw-r--r--src/devices/machine/lpc-acpi.cpp54
-rw-r--r--src/devices/machine/lpc-acpi.h2
-rw-r--r--src/devices/machine/lpc-pit.cpp8
-rw-r--r--src/devices/machine/lpc-pit.h2
-rw-r--r--src/devices/machine/lpc-rtc.cpp6
-rw-r--r--src/devices/machine/lpc-rtc.h2
-rw-r--r--src/devices/machine/lpc.cpp2
-rw-r--r--src/devices/machine/lpc.h2
-rw-r--r--src/devices/machine/lpci.cpp9
-rw-r--r--src/devices/machine/lpci.h6
-rw-r--r--src/devices/machine/m6m80011ap.cpp2
-rw-r--r--src/devices/machine/m6m80011ap.h2
-rw-r--r--src/devices/machine/mb14241.cpp2
-rw-r--r--src/devices/machine/mb14241.h2
-rw-r--r--src/devices/machine/mb3773.cpp2
-rw-r--r--src/devices/machine/mb3773.h2
-rw-r--r--src/devices/machine/mb8421.cpp2
-rw-r--r--src/devices/machine/mb8421.h2
-rw-r--r--src/devices/machine/mb87078.cpp2
-rw-r--r--src/devices/machine/mb87078.h2
-rw-r--r--src/devices/machine/mb8795.cpp34
-rw-r--r--src/devices/machine/mb8795.h2
-rw-r--r--src/devices/machine/mb89352.cpp2
-rw-r--r--src/devices/machine/mb89352.h2
-rw-r--r--src/devices/machine/mb89363b.cpp2
-rw-r--r--src/devices/machine/mb89363b.h2
-rw-r--r--src/devices/machine/mb89371.cpp2
-rw-r--r--src/devices/machine/mb89371.h2
-rw-r--r--src/devices/machine/mc146818.cpp4
-rw-r--r--src/devices/machine/mc146818.h4
-rw-r--r--src/devices/machine/mc2661.cpp16
-rw-r--r--src/devices/machine/mc2661.h2
-rw-r--r--src/devices/machine/mc68328.cpp2
-rw-r--r--src/devices/machine/mc68328.h4
-rw-r--r--src/devices/machine/mc6843.cpp2
-rw-r--r--src/devices/machine/mc6843.h2
-rw-r--r--src/devices/machine/mc6846.cpp2
-rw-r--r--src/devices/machine/mc6846.h2
-rw-r--r--src/devices/machine/mc6852.cpp10
-rw-r--r--src/devices/machine/mc6852.h2
-rw-r--r--src/devices/machine/mc6854.cpp2
-rw-r--r--src/devices/machine/mc6854.h2
-rw-r--r--src/devices/machine/mc68681.cpp22
-rw-r--r--src/devices/machine/mc68681.h4
-rw-r--r--src/devices/machine/mc68901.cpp124
-rw-r--r--src/devices/machine/mc68901.h2
-rw-r--r--src/devices/machine/mccs1850.cpp30
-rw-r--r--src/devices/machine/mccs1850.h2
-rw-r--r--src/devices/machine/mcf5206e.cpp2
-rw-r--r--src/devices/machine/mcf5206e.h2
-rw-r--r--src/devices/machine/microtch.cpp2
-rw-r--r--src/devices/machine/microtch.h2
-rw-r--r--src/devices/machine/mm58167.cpp2
-rw-r--r--src/devices/machine/mm58167.h2
-rw-r--r--src/devices/machine/mm58274c.cpp2
-rw-r--r--src/devices/machine/mm58274c.h2
-rw-r--r--src/devices/machine/mm74c922.cpp10
-rw-r--r--src/devices/machine/mm74c922.h2
-rw-r--r--src/devices/machine/mos6526.cpp10
-rw-r--r--src/devices/machine/mos6526.h10
-rw-r--r--src/devices/machine/mos6529.cpp2
-rw-r--r--src/devices/machine/mos6529.h2
-rw-r--r--src/devices/machine/mos6530.cpp2
-rw-r--r--src/devices/machine/mos6530.h2
-rw-r--r--src/devices/machine/mos6530n.cpp36
-rw-r--r--src/devices/machine/mos6530n.h6
-rw-r--r--src/devices/machine/mos6551.cpp26
-rw-r--r--src/devices/machine/mos6551.h2
-rw-r--r--src/devices/machine/mos6702.cpp2
-rw-r--r--src/devices/machine/mos6702.h2
-rw-r--r--src/devices/machine/mos8706.cpp2
-rw-r--r--src/devices/machine/mos8706.h2
-rw-r--r--src/devices/machine/mos8722.cpp6
-rw-r--r--src/devices/machine/mos8722.h2
-rw-r--r--src/devices/machine/mos8726.cpp2
-rw-r--r--src/devices/machine/mos8726.h2
-rw-r--r--src/devices/machine/mpu401.cpp2
-rw-r--r--src/devices/machine/mpu401.h2
-rw-r--r--src/devices/machine/msm5832.cpp20
-rw-r--r--src/devices/machine/msm5832.h2
-rw-r--r--src/devices/machine/msm58321.cpp26
-rw-r--r--src/devices/machine/msm58321.h2
-rw-r--r--src/devices/machine/msm6242.cpp2
-rw-r--r--src/devices/machine/msm6242.h2
-rw-r--r--src/devices/machine/ncr5380.cpp2
-rw-r--r--src/devices/machine/ncr5380.h2
-rw-r--r--src/devices/machine/ncr5380n.cpp22
-rw-r--r--src/devices/machine/ncr5380n.h2
-rw-r--r--src/devices/machine/ncr5390.cpp40
-rw-r--r--src/devices/machine/ncr5390.h2
-rw-r--r--src/devices/machine/ncr539x.cpp2
-rw-r--r--src/devices/machine/ncr539x.h2
-rw-r--r--src/devices/machine/netlist.cpp34
-rw-r--r--src/devices/machine/netlist.h18
-rw-r--r--src/devices/machine/nmc9306.cpp26
-rw-r--r--src/devices/machine/nmc9306.h2
-rw-r--r--src/devices/machine/nsc810.cpp70
-rw-r--r--src/devices/machine/nsc810.h2
-rw-r--r--src/devices/machine/nscsi_bus.cpp28
-rw-r--r--src/devices/machine/nscsi_bus.h8
-rw-r--r--src/devices/machine/nscsi_cb.cpp2
-rw-r--r--src/devices/machine/nscsi_cb.h2
-rw-r--r--src/devices/machine/nscsi_cd.cpp20
-rw-r--r--src/devices/machine/nscsi_cd.h2
-rw-r--r--src/devices/machine/nscsi_hd.cpp30
-rw-r--r--src/devices/machine/nscsi_hd.h4
-rw-r--r--src/devices/machine/nscsi_s1410.cpp6
-rw-r--r--src/devices/machine/nscsi_s1410.h2
-rw-r--r--src/devices/machine/nvram.cpp6
-rw-r--r--src/devices/machine/nvram.h2
-rw-r--r--src/devices/machine/pc_fdc.cpp12
-rw-r--r--src/devices/machine/pc_fdc.h6
-rw-r--r--src/devices/machine/pc_lpt.cpp4
-rw-r--r--src/devices/machine/pc_lpt.h2
-rw-r--r--src/devices/machine/pccard.cpp2
-rw-r--r--src/devices/machine/pccard.h2
-rw-r--r--src/devices/machine/pcf8593.cpp2
-rw-r--r--src/devices/machine/pcf8593.h2
-rw-r--r--src/devices/machine/pci-apic.cpp2
-rw-r--r--src/devices/machine/pci-apic.h2
-rw-r--r--src/devices/machine/pci-sata.cpp2
-rw-r--r--src/devices/machine/pci-sata.h2
-rw-r--r--src/devices/machine/pci-smbus.cpp34
-rw-r--r--src/devices/machine/pci-smbus.h2
-rw-r--r--src/devices/machine/pci-usb.cpp4
-rw-r--r--src/devices/machine/pci-usb.h4
-rw-r--r--src/devices/machine/pci.cpp86
-rw-r--r--src/devices/machine/pci.h14
-rw-r--r--src/devices/machine/pci9050.cpp2
-rw-r--r--src/devices/machine/pci9050.h2
-rw-r--r--src/devices/machine/pckeybrd.cpp6
-rw-r--r--src/devices/machine/pckeybrd.h6
-rw-r--r--src/devices/machine/pdc.cpp2
-rw-r--r--src/devices/machine/pdc.h2
-rw-r--r--src/devices/machine/pic8259.cpp24
-rw-r--r--src/devices/machine/pic8259.h2
-rw-r--r--src/devices/machine/pit8253.cpp6
-rw-r--r--src/devices/machine/pit8253.h6
-rw-r--r--src/devices/machine/pla.cpp4
-rw-r--r--src/devices/machine/pla.h2
-rw-r--r--src/devices/machine/r10696.cpp2
-rw-r--r--src/devices/machine/r10696.h2
-rw-r--r--src/devices/machine/r10788.cpp2
-rw-r--r--src/devices/machine/r10788.h2
-rw-r--r--src/devices/machine/ra17xx.cpp2
-rw-r--r--src/devices/machine/ra17xx.h2
-rw-r--r--src/devices/machine/ram.cpp6
-rw-r--r--src/devices/machine/ram.h2
-rw-r--r--src/devices/machine/rf5c296.cpp2
-rw-r--r--src/devices/machine/rf5c296.h2
-rw-r--r--src/devices/machine/roc10937.cpp10
-rw-r--r--src/devices/machine/roc10937.h10
-rw-r--r--src/devices/machine/rp5c01.cpp24
-rw-r--r--src/devices/machine/rp5c01.h2
-rw-r--r--src/devices/machine/rp5c15.cpp24
-rw-r--r--src/devices/machine/rp5c15.h2
-rw-r--r--src/devices/machine/rp5h01.cpp2
-rw-r--r--src/devices/machine/rp5h01.h2
-rw-r--r--src/devices/machine/rtc4543.cpp12
-rw-r--r--src/devices/machine/rtc4543.h2
-rw-r--r--src/devices/machine/rtc65271.cpp2
-rw-r--r--src/devices/machine/rtc65271.h2
-rw-r--r--src/devices/machine/rtc9701.cpp2
-rw-r--r--src/devices/machine/rtc9701.h2
-rw-r--r--src/devices/machine/s2636.cpp2
-rw-r--r--src/devices/machine/s2636.h2
-rw-r--r--src/devices/machine/s3520cf.cpp2
-rw-r--r--src/devices/machine/s3520cf.h2
-rw-r--r--src/devices/machine/s3c2400.cpp4
-rw-r--r--src/devices/machine/s3c2400.h4
-rw-r--r--src/devices/machine/s3c2410.cpp4
-rw-r--r--src/devices/machine/s3c2410.h4
-rw-r--r--src/devices/machine/s3c2440.cpp4
-rw-r--r--src/devices/machine/s3c2440.h4
-rw-r--r--src/devices/machine/s3c44b0.cpp2
-rw-r--r--src/devices/machine/s3c44b0.h2
-rw-r--r--src/devices/machine/serflash.cpp2
-rw-r--r--src/devices/machine/serflash.h2
-rw-r--r--src/devices/machine/smc91c9x.cpp6
-rw-r--r--src/devices/machine/smc91c9x.h6
-rw-r--r--src/devices/machine/smpc.cpp4
-rw-r--r--src/devices/machine/spchrom.cpp4
-rw-r--r--src/devices/machine/spchrom.h2
-rw-r--r--src/devices/machine/steppers.cpp2
-rw-r--r--src/devices/machine/steppers.h2
-rw-r--r--src/devices/machine/strata.cpp2
-rw-r--r--src/devices/machine/strata.h2
-rw-r--r--src/devices/machine/t10mmc.cpp2
-rw-r--r--src/devices/machine/t10sbc.cpp2
-rw-r--r--src/devices/machine/tc009xlvc.cpp6
-rw-r--r--src/devices/machine/tc009xlvc.h6
-rw-r--r--src/devices/machine/terminal.cpp4
-rw-r--r--src/devices/machine/terminal.h4
-rw-r--r--src/devices/machine/timekpr.cpp12
-rw-r--r--src/devices/machine/timekpr.h12
-rw-r--r--src/devices/machine/tmp68301.cpp2
-rw-r--r--src/devices/machine/tmp68301.h2
-rw-r--r--src/devices/machine/tms1024.cpp6
-rw-r--r--src/devices/machine/tms1024.h6
-rw-r--r--src/devices/machine/tms5501.cpp20
-rw-r--r--src/devices/machine/tms5501.h2
-rw-r--r--src/devices/machine/tms6100.cpp6
-rw-r--r--src/devices/machine/tms6100.h6
-rw-r--r--src/devices/machine/tms9901.cpp30
-rw-r--r--src/devices/machine/tms9901.h2
-rw-r--r--src/devices/machine/tms9902.cpp2
-rw-r--r--src/devices/machine/tms9902.h2
-rw-r--r--src/devices/machine/upd1990a.cpp24
-rw-r--r--src/devices/machine/upd1990a.h6
-rw-r--r--src/devices/machine/upd4701.cpp2
-rw-r--r--src/devices/machine/upd4701.h2
-rw-r--r--src/devices/machine/upd4992.cpp2
-rw-r--r--src/devices/machine/upd4992.h2
-rw-r--r--src/devices/machine/upd7002.cpp2
-rw-r--r--src/devices/machine/upd7002.h2
-rw-r--r--src/devices/machine/upd71071.cpp2
-rw-r--r--src/devices/machine/upd71071.h4
-rw-r--r--src/devices/machine/upd765.cpp98
-rw-r--r--src/devices/machine/upd765.h28
-rw-r--r--src/devices/machine/v3021.cpp2
-rw-r--r--src/devices/machine/v3021.h2
-rw-r--r--src/devices/machine/vrc4373.cpp22
-rw-r--r--src/devices/machine/vrc4373.h6
-rw-r--r--src/devices/machine/vt82c496.cpp4
-rw-r--r--src/devices/machine/vt82c496.h10
-rw-r--r--src/devices/machine/vt83c461.cpp2
-rw-r--r--src/devices/machine/vt83c461.h2
-rw-r--r--src/devices/machine/wd11c00_17.cpp28
-rw-r--r--src/devices/machine/wd11c00_17.h2
-rw-r--r--src/devices/machine/wd2010.cpp44
-rw-r--r--src/devices/machine/wd2010.h2
-rw-r--r--src/devices/machine/wd33c93.cpp2
-rw-r--r--src/devices/machine/wd33c93.h2
-rw-r--r--src/devices/machine/wd7600.cpp36
-rw-r--r--src/devices/machine/wd7600.h18
-rw-r--r--src/devices/machine/wd_fdc.cpp190
-rw-r--r--src/devices/machine/wd_fdc.h52
-rw-r--r--src/devices/machine/wozfdc.cpp6
-rw-r--r--src/devices/machine/wozfdc.h6
-rw-r--r--src/devices/machine/x2212.cpp10
-rw-r--r--src/devices/machine/x2212.h6
-rw-r--r--src/devices/machine/x76f041.cpp8
-rw-r--r--src/devices/machine/x76f041.h2
-rw-r--r--src/devices/machine/x76f100.cpp8
-rw-r--r--src/devices/machine/x76f100.h2
-rw-r--r--src/devices/machine/ym2148.cpp2
-rw-r--r--src/devices/machine/ym2148.h2
-rw-r--r--src/devices/machine/z80ctc.cpp2
-rw-r--r--src/devices/machine/z80ctc.h2
-rw-r--r--src/devices/machine/z80dart.cpp130
-rw-r--r--src/devices/machine/z80dart.h20
-rw-r--r--src/devices/machine/z80dma.cpp80
-rw-r--r--src/devices/machine/z80dma.h2
-rw-r--r--src/devices/machine/z80pio.cpp40
-rw-r--r--src/devices/machine/z80pio.h2
-rw-r--r--src/devices/machine/z80scc.cpp164
-rw-r--r--src/devices/machine/z80scc.h22
-rw-r--r--src/devices/machine/z80sio.cpp182
-rw-r--r--src/devices/machine/z80sio.h6
-rw-r--r--src/devices/machine/z80sti.cpp72
-rw-r--r--src/devices/machine/z80sti.h2
-rw-r--r--src/devices/machine/z8536.cpp140
-rw-r--r--src/devices/machine/z8536.h2
500 files changed, 2570 insertions, 2570 deletions
diff --git a/src/devices/machine/40105.cpp b/src/devices/machine/40105.cpp
index c220f9eb18c..8364f5dbf5d 100644
--- a/src/devices/machine/40105.cpp
+++ b/src/devices/machine/40105.cpp
@@ -34,7 +34,7 @@ const device_type CMOS_40105 = &device_creator<cmos_40105_device>;
// cmos_40105_device - constructor
//-------------------------------------------------
-cmos_40105_device::cmos_40105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cmos_40105_device::cmos_40105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CMOS_40105, "40105", tag, owner, clock, "40105", __FILE__),
m_write_dir(*this),
m_write_dor(*this), m_d(0), m_q(0), m_dir(0), m_dor(0), m_si(0), m_so(0)
diff --git a/src/devices/machine/40105.h b/src/devices/machine/40105.h
index 09411a0d3e3..ea85a3af005 100644
--- a/src/devices/machine/40105.h
+++ b/src/devices/machine/40105.h
@@ -37,7 +37,7 @@ class cmos_40105_device : public device_t
{
public:
// construction/destruction
- cmos_40105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cmos_40105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _dir> void set_dir_callback(_dir dir) { m_write_dir.set_callback(dir); }
template<class _dor> void set_dor_callback(_dor dor) { m_write_dor.set_callback(dor); }
diff --git a/src/devices/machine/53c7xx.cpp b/src/devices/machine/53c7xx.cpp
index c77baa6a8dc..b77ba37a72a 100644
--- a/src/devices/machine/53c7xx.cpp
+++ b/src/devices/machine/53c7xx.cpp
@@ -58,7 +58,7 @@ const device_type NCR53C7XX = &device_creator<ncr53c7xx_device>;
// ncr53c7xx_device - constructor/destructor
//-------------------------------------------------
-ncr53c7xx_device::ncr53c7xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ncr53c7xx_device::ncr53c7xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: nscsi_device(mconfig, NCR53C7XX, "53C7xx SCSI", tag, owner, clock, "ncr537xx", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
diff --git a/src/devices/machine/53c7xx.h b/src/devices/machine/53c7xx.h
index 00d87c6337d..3167e45114d 100644
--- a/src/devices/machine/53c7xx.h
+++ b/src/devices/machine/53c7xx.h
@@ -72,7 +72,7 @@ class ncr53c7xx_device : public nscsi_device,
{
public:
// construction/destruction
- ncr53c7xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ncr53c7xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ncr53c7xx_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/53c810.cpp b/src/devices/machine/53c810.cpp
index 2d6b7049016..db88b7130db 100644
--- a/src/devices/machine/53c810.cpp
+++ b/src/devices/machine/53c810.cpp
@@ -621,7 +621,7 @@ void lsi53c810_device::add_opcode(UINT8 op, UINT8 mask, opcode_handler_delegate
}
}
-lsi53c810_device::lsi53c810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lsi53c810_device::lsi53c810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: legacy_scsi_host_adapter(mconfig, LSI53C810, "53C810 SCSI", tag, owner, clock, "lsi53c810", __FILE__)
{
}
diff --git a/src/devices/machine/53c810.h b/src/devices/machine/53c810.h
index 49ac2281e2f..51958111d2f 100644
--- a/src/devices/machine/53c810.h
+++ b/src/devices/machine/53c810.h
@@ -19,7 +19,7 @@ class lsi53c810_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- lsi53c810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lsi53c810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_irq_callback(device_t &device, lsi53c810_irq_delegate callback) { downcast<lsi53c810_device &>(device).m_irq_cb = callback; }
static void set_dma_callback(device_t &device, lsi53c810_dma_delegate callback) { downcast<lsi53c810_device &>(device).m_dma_cb = callback; }
diff --git a/src/devices/machine/64h156.cpp b/src/devices/machine/64h156.cpp
index fbbe84d7383..d60d7de86a4 100644
--- a/src/devices/machine/64h156.cpp
+++ b/src/devices/machine/64h156.cpp
@@ -54,7 +54,7 @@ const device_type C64H156 = &device_creator<c64h156_device>;
// c64h156_device - constructor
//-------------------------------------------------
-c64h156_device::c64h156_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64h156_device::c64h156_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64H156, "64H156", tag, owner, clock, "c64h156", __FILE__),
m_write_atn(*this),
m_write_sync(*this),
diff --git a/src/devices/machine/64h156.h b/src/devices/machine/64h156.h
index 6cab8bb369d..055239af5dc 100644
--- a/src/devices/machine/64h156.h
+++ b/src/devices/machine/64h156.h
@@ -92,7 +92,7 @@ class c64h156_device : public device_t
{
public:
// construction/destruction
- c64h156_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64h156_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_atn_wr_callback(device_t &device, _Object object) { return downcast<c64h156_device &>(device).m_write_atn.set_callback(object); }
template<class _Object> static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast<c64h156_device &>(device).m_write_sync.set_callback(object); }
diff --git a/src/devices/machine/6522via.cpp b/src/devices/machine/6522via.cpp
index 56a35e19040..fe4b7d8f37f 100644
--- a/src/devices/machine/6522via.cpp
+++ b/src/devices/machine/6522via.cpp
@@ -142,7 +142,7 @@ ADDRESS_MAP_END
// via6522_device - constructor
//-------------------------------------------------
-via6522_device::via6522_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+via6522_device::via6522_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VIA6522, "6522 VIA", tag, owner, clock, "via6522", __FILE__),
m_in_a_handler(*this),
m_in_b_handler(*this),
@@ -312,7 +312,7 @@ void via6522_device::set_int(int data)
if (TRACE_VIA)
{
- logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag(), m_ifr);
+ logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag().c_str(), m_ifr);
}
}
}
@@ -332,7 +332,7 @@ void via6522_device::clear_int(int data)
if (TRACE_VIA)
{
- logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag(), m_ifr);
+ logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag().c_str(), m_ifr);
}
}
}
@@ -793,7 +793,7 @@ WRITE8_MEMBER( via6522_device::write )
if (TRACE_VIA)
{
- logerror("%s:6522VIA chip %s: PCR = %02X\n", machine().describe_context(), tag(), data);
+ logerror("%s:6522VIA chip %s: PCR = %02X\n", machine().describe_context(), tag().c_str(), data);
}
if (CA2_FIX_OUTPUT(data) && m_out_ca2 != CA2_OUTPUT_LEVEL(data))
@@ -871,7 +871,7 @@ WRITE_LINE_MEMBER( via6522_device::write_ca1 )
m_in_ca1 = state;
if (TRACE_VIA)
- logerror("%s:6522VIA chip %s: CA1 = %02X\n", machine().describe_context(), tag(), m_in_ca1);
+ logerror("%s:6522VIA chip %s: CA1 = %02X\n", machine().describe_context(), tag().c_str(), m_in_ca1);
if ((m_in_ca1 && CA1_LOW_TO_HIGH(m_pcr)) || (!m_in_ca1 && CA1_HIGH_TO_LOW(m_pcr)))
{
diff --git a/src/devices/machine/6522via.h b/src/devices/machine/6522via.h
index 467ff0885fb..b0f34e14d4a 100644
--- a/src/devices/machine/6522via.h
+++ b/src/devices/machine/6522via.h
@@ -64,7 +64,7 @@ class via6522_device : public device_t
{
public:
// construction/destruction
- via6522_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ via6522_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// TODO: REMOVE THESE
template<class _Object> static devcb_base &set_readpa_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_in_a_handler.set_callback(object); }
diff --git a/src/devices/machine/6525tpi.cpp b/src/devices/machine/6525tpi.cpp
index 8d5a43a2b35..cb5d6b40f08 100644
--- a/src/devices/machine/6525tpi.cpp
+++ b/src/devices/machine/6525tpi.cpp
@@ -106,7 +106,7 @@
const device_type TPI6525 = &device_creator<tpi6525_device>;
-tpi6525_device::tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tpi6525_device::tpi6525_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TPI6525, "6525 TPI", tag, owner, clock, "tpi6525", __FILE__),
m_out_irq_cb(*this),
m_in_pa_cb(*this),
@@ -196,7 +196,7 @@ void tpi6525_device::set_interrupt()
{
m_interrupt_level = 1;
- DBG_LOG(machine(), 3, "tpi6525", ("%s set interrupt\n", tag()));
+ DBG_LOG(machine(), 3, "tpi6525", ("%s set interrupt\n", tag().c_str()));
m_out_irq_cb(m_interrupt_level);
}
@@ -209,7 +209,7 @@ void tpi6525_device::clear_interrupt()
{
m_interrupt_level = 0;
- DBG_LOG(machine(), 3, "tpi6525", ("%s clear interrupt\n", tag()));
+ DBG_LOG(machine(), 3, "tpi6525", ("%s clear interrupt\n", tag().c_str()));
m_out_irq_cb(m_interrupt_level);
}
@@ -401,7 +401,7 @@ READ8_MEMBER( tpi6525_device::read )
data = (data & ~m_ddr_c) | (m_ddr_c & m_port_c);
}
- DBG_LOG(machine(), 2, "tpi6525", ("%s read %.2x %.2x\n", tag(), offset, data));
+ DBG_LOG(machine(), 2, "tpi6525", ("%s read %.2x %.2x\n", tag().c_str(), offset, data));
break;
case 3:
@@ -460,7 +460,7 @@ READ8_MEMBER( tpi6525_device::read )
}
- DBG_LOG(machine(), 3, "tpi6525", ("%s read %.2x %.2x\n", tag(), offset, data));
+ DBG_LOG(machine(), 3, "tpi6525", ("%s read %.2x %.2x\n", tag().c_str(), offset, data));
return data;
}
@@ -468,7 +468,7 @@ READ8_MEMBER( tpi6525_device::read )
WRITE8_MEMBER( tpi6525_device::write )
{
- DBG_LOG(machine(), 2, "tpi6525", ("%s write %.2x %.2x\n", tag(), offset, data));
+ DBG_LOG(machine(), 2, "tpi6525", ("%s write %.2x %.2x\n", tag().c_str(), offset, data));
switch (offset & 7)
{
diff --git a/src/devices/machine/6525tpi.h b/src/devices/machine/6525tpi.h
index a1699ea213b..bb84b924d73 100644
--- a/src/devices/machine/6525tpi.h
+++ b/src/devices/machine/6525tpi.h
@@ -39,7 +39,7 @@
class tpi6525_device : public device_t
{
public:
- tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tpi6525_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~tpi6525_device() {}
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_irq_cb.set_callback(object); }
diff --git a/src/devices/machine/6532riot.cpp b/src/devices/machine/6532riot.cpp
index 8ef5566fbde..40cc3f83d9d 100644
--- a/src/devices/machine/6532riot.cpp
+++ b/src/devices/machine/6532riot.cpp
@@ -386,7 +386,7 @@ UINT8 riot6532_device::portb_out_get()
// riot6532_device - constructor
//-------------------------------------------------
-riot6532_device::riot6532_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+riot6532_device::riot6532_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RIOT6532, "6532 RIOT", tag, owner, clock, "riot6532", __FILE__),
m_in_pa_cb(*this),
m_out_pa_cb(*this),
diff --git a/src/devices/machine/6532riot.h b/src/devices/machine/6532riot.h
index dd1699c6c48..596dd65eebe 100644
--- a/src/devices/machine/6532riot.h
+++ b/src/devices/machine/6532riot.h
@@ -45,7 +45,7 @@ class riot6532_device : public device_t
{
public:
// construction/destruction
- riot6532_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ riot6532_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_in_pa_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_out_pa_cb.set_callback(object); }
diff --git a/src/devices/machine/6821pia.cpp b/src/devices/machine/6821pia.cpp
index a2a08180086..085ec25515f 100644
--- a/src/devices/machine/6821pia.cpp
+++ b/src/devices/machine/6821pia.cpp
@@ -49,7 +49,7 @@ const device_type PIA6821 = &device_creator<pia6821_device>;
// pia6821_device - constructor
//-------------------------------------------------
-pia6821_device::pia6821_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pia6821_device::pia6821_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PIA6821, "6821 PIA", tag, owner, clock, "pia6821", __FILE__),
m_in_a_handler(*this),
m_in_b_handler(*this),
@@ -241,7 +241,7 @@ UINT8 pia6821_device::get_in_a_value()
if (!m_logged_port_a_not_connected && (m_ddr_a != 0xff))
{
- logerror("PIA #%s: Warning! No port A read handler. Assuming pins 0x%02X not connected\n", tag(), m_ddr_a ^ 0xff);
+ logerror("PIA #%s: Warning! No port A read handler. Assuming pins 0x%02X not connected\n", tag().c_str(), m_ddr_a ^ 0xff);
m_logged_port_a_not_connected = true;
}
}
@@ -290,7 +290,7 @@ UINT8 pia6821_device::get_in_b_value()
{
if (!m_logged_port_b_not_connected && (m_ddr_b != 0xff))
{
- logerror("PIA #%s: Error! No port B read handler. Three-state pins 0x%02X are undefined\n", tag(), m_ddr_b ^ 0xff);
+ logerror("PIA #%s: Error! No port B read handler. Three-state pins 0x%02X are undefined\n", tag().c_str(), m_ddr_b ^ 0xff);
m_logged_port_b_not_connected = true;
}
@@ -360,7 +360,7 @@ void pia6821_device::set_out_ca2(int data)
{
if (m_out_ca2_needs_pulled)
{
- logerror("PIA #%s: Warning! No port CA2 write handler. Previous value has been lost!\n", tag());
+ logerror("PIA #%s: Warning! No port CA2 write handler. Previous value has been lost!\n", tag().c_str());
}
m_out_ca2_needs_pulled = true;
@@ -391,7 +391,7 @@ void pia6821_device::set_out_cb2(int data)
{
if (m_out_cb2_needs_pulled)
{
- logerror("PIA #%s: Warning! No port CB2 write handler. Previous value has been lost!\n", tag());
+ logerror("PIA #%s: Warning! No port CB2 write handler. Previous value has been lost!\n", tag().c_str());
}
m_out_cb2_needs_pulled = true;
@@ -426,7 +426,7 @@ UINT8 pia6821_device::port_a_r()
}
}
- LOG(("PIA #%s: port A read = %02X\n", tag(), ret));
+ LOG(("PIA #%s: port A read = %02X\n", tag().c_str(), ret));
return ret;
}
@@ -440,7 +440,7 @@ UINT8 pia6821_device::ddr_a_r()
{
UINT8 ret = m_ddr_a;
- LOG(("PIA #%s: DDR A read = %02X\n", tag(), ret));
+ LOG(("PIA #%s: DDR A read = %02X\n", tag().c_str(), ret));
return ret;
}
@@ -468,7 +468,7 @@ UINT8 pia6821_device::port_b_r()
m_irq_b2 = FALSE;
update_interrupts();
- LOG(("PIA #%s: port B read = %02X\n", tag(), ret));
+ LOG(("PIA #%s: port B read = %02X\n", tag().c_str(), ret));
return ret;
}
@@ -482,7 +482,7 @@ UINT8 pia6821_device::ddr_b_r()
{
UINT8 ret = m_ddr_b;
- LOG(("PIA #%s: DDR B read = %02X\n", tag(), ret));
+ LOG(("PIA #%s: DDR B read = %02X\n", tag().c_str(), ret));
return ret;
}
@@ -503,7 +503,7 @@ UINT8 pia6821_device::control_a_r()
}
else if(!m_logged_ca1_not_connected && (!m_in_ca1_pushed))
{
- logerror("PIA #%s: Warning! No CA1 read handler. Assuming pin not connected\n", tag());
+ logerror("PIA #%s: Warning! No CA1 read handler. Assuming pin not connected\n", tag().c_str());
m_logged_ca1_not_connected = true;
}
@@ -513,7 +513,7 @@ UINT8 pia6821_device::control_a_r()
}
else if ( !m_logged_ca2_not_connected && C2_INPUT(m_ctl_a) && !m_in_ca2_pushed)
{
- logerror("PIA #%s: Warning! No CA2 read handler. Assuming pin not connected\n", tag());
+ logerror("PIA #%s: Warning! No CA2 read handler. Assuming pin not connected\n", tag().c_str());
m_logged_ca2_not_connected = true;
}
@@ -531,7 +531,7 @@ UINT8 pia6821_device::control_a_r()
ret |= PIA_IRQ2;
}
- LOG(("PIA #%s: control A read = %02X\n", tag(), ret));
+ LOG(("PIA #%s: control A read = %02X\n", tag().c_str(), ret));
return ret;
}
@@ -552,13 +552,13 @@ UINT8 pia6821_device::control_b_r()
}
else if(!m_logged_cb1_not_connected && !m_in_cb1_pushed)
{
- logerror("PIA #%s: Error! no CB1 read handler. Three-state pin is undefined\n", tag());
+ logerror("PIA #%s: Error! no CB1 read handler. Three-state pin is undefined\n", tag().c_str());
m_logged_cb1_not_connected = true;
}
if(!m_logged_cb2_not_connected && C2_INPUT(m_ctl_b) && !m_in_cb2_pushed)
{
- logerror("PIA #%s: Error! Three-state pin is undefined\n", tag());
+ logerror("PIA #%s: Error! Three-state pin is undefined\n", tag().c_str());
m_logged_cb2_not_connected = true;
}
@@ -576,7 +576,7 @@ UINT8 pia6821_device::control_b_r()
ret |= PIA_IRQ2;
}
- LOG(("PIA #%s: control B read = %02X\n", tag(), ret));
+ LOG(("PIA #%s: control B read = %02X\n", tag().c_str(), ret));
return ret;
}
@@ -638,7 +638,7 @@ void pia6821_device::send_to_out_a_func(const char* message)
// input pins are pulled high
UINT8 data = get_out_a_value();
- LOG(("PIA #%s: %s = %02X\n", tag(), message, data));
+ LOG(("PIA #%s: %s = %02X\n", tag().c_str(), message, data));
if(!m_out_a_handler.isnull())
{
@@ -648,7 +648,7 @@ void pia6821_device::send_to_out_a_func(const char* message)
{
if(m_out_a_needs_pulled)
{
- logerror("PIA #%s: Warning! No port A write handler. Previous value has been lost!\n", tag());
+ logerror("PIA #%s: Warning! No port A write handler. Previous value has been lost!\n", tag().c_str());
}
m_out_a_needs_pulled = true;
@@ -665,7 +665,7 @@ void pia6821_device::send_to_out_b_func(const char* message)
// input pins are high-impedance - we just send them as zeros for backwards compatibility
UINT8 data = get_out_b_value();
- LOG(("PIA #%s: %s = %02X\n", tag(), message, data));
+ LOG(("PIA #%s: %s = %02X\n", tag().c_str(), message, data));
if(!m_out_b_handler.isnull())
{
@@ -675,7 +675,7 @@ void pia6821_device::send_to_out_b_func(const char* message)
{
if(m_out_b_needs_pulled)
{
- logerror("PIA #%s: Warning! No port B write handler. Previous value has been lost!\n", tag());
+ logerror("PIA #%s: Warning! No port B write handler. Previous value has been lost!\n", tag().c_str());
}
m_out_b_needs_pulled = true;
@@ -704,15 +704,15 @@ void pia6821_device::ddr_a_w(UINT8 data)
{
if(data == 0x00)
{
- LOG(("PIA #%s: DDR A write = %02X (input mode)\n", tag(), data));
+ LOG(("PIA #%s: DDR A write = %02X (input mode)\n", tag().c_str(), data));
}
else if(data == 0xff)
{
- LOG(("PIA #%s: DDR A write = %02X (output mode)\n", tag(), data));
+ LOG(("PIA #%s: DDR A write = %02X (output mode)\n", tag().c_str(), data));
}
else
{
- LOG(("PIA #%s: DDR A write = %02X (mixed mode)\n", tag(), data));
+ LOG(("PIA #%s: DDR A write = %02X (mixed mode)\n", tag().c_str(), data));
}
if(m_ddr_a != data)
@@ -759,15 +759,15 @@ void pia6821_device::ddr_b_w(UINT8 data)
{
if (data == 0x00)
{
- LOG(("PIA #%s: DDR B write = %02X (input mode)\n", tag(), data));
+ LOG(("PIA #%s: DDR B write = %02X (input mode)\n", tag().c_str(), data));
}
else if (data == 0xff)
{
- LOG(("PIA #%s: DDR B write = %02X (output mode)\n", tag(), data));
+ LOG(("PIA #%s: DDR B write = %02X (output mode)\n", tag().c_str(), data));
}
else
{
- LOG(("PIA #%s: DDR B write = %02X (mixed mode)\n", tag(), data));
+ LOG(("PIA #%s: DDR B write = %02X (mixed mode)\n", tag().c_str(), data));
}
if(m_ddr_b != data)
@@ -789,7 +789,7 @@ void pia6821_device::control_a_w(UINT8 data)
// bit 7 and 6 are read only
data &= 0x3f;
- LOG(("PIA #%s: control A write = %02X\n", tag(), data));
+ LOG(("PIA #%s: control A write = %02X\n", tag().c_str(), data));
// update the control register
m_ctl_a = data;
@@ -829,7 +829,7 @@ void pia6821_device::control_b_w(UINT8 data)
// bit 7 and 6 are read only
data &= 0x3f;
- LOG(("PIA #%s: control B write = %02X\n", tag(), data));
+ LOG(("PIA #%s: control B write = %02X\n", tag().c_str(), data));
// update the control register
m_ctl_b = data;
@@ -902,7 +902,7 @@ void pia6821_device::set_a_input(UINT8 data, UINT8 z_mask)
{
assert_always(m_in_a_handler.isnull(), "pia6821_porta_w() called when in_a_func implemented");
- LOG(("PIA #%s: set input port A = %02X\n", tag(), data));
+ LOG(("PIA #%s: set input port A = %02X\n", tag().c_str(), data));
m_in_a = data;
m_port_a_z_mask = z_mask;
@@ -938,12 +938,12 @@ UINT8 pia6821_device::a_output()
WRITE_LINE_MEMBER( pia6821_device::ca1_w )
{
- LOG(("PIA #%s: set input CA1 = %d\n", tag(), state));
+ LOG(("PIA #%s: set input CA1 = %d\n", tag().c_str(), state));
// the new state has caused a transition
if((m_in_ca1 != state) && ((state && C1_LOW_TO_HIGH(m_ctl_a)) || (!state && C1_HIGH_TO_LOW(m_ctl_a))))
{
- LOG(("PIA #%s: CA1 triggering\n", tag()));
+ LOG(("PIA #%s: CA1 triggering\n", tag().c_str()));
// mark the IRQ
m_irq_a1 = TRUE;
@@ -970,12 +970,12 @@ WRITE_LINE_MEMBER( pia6821_device::ca1_w )
WRITE_LINE_MEMBER( pia6821_device::ca2_w )
{
- LOG(("PIA #%s: set input CA2 = %d\n", tag(), state));
+ LOG(("PIA #%s: set input CA2 = %d\n", tag().c_str(), state));
// if input mode and the new state has caused a transition
if(C2_INPUT(m_ctl_a) && (m_in_ca2 != state) && ((state && C2_LOW_TO_HIGH(m_ctl_a)) || (!state && C2_HIGH_TO_LOW(m_ctl_a))))
{
- LOG(("PIA #%s: CA2 triggering\n", tag()));
+ LOG(("PIA #%s: CA2 triggering\n", tag().c_str()));
// mark the IRQ
m_irq_a2 = TRUE;
@@ -1025,7 +1025,7 @@ void pia6821_device::portb_w(UINT8 data)
{
assert_always(m_in_b_handler.isnull(), "pia_set_input_b() called when in_b_func implemented");
- LOG(("PIA #%s: set input port B = %02X\n", tag(), data));
+ LOG(("PIA #%s: set input port B = %02X\n", tag().c_str(), data));
m_in_b = data;
m_in_b_pushed = true;
@@ -1050,12 +1050,12 @@ UINT8 pia6821_device::b_output()
WRITE_LINE_MEMBER( pia6821_device::cb1_w )
{
- LOG(("PIA #%s: set input CB1 = %d\n", tag(), state));
+ LOG(("PIA #%s: set input CB1 = %d\n", tag().c_str(), state));
// the new state has caused a transition
if((m_in_cb1 != state) && ((state && C1_LOW_TO_HIGH(m_ctl_b)) || (!state && C1_HIGH_TO_LOW(m_ctl_b))))
{
- LOG(("PIA #%s: CB1 triggering\n", tag()));
+ LOG(("PIA #%s: CB1 triggering\n", tag().c_str()));
// mark the IRQ
m_irq_b1 = 1;
@@ -1081,14 +1081,14 @@ WRITE_LINE_MEMBER( pia6821_device::cb1_w )
WRITE_LINE_MEMBER( pia6821_device::cb2_w )
{
- LOG(("PIA #%s: set input CB2 = %d\n", tag(), state));
+ LOG(("PIA #%s: set input CB2 = %d\n", tag().c_str(), state));
// if input mode and the new state has caused a transition
if (C2_INPUT(m_ctl_b) &&
(m_in_cb2 != state) &&
((state && C2_LOW_TO_HIGH(m_ctl_b)) || (!state && C2_HIGH_TO_LOW(m_ctl_b))))
{
- LOG(("PIA #%s: CB2 triggering\n", tag()));
+ LOG(("PIA #%s: CB2 triggering\n", tag().c_str()));
// mark the IRQ
m_irq_b2 = 1;
diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h
index 64631184d29..946fa4ab514 100644
--- a/src/devices/machine/6821pia.h
+++ b/src/devices/machine/6821pia.h
@@ -78,7 +78,7 @@ class pia6821_device : public device_t
{
public:
// construction/destruction
- pia6821_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pia6821_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
// TODO: REMOVE THESE
diff --git a/src/devices/machine/68230pit.cpp b/src/devices/machine/68230pit.cpp
index 927ece2cb75..c30494f2a1d 100644
--- a/src/devices/machine/68230pit.cpp
+++ b/src/devices/machine/68230pit.cpp
@@ -26,7 +26,7 @@ const device_type PIT68230 = &device_creator<pit68230_device>;
//-------------------------------------------------
// pit68230_device - constructors
//-------------------------------------------------
-pit68230_device::pit68230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+pit68230_device::pit68230_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: device_t (mconfig, type, name, tag, owner, clock, shortname, source),
device_execute_interface (mconfig, *this)
, m_icount (0)
@@ -36,7 +36,7 @@ pit68230_device::pit68230_device(const machine_config &mconfig, device_type type
}
-pit68230_device::pit68230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pit68230_device::pit68230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t (mconfig, PIT68230, "PIT68230", tag, owner, clock, "pit68230", __FILE__),
device_execute_interface (mconfig, *this)
, m_icount (0)
diff --git a/src/devices/machine/68230pit.h b/src/devices/machine/68230pit.h
index 2a2f2c6824c..8d4a9ea892f 100644
--- a/src/devices/machine/68230pit.h
+++ b/src/devices/machine/68230pit.h
@@ -86,8 +86,8 @@ class pit68230_device : public device_t, public device_execute_interface
{
public:
// construction/destruction
-pit68230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
-pit68230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+pit68230_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+pit68230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_pa_wr_callback (device_t &device, _Object object)
{
return downcast<pit68230_device &>(device).m_write_pa.set_callback (object);
diff --git a/src/devices/machine/68307.cpp b/src/devices/machine/68307.cpp
index cbdd2c1eed8..29cf2b2eee7 100644
--- a/src/devices/machine/68307.cpp
+++ b/src/devices/machine/68307.cpp
@@ -52,7 +52,7 @@ machine_config_constructor m68307cpu_device::device_mconfig_additions() const
}
-m68307cpu_device::m68307cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68307cpu_device::m68307cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: m68000_device(mconfig, "MC68307", tag, owner, clock, M68307, 16,24, ADDRESS_MAP_NAME(m68307_internal_map), "mc68307", __FILE__),
write_irq(*this),
write_a_tx(*this),
diff --git a/src/devices/machine/68307.h b/src/devices/machine/68307.h
index 60ae61db49a..29583445d5e 100644
--- a/src/devices/machine/68307.h
+++ b/src/devices/machine/68307.h
@@ -39,7 +39,7 @@ typedef device_delegate<void (address_space &space, bool dedicated, UINT16 data,
class m68307cpu_device : public m68000_device {
public:
- m68307cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68307cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
/* trampolines so we can specify the 68681 serial configuration when adding the CPU */
template<class _Object> static devcb_base &set_irq_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_irq.set_callback(object); }
diff --git a/src/devices/machine/68340.cpp b/src/devices/machine/68340.cpp
index b9ddd9c4b16..67731a5027e 100644
--- a/src/devices/machine/68340.cpp
+++ b/src/devices/machine/68340.cpp
@@ -109,7 +109,7 @@ ADDRESS_MAP_END
-m68340cpu_device::m68340cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m68340cpu_device::m68340cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: fscpu32_device(mconfig, "MC68340", tag, owner, clock, M68340, 32,32, ADDRESS_MAP_NAME(m68340_internal_map), "mc68340", __FILE__)
{
m68340SIM = nullptr;
diff --git a/src/devices/machine/68340.h b/src/devices/machine/68340.h
index 4dd93bb6e51..4ffb3b9cc91 100644
--- a/src/devices/machine/68340.h
+++ b/src/devices/machine/68340.h
@@ -21,7 +21,7 @@
class m68340cpu_device : public fscpu32_device {
public:
- m68340cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m68340cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
int m68340_currentcs;
diff --git a/src/devices/machine/6840ptm.cpp b/src/devices/machine/6840ptm.cpp
index bbf9a57ce18..ab664982ac0 100644
--- a/src/devices/machine/6840ptm.cpp
+++ b/src/devices/machine/6840ptm.cpp
@@ -69,7 +69,7 @@ const device_type PTM6840 = &device_creator<ptm6840_device>;
// ptm6840_device - constructor
//-------------------------------------------------
-ptm6840_device::ptm6840_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ptm6840_device::ptm6840_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PTM6840, "6840 PTM", tag, owner, clock, "ptm6840", __FILE__),
m_internal_clock(0.0),
m_out0_cb(*this),
@@ -313,7 +313,7 @@ UINT16 ptm6840_device::compute_counter( int counter ) const
// If there's no timer, return the count
if (!m_enabled[counter])
{
- PLOG(("MC6840 #%s: read counter(%d): %d\n", tag(), counter, m_counter[counter]));
+ PLOG(("MC6840 #%s: read counter(%d): %d\n", tag().c_str(), counter, m_counter[counter]));
return m_counter[counter];
}
@@ -321,12 +321,12 @@ UINT16 ptm6840_device::compute_counter( int counter ) const
if (m_control_reg[counter] & 0x02)
{
clock = m_internal_clock;
- PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag(), counter, clock));
+ PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag().c_str(), counter, clock));
}
else
{
clock = m_external_clock[counter];
- PLOG(("MC6840 #%s: %d external clock freq %f \n", tag(), counter, clock));
+ PLOG(("MC6840 #%s: %d external clock freq %f \n", tag().c_str(), counter, clock));
}
// See how many are left
int remaining = (m_timer[counter]->remaining() * clock).as_double();
@@ -339,7 +339,7 @@ UINT16 ptm6840_device::compute_counter( int counter ) const
int lsb = remaining % divisor;
remaining = (msb << 8) | lsb;
}
- PLOG(("MC6840 #%s: read counter(%d): %d\n", tag(), counter, remaining));
+ PLOG(("MC6840 #%s: read counter(%d): %d\n", tag().c_str(), counter, remaining));
return remaining;
}
@@ -360,12 +360,12 @@ void ptm6840_device::reload_count(int idx)
if (m_control_reg[idx] & 0x02)
{
clock = m_internal_clock;
- PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag(), idx, clock));
+ PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag().c_str(), idx, clock));
}
else
{
clock = m_external_clock[idx];
- PLOG(("MC6840 #%s: %d external clock freq %f \n", tag(), idx, clock));
+ PLOG(("MC6840 #%s: %d external clock freq %f \n", tag().c_str(), idx, clock));
}
// Determine the number of clock periods before we expire
@@ -399,7 +399,7 @@ void ptm6840_device::reload_count(int idx)
}
// Set the timer
- PLOG(("MC6840 #%s: reload_count(%d): clock = %f count = %d\n", tag(), idx, clock, count));
+ PLOG(("MC6840 #%s: reload_count(%d): clock = %f count = %d\n", tag().c_str(), idx, clock, count));
attotime duration = attotime::from_hz(clock) * count;
if (idx == 2)
@@ -407,7 +407,7 @@ void ptm6840_device::reload_count(int idx)
duration *= m_t3_divisor;
}
- PLOG(("MC6840 #%s: reload_count(%d): output = %f\n", tag(), idx, duration.as_double()));
+ PLOG(("MC6840 #%s: reload_count(%d): output = %f\n", tag().c_str(), idx, duration.as_double()));
#if 0
if (!(m_control_reg[idx] & 0x02))
@@ -447,7 +447,7 @@ READ8_MEMBER( ptm6840_device::read )
case PTM_6840_STATUS:
{
- PLOG(("%s: MC6840 #%s: Status read = %04X\n", machine().describe_context(), tag(), m_status_reg));
+ PLOG(("%s: MC6840 #%s: Status read = %04X\n", machine().describe_context(), tag().c_str(), m_status_reg));
m_status_read_since_int |= m_status_reg & 0x07;
val = m_status_reg;
break;
@@ -469,7 +469,7 @@ READ8_MEMBER( ptm6840_device::read )
m_lsb_buffer = result & 0xff;
- PLOG(("%s: MC6840 #%s: Counter %d read = %04X\n", machine().describe_context(), tag(), idx, result >> 8));
+ PLOG(("%s: MC6840 #%s: Counter %d read = %04X\n", machine().describe_context(), tag().c_str(), idx, result >> 8));
val = result >> 8;
break;
}
@@ -510,7 +510,7 @@ WRITE8_MEMBER( ptm6840_device::write )
m_mode[idx] = (data >> 3) & 0x07;
m_control_reg[idx] = data;
- PLOG(("MC6840 #%s : Control register %d selected\n", tag(), idx));
+ PLOG(("MC6840 #%s : Control register %d selected\n", tag().c_str(), idx));
PLOG(("operation mode = %s\n", opmode[ m_mode[idx] ]));
PLOG(("value = %04X\n", m_control_reg[idx]));
PLOG(("t3divisor = %d\n", m_t3_divisor));
@@ -537,7 +537,7 @@ WRITE8_MEMBER( ptm6840_device::write )
// Holding reset down
if (data & 0x01)
{
- PLOG(("MC6840 #%s : Timer reset\n", tag()));
+ PLOG(("MC6840 #%s : Timer reset\n", tag().c_str()));
for (int i = 0; i < 3; i++)
{
m_timer[i]->enable(false);
@@ -569,7 +569,7 @@ WRITE8_MEMBER( ptm6840_device::write )
case PTM_6840_MSBBUF2:
case PTM_6840_MSBBUF3:
{
- PLOG(("MC6840 #%s msbbuf%d = %02X\n", tag(), offset / 2, data));
+ PLOG(("MC6840 #%s msbbuf%d = %02X\n", tag().c_str(), offset / 2, data));
m_msb_buffer = data;
break;
}
@@ -591,7 +591,7 @@ WRITE8_MEMBER( ptm6840_device::write )
reload_count(idx);
}
- PLOG(("%s:MC6840 #%s: Counter %d latch = %04X\n", machine().describe_context(), tag(), idx, m_latch[idx]));
+ PLOG(("%s:MC6840 #%s: Counter %d latch = %04X\n", machine().describe_context(), tag().c_str(), idx, m_latch[idx]));
break;
}
}
@@ -604,7 +604,7 @@ WRITE8_MEMBER( ptm6840_device::write )
void ptm6840_device::timeout(int idx)
{
- PLOG(("**ptm6840 %s t%d timeout**\n", tag(), idx));
+ PLOG(("**ptm6840 %s t%d timeout**\n", tag().c_str(), idx));
// Set the interrupt flag
m_status_reg |= (1 << idx);
@@ -616,7 +616,7 @@ void ptm6840_device::timeout(int idx)
if ((m_mode[idx] == 0)||(m_mode[idx] == 2))
{
m_output[idx] = m_output[idx] ? 0 : 1;
- PLOG(("**ptm6840 %s t%d output %d **\n", tag(), idx, m_output[idx]));
+ PLOG(("**ptm6840 %s t%d output %d **\n", tag().c_str(), idx, m_output[idx]));
switch (idx)
{
@@ -636,7 +636,7 @@ void ptm6840_device::timeout(int idx)
if (!m_fired[idx])
{
m_output[idx] = 1;
- PLOG(("**ptm6840 %s t%d output %d **\n", tag(), idx, m_output[idx]));
+ PLOG(("**ptm6840 %s t%d output %d **\n", tag().c_str(), idx, m_output[idx]));
switch (idx)
{
diff --git a/src/devices/machine/6840ptm.h b/src/devices/machine/6840ptm.h
index 5eb1cdd211c..36ac531cb24 100644
--- a/src/devices/machine/6840ptm.h
+++ b/src/devices/machine/6840ptm.h
@@ -49,7 +49,7 @@ class ptm6840_device : public device_t
{
public:
// construction/destruction
- ptm6840_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ptm6840_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_internal_clock(device_t &device, double clock) { downcast<ptm6840_device &>(device).m_internal_clock = clock; }
static void set_external_clocks(device_t &device, double clock0, double clock1, double clock2) { downcast<ptm6840_device &>(device).m_external_clock[0] = clock0; downcast<ptm6840_device &>(device).m_external_clock[1] = clock1; downcast<ptm6840_device &>(device).m_external_clock[2] = clock2; }
diff --git a/src/devices/machine/6850acia.cpp b/src/devices/machine/6850acia.cpp
index 7c1fcc85178..7a70b05e300 100644
--- a/src/devices/machine/6850acia.cpp
+++ b/src/devices/machine/6850acia.cpp
@@ -64,7 +64,7 @@ const device_type ACIA6850 = &device_creator<acia6850_device>;
// acia6850_device - constructor
//-------------------------------------------------
-acia6850_device::acia6850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+acia6850_device::acia6850_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ACIA6850, "6850 ACIA", tag, owner, clock, "acia6850", __FILE__),
m_txd_handler(*this),
m_rts_handler(*this),
@@ -88,7 +88,7 @@ acia6850_device::acia6850_device(const machine_config &mconfig, const char *tag,
{
}
-acia6850_device::acia6850_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+acia6850_device::acia6850_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_txd_handler(*this),
m_rts_handler(*this),
@@ -183,7 +183,7 @@ READ8_MEMBER( acia6850_device::status_r )
WRITE8_MEMBER( acia6850_device::control_w )
{
- if (LOG) logerror("MC6850 '%s' Control: %02x\n", tag(), data);
+ if (LOG) logerror("MC6850 '%s' Control: %02x\n", tag().c_str(), data);
// CR0 & CR1
int counter_divide_select_bits = (data >> 0) & 3;
@@ -253,7 +253,7 @@ void acia6850_device::update_irq()
WRITE8_MEMBER( acia6850_device::data_w )
{
- if (LOG) logerror("MC6850 '%s' Data: %02x\n", tag(), data);
+ if (LOG) logerror("MC6850 '%s' Data: %02x\n", tag().c_str(), data);
/// TODO: find out if data stored during master reset is sent after divider is set
if (m_divide == 0)
@@ -343,7 +343,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc )
{
if (m_rx_counter == 1)
{
- if (LOG) logerror("MC6850 '%s': RX START BIT\n", tag());
+ if (LOG) logerror("MC6850 '%s': RX START BIT\n", tag().c_str());
}
if (m_rx_counter >= m_divide / 2)
@@ -359,7 +359,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc )
{
if (m_rx_counter != 1)
{
- if (LOG) logerror("MC6850 '%s': RX FALSE START BIT\n", tag());
+ if (LOG) logerror("MC6850 '%s': RX FALSE START BIT\n", tag().c_str());
}
m_rx_counter = 0;
@@ -373,11 +373,11 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc )
if (m_rx_bits < m_bits)
{
- if (LOG) logerror("MC6850 '%s': RX DATA BIT %d %d\n", tag(), m_rx_bits, m_rxd);
+ if (LOG) logerror("MC6850 '%s': RX DATA BIT %d %d\n", tag().c_str(), m_rx_bits, m_rxd);
}
else
{
- if (LOG) logerror("MC6850 '%s': RX PARITY BIT %x\n", tag(), m_rxd);
+ if (LOG) logerror("MC6850 '%s': RX PARITY BIT %x\n", tag().c_str(), m_rxd);
}
if (m_rxd)
@@ -433,7 +433,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc )
{
m_rx_counter = 0;
- if (LOG) logerror("MC6850 '%s': RX STOP BIT\n", tag());
+ if (LOG) logerror("MC6850 '%s': RX STOP BIT\n", tag().c_str());
if (!m_rxd)
{
@@ -479,7 +479,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
if (!(m_status & SR_TDRE) && !(m_status & SR_CTS))
{
- if (LOG) logerror("MC6850 '%s': TX DATA %x\n", tag(), m_tdr);
+ if (LOG) logerror("MC6850 '%s': TX DATA %x\n", tag().c_str(), m_tdr);
m_tx_state = STATE_DATA;
m_tx_shift = m_tdr;
@@ -487,7 +487,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
m_tx_parity = 0;
m_status |= SR_TDRE;
- if (LOG) logerror("MC6850 '%s': TX START BIT\n", tag());
+ if (LOG) logerror("MC6850 '%s': TX START BIT\n", tag().c_str());
output_txd(0);
}
@@ -510,7 +510,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
m_tx_bits++;
m_tx_parity ^= m_txd;
- if (LOG) logerror("MC6850 '%s': TX DATA BIT %d %d\n", tag(), m_tx_bits, m_txd);
+ if (LOG) logerror("MC6850 '%s': TX DATA BIT %d %d\n", tag().c_str(), m_tx_bits, m_txd);
}
else if (m_tx_bits == m_bits && m_parity != PARITY_NONE)
{
@@ -524,7 +524,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
output_txd(m_tx_parity);
- if (LOG) logerror("MC6850 '%s': TX PARITY BIT %d\n", tag(), m_txd);
+ if (LOG) logerror("MC6850 '%s': TX PARITY BIT %d\n", tag().c_str(), m_txd);
}
else
{
@@ -543,7 +543,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
m_tx_bits++;
- if (LOG) logerror("MC6850 '%s': TX STOP BIT %d\n", tag(), m_tx_bits);
+ if (LOG) logerror("MC6850 '%s': TX STOP BIT %d\n", tag().c_str(), m_tx_bits);
if (m_tx_bits == m_stopbits)
{
diff --git a/src/devices/machine/6850acia.h b/src/devices/machine/6850acia.h
index efaf153bc0c..6712a07d7a5 100644
--- a/src/devices/machine/6850acia.h
+++ b/src/devices/machine/6850acia.h
@@ -28,7 +28,7 @@ class acia6850_device : public device_t
{
public:
// construction/destruction
- acia6850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ acia6850_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast<acia6850_device &>(device).m_txd_handler.set_callback(object); }
@@ -47,7 +47,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( write_txc );
protected:
- acia6850_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ acia6850_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/machine/68561mpcc.cpp b/src/devices/machine/68561mpcc.cpp
index 29c5673a052..3b5c8904a06 100644
--- a/src/devices/machine/68561mpcc.cpp
+++ b/src/devices/machine/68561mpcc.cpp
@@ -27,7 +27,7 @@ const device_type MPCC68561 = &device_creator<mpcc68561_t>;
IMPLEMENTATION
***************************************************************************/
-mpcc68561_t::mpcc68561_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mpcc68561_t::mpcc68561_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MPCC68561, "Rockwell 68561 MPCC", tag, owner, clock, "mpcc68561", __FILE__), mode(0), reg(0), status(0), IRQV(0), MasterIRQEnable(0), lastIRQStat(0), IRQType(),
intrq_cb(*this)
{
diff --git a/src/devices/machine/68561mpcc.h b/src/devices/machine/68561mpcc.h
index bb0bb4c2c6d..683a17bc6ff 100644
--- a/src/devices/machine/68561mpcc.h
+++ b/src/devices/machine/68561mpcc.h
@@ -31,7 +31,7 @@ public:
IRQ_B_EXT
};
- mpcc68561_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mpcc68561_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<mpcc68561_t &>(device).intrq_cb.set_callback(object); }
diff --git a/src/devices/machine/7200fifo.cpp b/src/devices/machine/7200fifo.cpp
index 59e659ae9b5..1b790ff93d1 100644
--- a/src/devices/machine/7200fifo.cpp
+++ b/src/devices/machine/7200fifo.cpp
@@ -19,7 +19,7 @@ const device_type FIFO7200 = &device_creator<fifo7200_device>;
// fifo7200_device - constructor
//-------------------------------------------------
-fifo7200_device::fifo7200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fifo7200_device::fifo7200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, FIFO7200, "IDT7200 FIFO", tag, owner, clock, "fifo7200", __FILE__),
m_ram_size(0), m_read_ptr(0), m_write_ptr(0), m_ef(0), m_ff(0), m_hf(0),
m_ef_handler(*this),
@@ -77,7 +77,7 @@ void fifo7200_device::fifo_write(UINT16 data)
{
if (m_ff)
{
- logerror("IDT7200 %s fifo_write overflow!\n", tag());
+ logerror("IDT7200 %s fifo_write overflow!\n", tag().c_str());
return;
}
@@ -108,7 +108,7 @@ UINT16 fifo7200_device::fifo_read()
{
if (m_ef)
{
- logerror("IDT7200 %s fifo_read underflow!\n", tag());
+ logerror("IDT7200 %s fifo_read underflow!\n", tag().c_str());
return 0x1ff;
}
diff --git a/src/devices/machine/7200fifo.h b/src/devices/machine/7200fifo.h
index 044484de076..4e848231f32 100644
--- a/src/devices/machine/7200fifo.h
+++ b/src/devices/machine/7200fifo.h
@@ -81,7 +81,7 @@ The following chips are functionally equivalent and pin-compatible.
class fifo7200_device : public device_t
{
public:
- fifo7200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fifo7200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_ef_handler(device_t &device, _Object object) { return downcast<fifo7200_device &>(device).m_ef_handler.set_callback(object); }
diff --git a/src/devices/machine/74123.cpp b/src/devices/machine/74123.cpp
index d5eddbe91a3..551bdbe0a68 100644
--- a/src/devices/machine/74123.cpp
+++ b/src/devices/machine/74123.cpp
@@ -28,7 +28,7 @@ const device_type TTL74123 = &device_creator<ttl74123_device>;
// ttl74123_device - constructor
//-------------------------------------------------
-ttl74123_device::ttl74123_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ttl74123_device::ttl74123_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL74123, "74123 TTL", tag, owner, clock, "ttl74123", __FILE__), m_timer(nullptr),
m_connection_type(TTL74123_NOT_GROUNDED_NO_DIODE),
m_res(1.0),
@@ -135,7 +135,7 @@ void ttl74123_device::set_output()
machine().scheduler().timer_set( attotime::zero, timer_expired_delegate(FUNC(ttl74123_device::output_callback ),this), output);
- if (LOG) logerror("74123 %s: Output: %d\n", tag(), output);
+ if (LOG) logerror("74123 %s: Output: %d\n", tag().c_str(), output);
}
@@ -167,11 +167,11 @@ void ttl74123_device::start_pulse()
{
m_timer->adjust(duration);
- if (LOG) logerror("74123 %s: Retriggering pulse. Duration: %f\n", tag(), duration.as_double());
+ if (LOG) logerror("74123 %s: Retriggering pulse. Duration: %f\n", tag().c_str(), duration.as_double());
}
else
{
- if (LOG) logerror("74123 %s: Retriggering failed.\n", tag());
+ if (LOG) logerror("74123 %s: Retriggering failed.\n", tag().c_str());
}
}
else
@@ -181,7 +181,7 @@ void ttl74123_device::start_pulse()
set_output();
- if (LOG) logerror("74123 %s: Starting pulse. Duration: %f\n", tag(), duration.as_double());
+ if (LOG) logerror("74123 %s: Starting pulse. Duration: %f\n", tag().c_str(), duration.as_double());
}
}
@@ -233,7 +233,7 @@ WRITE8_MEMBER( ttl74123_device::clear_w)
{
m_timer->adjust(attotime::zero);
- if (LOG) logerror("74123 #%s: Cleared\n", tag() );
+ if (LOG) logerror("74123 #%s: Cleared\n", tag().c_str() );
}
m_clear = data;
}
diff --git a/src/devices/machine/74123.h b/src/devices/machine/74123.h
index 898dd48e6ea..bebc42580a4 100644
--- a/src/devices/machine/74123.h
+++ b/src/devices/machine/74123.h
@@ -96,7 +96,7 @@ class ttl74123_device : public device_t
{
public:
// construction/destruction
- ttl74123_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ttl74123_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_connection_type(device_t &device, int type) { downcast<ttl74123_device &>(device).m_connection_type = type; }
static void set_resistor_value(device_t &device, double value) { downcast<ttl74123_device &>(device).m_res = value; }
diff --git a/src/devices/machine/74145.cpp b/src/devices/machine/74145.cpp
index f85439398de..52f4ac8503d 100644
--- a/src/devices/machine/74145.cpp
+++ b/src/devices/machine/74145.cpp
@@ -59,7 +59,7 @@ const device_type TTL74145 = &device_creator<ttl74145_device>;
// ttl74145_device - constructor
//-------------------------------------------------
-ttl74145_device::ttl74145_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ttl74145_device::ttl74145_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL74145, "TTL74145", tag, owner, clock, "ttl74145", __FILE__)
, m_output_line_0_cb(*this)
, m_output_line_1_cb(*this)
diff --git a/src/devices/machine/74145.h b/src/devices/machine/74145.h
index a6472f69291..adbb48a1834 100644
--- a/src/devices/machine/74145.h
+++ b/src/devices/machine/74145.h
@@ -54,7 +54,7 @@ class ttl74145_device : public device_t
{
public:
// construction/destruction
- ttl74145_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ttl74145_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_output_line_0_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_output_line_1_callback(device_t &device, _Object object) { return downcast<ttl74145_device &>(device).m_output_line_1_cb.set_callback(object); }
diff --git a/src/devices/machine/74148.cpp b/src/devices/machine/74148.cpp
index 71520535f63..d6065ebb4e1 100644
--- a/src/devices/machine/74148.cpp
+++ b/src/devices/machine/74148.cpp
@@ -46,7 +46,7 @@
const device_type TTL74148 = &device_creator<ttl74148_device>;
-ttl74148_device::ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ttl74148_device::ttl74148_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL74148, "74148 TTL", tag, owner, clock, "74148", __FILE__),
m_enable_input(0),
m_output(0),
diff --git a/src/devices/machine/74148.h b/src/devices/machine/74148.h
index 37ca98cf0ec..8efedd3ec42 100644
--- a/src/devices/machine/74148.h
+++ b/src/devices/machine/74148.h
@@ -52,10 +52,13 @@ typedef device_delegate<void (void)> ttl74148_output_delegate;
class ttl74148_device : public device_t
{
public:
- ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ttl74148_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~ttl74148_device() {}
- static void set_output_callback(device_t &device, ttl74148_output_delegate callback) { downcast<ttl74148_device &>(device).m_output_cb = callback; }
+ static void set_output_callback(device_t &device, ttl74148_output_delegate callback)
+ {
+ downcast<ttl74148_device &>(device).m_output_cb = callback;
+ }
/* must call update() after setting the inputs */
void update();
diff --git a/src/devices/machine/74153.cpp b/src/devices/machine/74153.cpp
index d5b8ad37634..c9f4ff0ab4a 100644
--- a/src/devices/machine/74153.cpp
+++ b/src/devices/machine/74153.cpp
@@ -41,7 +41,7 @@
const device_type TTL74153 = &device_creator<ttl74153_device>;
-ttl74153_device::ttl74153_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ttl74153_device::ttl74153_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL74153, "74153 TTL", tag, owner, clock, "74153", __FILE__),
m_a(0),
m_b(0)
diff --git a/src/devices/machine/74153.h b/src/devices/machine/74153.h
index 491fce01565..d285c9bb2b0 100644
--- a/src/devices/machine/74153.h
+++ b/src/devices/machine/74153.h
@@ -47,7 +47,7 @@ typedef device_delegate<void (void)> ttl74153_output_delegate;
class ttl74153_device : public device_t
{
public:
- ttl74153_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ttl74153_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~ttl74153_device() {}
static void set_output_callback(device_t &device, ttl74153_output_delegate callback) { downcast<ttl74153_device &>(device).m_output_cb = callback; }
diff --git a/src/devices/machine/74181.cpp b/src/devices/machine/74181.cpp
index a58b2cd190c..b8eaa70cbdf 100644
--- a/src/devices/machine/74181.cpp
+++ b/src/devices/machine/74181.cpp
@@ -26,7 +26,7 @@ const device_type TTL74181 = &device_creator<ttl74181_device>;
// ttl74181_device - constructor
//-------------------------------------------------
-ttl74181_device::ttl74181_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ttl74181_device::ttl74181_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, TTL74181, "74181 TTL", tag, owner, clock, "ttl74181", __FILE__),
m_a(0),
m_b(0),
diff --git a/src/devices/machine/74181.h b/src/devices/machine/74181.h
index 563acb3943e..0a521db590e 100644
--- a/src/devices/machine/74181.h
+++ b/src/devices/machine/74181.h
@@ -33,7 +33,7 @@ class ttl74181_device : public device_t
{
public:
// construction/destruction
- ttl74181_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ttl74181_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inputs
void input_a_w(UINT8 data);
diff --git a/src/devices/machine/7474.cpp b/src/devices/machine/7474.cpp
index 1b6ce95033d..dcf3dae2e3d 100644
--- a/src/devices/machine/7474.cpp
+++ b/src/devices/machine/7474.cpp
@@ -55,7 +55,7 @@ const device_type TTL7474 = &device_creator<ttl7474_device>;
// ttl7474_device - constructor
//-------------------------------------------------
-ttl7474_device::ttl7474_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ttl7474_device::ttl7474_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL7474, "7474 TTL", tag, owner, clock, "7474", __FILE__),
m_output_func(*this),
m_comp_output_func(*this)
diff --git a/src/devices/machine/7474.h b/src/devices/machine/7474.h
index 15ece073ad1..d029aec0752 100644
--- a/src/devices/machine/7474.h
+++ b/src/devices/machine/7474.h
@@ -69,7 +69,7 @@ class ttl7474_device : public device_t
{
public:
// construction/destruction
- ttl7474_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ttl7474_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_output_cb(device_t &device, _Object object) { return downcast<ttl7474_device &>(device).m_output_func.set_callback(object); }
diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp
index a1d36a41b43..98901cc280a 100644
--- a/src/devices/machine/8042kbdc.cpp
+++ b/src/devices/machine/8042kbdc.cpp
@@ -196,7 +196,7 @@ const device_type KBDC8042 = &device_creator<kbdc8042_device>;
// kbdc8042_device - constructor
//-------------------------------------------------
-kbdc8042_device::kbdc8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kbdc8042_device::kbdc8042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KBDC8042, "8042 Keyboard Controller", tag, owner, clock, "kbdc8042", __FILE__)
, m_keyboard_dev(*this, "at_keyboard")
, m_system_reset_cb(*this)
diff --git a/src/devices/machine/8042kbdc.h b/src/devices/machine/8042kbdc.h
index 169c2f9cb12..4f5fe666f03 100644
--- a/src/devices/machine/8042kbdc.h
+++ b/src/devices/machine/8042kbdc.h
@@ -54,7 +54,7 @@ class kbdc8042_device : public device_t
{
public:
// construction/destruction
- kbdc8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kbdc8042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/machine/8530scc.cpp b/src/devices/machine/8530scc.cpp
index c618fd57004..7f344047b01 100644
--- a/src/devices/machine/8530scc.cpp
+++ b/src/devices/machine/8530scc.cpp
@@ -25,7 +25,7 @@ const device_type SCC8530 = &device_creator<scc8530_t>;
IMPLEMENTATION
***************************************************************************/
-scc8530_t::scc8530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+scc8530_t::scc8530_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SCC8530, "Zilog 8530 SCC (Legacy)", tag, owner, clock, "scc8530l", __FILE__), mode(0), reg(0), status(0), IRQV(0), MasterIRQEnable(0), lastIRQStat(0), IRQType(),
intrq_cb(*this)
{
diff --git a/src/devices/machine/8530scc.h b/src/devices/machine/8530scc.h
index 2e6e703ceb8..2032c89ad34 100644
--- a/src/devices/machine/8530scc.h
+++ b/src/devices/machine/8530scc.h
@@ -29,7 +29,7 @@ public:
IRQ_B_EXT
};
- scc8530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scc8530_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<scc8530_t &>(device).intrq_cb.set_callback(object); }
diff --git a/src/devices/machine/aakart.cpp b/src/devices/machine/aakart.cpp
index 7931f1c019d..0701542c640 100644
--- a/src/devices/machine/aakart.cpp
+++ b/src/devices/machine/aakart.cpp
@@ -39,7 +39,7 @@ const device_type AAKART = &device_creator<aakart_device>;
// aakart_device - constructor
//-------------------------------------------------
-aakart_device::aakart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+aakart_device::aakart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AAKART, "AAKART", tag, owner, clock, "aakart", __FILE__), m_rxtimer(nullptr), m_txtimer(nullptr), m_mousetimer(nullptr), m_keybtimer(nullptr),
m_out_tx_cb(*this),
m_out_rx_cb(*this), m_tx_latch(0), m_rx(0), m_new_command(0), m_status(0), m_mouse_enable(0), m_keyb_enable(0), m_keyb_row(0), m_keyb_col(0), m_keyb_state(0)
diff --git a/src/devices/machine/aakart.h b/src/devices/machine/aakart.h
index 15eefd6bf92..1e209211676 100644
--- a/src/devices/machine/aakart.h
+++ b/src/devices/machine/aakart.h
@@ -43,7 +43,7 @@ class aakart_device : public device_t
{
public:
// construction/destruction
- aakart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ aakart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<aakart_device &>(device).m_out_tx_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_rx_callback(device_t &device, _Object object) { return downcast<aakart_device &>(device).m_out_rx_cb.set_callback(object); }
diff --git a/src/devices/machine/adc0808.cpp b/src/devices/machine/adc0808.cpp
index da7b21f883e..6336fdd6869 100644
--- a/src/devices/machine/adc0808.cpp
+++ b/src/devices/machine/adc0808.cpp
@@ -23,7 +23,7 @@ const device_type ADC0808 = &device_creator<adc0808_device>;
// adc0808_device - constructor
//-------------------------------------------------
-adc0808_device::adc0808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc0808_device::adc0808_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ADC0808, "ADC0808", tag, owner, clock, "adc0808", __FILE__),
m_out_eoc_cb(*this),
m_address(0),
diff --git a/src/devices/machine/adc0808.h b/src/devices/machine/adc0808.h
index 9a863e4ef81..08596cf1136 100644
--- a/src/devices/machine/adc0808.h
+++ b/src/devices/machine/adc0808.h
@@ -80,7 +80,7 @@ class adc0808_device : public device_t
{
public:
// construction/destruction
- adc0808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc0808_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_eoc_callback(device_t &device, _Object object) { return downcast<adc0808_device &>(device).m_out_eoc_cb.set_callback(object); }
static void set_in_vref_pos_callback(device_t &device, adc0808_analog_read_delegate callback) { downcast<adc0808_device &>(device).m_in_vref_pos_cb = callback; }
diff --git a/src/devices/machine/adc083x.cpp b/src/devices/machine/adc083x.cpp
index 690c2d0e1fd..620bec89f4a 100644
--- a/src/devices/machine/adc083x.cpp
+++ b/src/devices/machine/adc083x.cpp
@@ -51,7 +51,7 @@ const device_type ADC0832 = &device_creator<adc0832_device>;
const device_type ADC0834 = &device_creator<adc0834_device>;
const device_type ADC0838 = &device_creator<adc0838_device>;
-adc083x_device::adc083x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+adc083x_device::adc083x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_cs(0),
m_clk(0),
@@ -68,25 +68,25 @@ adc083x_device::adc083x_device(const machine_config &mconfig, device_type type,
{
}
-adc0831_device::adc0831_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc0831_device::adc0831_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adc083x_device(mconfig, ADC0831, "ADC0831", tag, owner, clock, "adc0831", __FILE__)
{
m_mux_bits = 0;
}
-adc0832_device::adc0832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc0832_device::adc0832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adc083x_device(mconfig, ADC0832, "ADC0832", tag, owner, clock, "adc0832", __FILE__)
{
m_mux_bits = 2;
}
-adc0834_device::adc0834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc0834_device::adc0834_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adc083x_device(mconfig, ADC0834, "ADC0834", tag, owner, clock, "adc0834", __FILE__)
{
m_mux_bits = 3;
}
-adc0838_device::adc0838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc0838_device::adc0838_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adc083x_device(mconfig, ADC0838, "ADC0838", tag, owner, clock, "adc0838", __FILE__)
{
m_mux_bits = 4;
@@ -144,7 +144,7 @@ WRITE_LINE_MEMBER( adc083x_device::cs_write )
{
if( m_cs != state )
{
- verboselog( 2, *this, "adc083x_cs_write( %s, %d )\n", tag(), state );
+ verboselog( 2, *this, "adc083x_cs_write( %s, %d )\n", tag().c_str(), state );
}
if( m_cs == 0 && state != 0 )
@@ -259,7 +259,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
if( m_clk != state )
{
- verboselog( 2, *this, "adc083x_clk_write( %s, %d )\n", tag(), state );
+ verboselog( 2, *this, "adc083x_clk_write( %s, %d )\n", tag().c_str(), state );
}
if( m_cs == 0 )
@@ -271,7 +271,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
case STATE_WAIT_FOR_START:
if( m_di != 0 )
{
- verboselog( 1, *this, "adc083x %s got start bit\n", tag() );
+ verboselog( 1, *this, "adc083x %s got start bit\n", tag().c_str() );
m_state = STATE_SHIFT_MUX;
m_sars = 0;
m_sgl = 0;
@@ -282,7 +282,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
}
else
{
- verboselog( 1, *this, "adc083x %s not start bit\n", tag() );
+ verboselog( 1, *this, "adc083x %s not start bit\n", tag().c_str() );
}
break;
@@ -294,7 +294,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
m_sgl = 1;
}
- verboselog( 1, *this, "adc083x %s sgl <- %d\n", tag(), m_sgl );
+ verboselog( 1, *this, "adc083x %s sgl <- %d\n", tag().c_str(), m_sgl );
break;
case 1:
@@ -302,7 +302,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
m_odd = 1;
}
- verboselog( 1, *this, "adc083x %s odd <- %d\n", tag(), m_odd );
+ verboselog( 1, *this, "adc083x %s odd <- %d\n", tag().c_str(), m_odd );
break;
case 2:
@@ -310,7 +310,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
m_sel1 = 1;
}
- verboselog( 1, *this, "adc083x %s sel1 <- %d\n", tag(), m_sel1 );
+ verboselog( 1, *this, "adc083x %s sel1 <- %d\n", tag().c_str(), m_sel1 );
break;
case 3:
@@ -318,7 +318,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
m_sel0 = 1;
}
- verboselog( 1, *this, "adc083x %s sel0 <- %d\n", tag(), m_sel0 );
+ verboselog( 1, *this, "adc083x %s sel0 <- %d\n", tag().c_str(), m_sel0 );
break;
}
@@ -334,11 +334,11 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
m_sars = 0;
if( type() == ADC0838 && m_se != 0 )
{
- verboselog( 1, *this, "adc083x %s not se\n", tag() );
+ verboselog( 1, *this, "adc083x %s not se\n", tag().c_str() );
}
else
{
- verboselog( 1, *this, "adc083x %s got se\n", tag() );
+ verboselog( 1, *this, "adc083x %s got se\n", tag().c_str() );
m_state = STATE_OUTPUT_LSB_FIRST;
m_bit = 1;
}
@@ -351,7 +351,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
switch( m_state )
{
case STATE_MUX_SETTLE:
- verboselog( 1, *this, "adc083x %s mux settle\n", tag() );
+ verboselog( 1, *this, "adc083x %s mux settle\n", tag().c_str() );
m_output = conversion();
m_state = STATE_OUTPUT_MSB_FIRST;
m_bit = 7;
@@ -361,7 +361,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
case STATE_OUTPUT_MSB_FIRST:
m_do = ( m_output >> m_bit ) & 1;
- verboselog( 1, *this, "adc083x %s msb %d -> %d\n", tag(), m_bit, m_do );
+ verboselog( 1, *this, "adc083x %s msb %d -> %d\n", tag().c_str(), m_bit, m_do );
m_bit--;
if( m_bit < 0 )
@@ -379,7 +379,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
case STATE_OUTPUT_LSB_FIRST:
m_do = ( m_output >> m_bit ) & 1;
- verboselog( 1, *this, "adc083x %s lsb %d -> %d\n", tag(), m_bit, m_do );
+ verboselog( 1, *this, "adc083x %s lsb %d -> %d\n", tag().c_str(), m_bit, m_do );
m_bit++;
if( m_bit == 8 )
@@ -407,7 +407,7 @@ WRITE_LINE_MEMBER( adc083x_device::di_write )
{
if( m_di != state )
{
- verboselog( 2, *this, "adc083x_di_write( %s, %d )\n", tag(), state );
+ verboselog( 2, *this, "adc083x_di_write( %s, %d )\n", tag().c_str(), state );
}
m_di = state;
@@ -421,7 +421,7 @@ WRITE_LINE_MEMBER( adc083x_device::se_write )
{
if( m_se != state )
{
- verboselog( 2, *this, "adc083x_se_write( %s, %d )\n", tag(), state );
+ verboselog( 2, *this, "adc083x_se_write( %s, %d )\n", tag().c_str(), state );
}
m_se = state;
@@ -433,7 +433,7 @@ WRITE_LINE_MEMBER( adc083x_device::se_write )
READ_LINE_MEMBER( adc083x_device::sars_read )
{
- verboselog( 1, *this, "adc083x_sars_read( %s ) %d\n", tag(), m_sars );
+ verboselog( 1, *this, "adc083x_sars_read( %s ) %d\n", tag().c_str(), m_sars );
return m_sars;
}
@@ -443,6 +443,6 @@ READ_LINE_MEMBER( adc083x_device::sars_read )
READ_LINE_MEMBER( adc083x_device::do_read )
{
- verboselog( 1, *this, "adc083x_do_read( %s ) %d\n", tag(), m_do );
+ verboselog( 1, *this, "adc083x_do_read( %s ) %d\n", tag().c_str(), m_do );
return m_do;
}
diff --git a/src/devices/machine/adc083x.h b/src/devices/machine/adc083x.h
index 6a97973acca..78be305986f 100644
--- a/src/devices/machine/adc083x.h
+++ b/src/devices/machine/adc083x.h
@@ -46,7 +46,7 @@ typedef device_delegate<double (UINT8 input)> adc083x_input_delegate;
class adc083x_device : public device_t
{
public:
- adc083x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ adc083x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
static void set_input_callback(device_t &device, adc083x_input_delegate input_callback) { downcast<adc083x_device &>(device).m_input_callback = input_callback; }
@@ -90,7 +90,7 @@ private:
class adc0831_device : public adc083x_device
{
public:
- adc0831_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc0831_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC0831;
@@ -99,7 +99,7 @@ extern const device_type ADC0831;
class adc0832_device : public adc083x_device
{
public:
- adc0832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc0832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC0832;
@@ -108,7 +108,7 @@ extern const device_type ADC0832;
class adc0834_device : public adc083x_device
{
public:
- adc0834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc0834_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC0834;
@@ -117,7 +117,7 @@ extern const device_type ADC0834;
class adc0838_device : public adc083x_device
{
public:
- adc0838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc0838_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC0838;
diff --git a/src/devices/machine/adc1038.cpp b/src/devices/machine/adc1038.cpp
index 1f1e2fb3180..16bd8a72012 100644
--- a/src/devices/machine/adc1038.cpp
+++ b/src/devices/machine/adc1038.cpp
@@ -15,7 +15,7 @@
const device_type ADC1038 = &device_creator<adc1038_device>;
-adc1038_device::adc1038_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc1038_device::adc1038_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ADC1038, "ADC1038", tag, owner, clock, "adc1038", __FILE__), m_cycle(0), m_clk(0), m_adr(0), m_data_in(0), m_data_out(0), m_adc_data(0), m_sars(0),
m_gticlub_hack(0)
{
diff --git a/src/devices/machine/adc1038.h b/src/devices/machine/adc1038.h
index 84e6ecf2f29..c8642b172ac 100644
--- a/src/devices/machine/adc1038.h
+++ b/src/devices/machine/adc1038.h
@@ -26,7 +26,7 @@ typedef device_delegate<int (int input)> adc1038_input_delegate;
class adc1038_device : public device_t
{
public:
- adc1038_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc1038_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~adc1038_device() {}
static void set_input_callback(device_t &device, adc1038_input_delegate callback) { downcast<adc1038_device &>(device).m_input_cb = callback; }
diff --git a/src/devices/machine/adc1213x.cpp b/src/devices/machine/adc1213x.cpp
index b3aec60a8e7..a75aaa3f14c 100644
--- a/src/devices/machine/adc1213x.cpp
+++ b/src/devices/machine/adc1213x.cpp
@@ -36,7 +36,7 @@
const device_type ADC12130 = &device_creator<adc12130_device>;
-adc12130_device::adc12130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc12130_device::adc12130_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adc12138_device(mconfig, ADC12130, "ADC12130", tag, owner, clock, "adc12130", __FILE__)
{
}
@@ -44,7 +44,7 @@ adc12130_device::adc12130_device(const machine_config &mconfig, const char *tag,
const device_type ADC12132 = &device_creator<adc12132_device>;
-adc12132_device::adc12132_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc12132_device::adc12132_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: adc12138_device(mconfig, ADC12132, "ADC12132", tag, owner, clock, "adc12132", __FILE__)
{
}
@@ -52,11 +52,11 @@ adc12132_device::adc12132_device(const machine_config &mconfig, const char *tag,
const device_type ADC12138 = &device_creator<adc12138_device>;
-adc12138_device::adc12138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adc12138_device::adc12138_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ADC12138, "ADC12138", tag, owner, clock, "adc12138", __FILE__)
{
}
-adc12138_device::adc12138_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+adc12138_device::adc12138_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/devices/machine/adc1213x.h b/src/devices/machine/adc1213x.h
index 361cd3dede8..bca6a5856b3 100644
--- a/src/devices/machine/adc1213x.h
+++ b/src/devices/machine/adc1213x.h
@@ -27,8 +27,8 @@ typedef device_delegate<double (UINT8 input)> adc1213x_ipt_convert_delegate;
class adc12138_device : public device_t
{
public:
- adc12138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- adc12138_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ adc12138_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ adc12138_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~adc12138_device() {}
static void set_ipt_convert_callback(device_t &device, adc1213x_ipt_convert_delegate callback) { downcast<adc12138_device &>(device).m_ipt_read_cb = callback; }
@@ -69,7 +69,7 @@ extern const device_type ADC12138;
class adc12130_device : public adc12138_device
{
public:
- adc12130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc12130_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC12130;
@@ -77,7 +77,7 @@ extern const device_type ADC12130;
class adc12132_device : public adc12138_device
{
public:
- adc12132_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc12132_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC12132;
diff --git a/src/devices/machine/aicartc.cpp b/src/devices/machine/aicartc.cpp
index b4ebca893eb..3a0ab6ed308 100644
--- a/src/devices/machine/aicartc.cpp
+++ b/src/devices/machine/aicartc.cpp
@@ -30,7 +30,7 @@ const device_type AICARTC = &device_creator<aicartc_device>;
// aicartc_device - constructor
//-------------------------------------------------
-aicartc_device::aicartc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+aicartc_device::aicartc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AICARTC, "AICA RTC", tag, owner, clock, "aicartc", __FILE__),
device_rtc_interface(mconfig, *this), m_rtc_reg_lo(0), m_rtc_reg_hi(0), m_rtc_tick(0), m_we(0), m_clock_timer(nullptr)
{
diff --git a/src/devices/machine/aicartc.h b/src/devices/machine/aicartc.h
index 6e1d9e2183e..9bec6405cf6 100644
--- a/src/devices/machine/aicartc.h
+++ b/src/devices/machine/aicartc.h
@@ -31,7 +31,7 @@ class aicartc_device : public device_t,
{
public:
// construction/destruction
- aicartc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ aicartc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE16_MEMBER( write );
diff --git a/src/devices/machine/akiko.cpp b/src/devices/machine/akiko.cpp
index 6a2772187f8..9179b166371 100644
--- a/src/devices/machine/akiko.cpp
+++ b/src/devices/machine/akiko.cpp
@@ -55,7 +55,7 @@ machine_config_constructor akiko_device::device_mconfig_additions() const
// akiko_device - constructor
//-------------------------------------------------
-akiko_device::akiko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+akiko_device::akiko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AKIKO, "CBM AKIKO", tag, owner, clock, "akiko", __FILE__),
m_c2p_input_index(0),
m_c2p_output_index(0),
@@ -103,7 +103,7 @@ akiko_device::akiko_device(const machine_config &mconfig, const char *tag, devic
// set_cputag - set cpu tag for cpu we working on
//-------------------------------------------------
-void akiko_device::set_cputag(device_t &device, const char *tag)
+void akiko_device::set_cputag(device_t &device, std::string tag)
{
akiko_device &akiko = downcast<akiko_device &>(device);
akiko.m_cputag = tag;
diff --git a/src/devices/machine/akiko.h b/src/devices/machine/akiko.h
index 3fd1b586fb6..81b69d7aa1c 100644
--- a/src/devices/machine/akiko.h
+++ b/src/devices/machine/akiko.h
@@ -49,7 +49,7 @@
class akiko_device : public device_t
{
public:
- akiko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ akiko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~akiko_device() {}
// callbacks
@@ -66,7 +66,7 @@ public:
DECLARE_WRITE32_MEMBER( write );
// inline configuration
- static void set_cputag(device_t &device, const char *tag);
+ static void set_cputag(device_t &device, std::string tag);
protected:
// device-level overrides
@@ -146,7 +146,7 @@ private:
devcb_read_line m_sda_r;
devcb_write_line m_sda_w;
- const char *m_cputag;
+ std::string m_cputag;
};
// device type definition
diff --git a/src/devices/machine/am53cf96.cpp b/src/devices/machine/am53cf96.cpp
index 595a38f985b..794cf3f5c34 100644
--- a/src/devices/machine/am53cf96.cpp
+++ b/src/devices/machine/am53cf96.cpp
@@ -146,7 +146,7 @@ WRITE8_MEMBER( am53cf96_device::write )
}
}
-am53cf96_device::am53cf96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+am53cf96_device::am53cf96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
legacy_scsi_host_adapter(mconfig, AM53CF96, "53CF96 SCSI", tag, owner, clock, "am53cf96", __FILE__),
m_irq_handler(*this)
{
diff --git a/src/devices/machine/am53cf96.h b/src/devices/machine/am53cf96.h
index 1c078d6e3f6..f00c8d6b030 100644
--- a/src/devices/machine/am53cf96.h
+++ b/src/devices/machine/am53cf96.h
@@ -41,7 +41,7 @@ class am53cf96_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- am53cf96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ am53cf96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<am53cf96_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/am9517a.cpp b/src/devices/machine/am9517a.cpp
index 7f2ecb7e37f..3879d8906f9 100644
--- a/src/devices/machine/am9517a.cpp
+++ b/src/devices/machine/am9517a.cpp
@@ -131,7 +131,7 @@ enum
inline void am9517a_device::dma_request(int channel, int state)
{
- if (LOG) logerror("AM9517A '%s' Channel %u DMA Request: %u\n", tag(), channel, state);
+ if (LOG) logerror("AM9517A '%s' Channel %u DMA Request: %u\n", tag().c_str(), channel, state);
if (state ^ COMMAND_DREQ_ACTIVE_LOW)
{
@@ -317,7 +317,7 @@ inline void am9517a_device::dma_write()
case MODE_TRANSFER_VERIFY: {
UINT8 v1 = m_in_memr_cb(offset);
if(0 && m_temp != v1)
- logerror("%s: verify error %02x vs. %02x\n", tag(), m_temp, v1);
+ logerror("%s: verify error %02x vs. %02x\n", tag().c_str(), m_temp, v1);
break;
}
@@ -471,7 +471,7 @@ inline void am9517a_device::end_of_process()
//-------------------------------------------------
-am9517a_device::am9517a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+am9517a_device::am9517a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
@@ -498,7 +498,7 @@ am9517a_device::am9517a_device(const machine_config &mconfig, device_type type,
}
-am9517a_device::am9517a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+am9517a_device::am9517a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AM9517A, "AM9517A", tag, owner, clock, "am9517a", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
@@ -525,7 +525,7 @@ am9517a_device::am9517a_device(const machine_config &mconfig, const char *tag, d
{
}
-upd71071_v53_device::upd71071_v53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+upd71071_v53_device::upd71071_v53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: am9517a_device(mconfig, V53_DMAU, "V53 DMAU", tag, owner, clock, "v53_dmau")
{
}
@@ -887,7 +887,7 @@ WRITE8_MEMBER( am9517a_device::write )
m_channel[channel].m_address = (m_channel[channel].m_address & 0xff00) | data;
}
- if (LOG) logerror("AM9517A '%s' Channel %u Base Address: %04x\n", tag(), channel, m_channel[channel].m_base_address);
+ if (LOG) logerror("AM9517A '%s' Channel %u Base Address: %04x\n", tag().c_str(), channel, m_channel[channel].m_base_address);
break;
case REGISTER_WORD_COUNT:
@@ -902,7 +902,7 @@ WRITE8_MEMBER( am9517a_device::write )
m_channel[channel].m_count = (m_channel[channel].m_count & 0xff00) | data;
}
- if (LOG) logerror("AM9517A '%s' Channel %u Base Word Count: %04x\n", tag(), channel, m_channel[channel].m_base_count);
+ if (LOG) logerror("AM9517A '%s' Channel %u Base Word Count: %04x\n", tag().c_str(), channel, m_channel[channel].m_base_count);
break;
}
@@ -915,7 +915,7 @@ WRITE8_MEMBER( am9517a_device::write )
case REGISTER_COMMAND:
m_command = data;
- if (LOG) logerror("AM9517A '%s' Command Register: %02x\n", tag(), m_command);
+ if (LOG) logerror("AM9517A '%s' Command Register: %02x\n", tag().c_str(), m_command);
break;
case REGISTER_REQUEST:
@@ -935,7 +935,7 @@ WRITE8_MEMBER( am9517a_device::write )
m_request &= ~(1 << (channel + 4));
}
- if (LOG) logerror("AM9517A '%s' Request Register: %01x\n", tag(), m_request);
+ if (LOG) logerror("AM9517A '%s' Request Register: %01x\n", tag().c_str(), m_request);
}
break;
@@ -952,7 +952,7 @@ WRITE8_MEMBER( am9517a_device::write )
m_mask &= ~(1 << channel);
}
- if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag(), m_mask);
+ if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag().c_str(), m_mask);
}
break;
@@ -965,24 +965,24 @@ WRITE8_MEMBER( am9517a_device::write )
// clear terminal count
m_status &= ~(1 << channel);
- if (LOG) logerror("AM9517A '%s' Channel %u Mode: %02x\n", tag(), channel, data & 0xfc);
+ if (LOG) logerror("AM9517A '%s' Channel %u Mode: %02x\n", tag().c_str(), channel, data & 0xfc);
}
break;
case REGISTER_BYTE_POINTER:
- if (LOG) logerror("AM9517A '%s' Clear Byte Pointer Flip-Flop\n", tag());
+ if (LOG) logerror("AM9517A '%s' Clear Byte Pointer Flip-Flop\n", tag().c_str());
m_msb = 0;
break;
case REGISTER_MASTER_CLEAR:
- if (LOG) logerror("AM9517A '%s' Master Clear\n", tag());
+ if (LOG) logerror("AM9517A '%s' Master Clear\n", tag().c_str());
device_reset();
break;
case REGISTER_CLEAR_MASK:
- if (LOG) logerror("AM9517A '%s' Clear Mask Register\n", tag());
+ if (LOG) logerror("AM9517A '%s' Clear Mask Register\n", tag().c_str());
m_mask = 0;
break;
@@ -990,7 +990,7 @@ WRITE8_MEMBER( am9517a_device::write )
case REGISTER_MASK:
m_mask = data & 0x0f;
- if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag(), m_mask);
+ if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag().c_str(), m_mask);
break;
}
}
@@ -1004,7 +1004,7 @@ WRITE8_MEMBER( am9517a_device::write )
WRITE_LINE_MEMBER( am9517a_device::hack_w )
{
- if (LOG) logerror("AM9517A '%s' Hold Acknowledge: %u\n", tag(), state);
+ if (LOG) logerror("AM9517A '%s' Hold Acknowledge: %u\n", tag().c_str(), state);
m_hack = state;
trigger(1);
@@ -1017,7 +1017,7 @@ WRITE_LINE_MEMBER( am9517a_device::hack_w )
WRITE_LINE_MEMBER( am9517a_device::ready_w )
{
- if (LOG) logerror("AM9517A '%s' Ready: %u\n", tag(), state);
+ if (LOG) logerror("AM9517A '%s' Ready: %u\n", tag().c_str(), state);
m_ready = state;
}
@@ -1029,7 +1029,7 @@ WRITE_LINE_MEMBER( am9517a_device::ready_w )
WRITE_LINE_MEMBER( am9517a_device::eop_w )
{
- if (LOG) logerror("AM9517A '%s' End of Process: %u\n", tag(), state);
+ if (LOG) logerror("AM9517A '%s' End of Process: %u\n", tag().c_str(), state);
}
diff --git a/src/devices/machine/am9517a.h b/src/devices/machine/am9517a.h
index 7d5bd2601f4..dc48331e970 100644
--- a/src/devices/machine/am9517a.h
+++ b/src/devices/machine/am9517a.h
@@ -48,8 +48,8 @@ class am9517a_device : public device_t,
{
public:
// construction/destruction
- am9517a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
- am9517a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ am9517a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
+ am9517a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_hreq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_eop_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_eop_cb.set_callback(object); }
@@ -159,7 +159,7 @@ class upd71071_v53_device : public am9517a_device
{
public:
// construction/destruction
- upd71071_v53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ upd71071_v53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER( read ) override;
virtual DECLARE_WRITE8_MEMBER( write ) override;
diff --git a/src/devices/machine/amigafdc.cpp b/src/devices/machine/amigafdc.cpp
index d71b4f458dc..050e9315c9e 100644
--- a/src/devices/machine/amigafdc.cpp
+++ b/src/devices/machine/amigafdc.cpp
@@ -18,7 +18,7 @@ FLOPPY_FORMATS_MEMBER( amiga_fdc::floppy_formats )
FLOPPY_ADF_FORMAT
FLOPPY_FORMATS_END
-amiga_fdc::amiga_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+amiga_fdc::amiga_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, AMIGA_FDC, "Amiga FDC", tag, owner, clock, "amiga_fdc", __FILE__),
m_write_index(*this), floppy(nullptr), t_gen(nullptr), dsklen(0), pre_dsklen(0), dsksync(0), dskbyt(0), adkcon(0), dmacon(0), dskpt(0), dma_value(0), dma_state(0)
{
diff --git a/src/devices/machine/amigafdc.h b/src/devices/machine/amigafdc.h
index 2cef736e6cf..1376db45d04 100644
--- a/src/devices/machine/amigafdc.h
+++ b/src/devices/machine/amigafdc.h
@@ -11,7 +11,7 @@
class amiga_fdc : public device_t {
public:
- amiga_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amiga_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_index_wr_callback(device_t &device, _Object object) { return downcast<amiga_fdc &>(device).m_write_index.set_callback(object); }
diff --git a/src/devices/machine/at28c16.cpp b/src/devices/machine/at28c16.cpp
index 9461850043d..9beb82cbcc1 100644
--- a/src/devices/machine/at28c16.cpp
+++ b/src/devices/machine/at28c16.cpp
@@ -39,7 +39,7 @@ const device_type AT28C16 = &device_creator<at28c16_device>;
// at28c16_device - constructor
//-------------------------------------------------
-at28c16_device::at28c16_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+at28c16_device::at28c16_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t(mconfig, AT28C16, "AT28C16", tag, owner, clock, "at28c16", __FILE__),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -124,12 +124,12 @@ void at28c16_device::nvram_default()
{
if( m_region->bytes() != AT28C16_DATA_BYTES )
{
- fatalerror( "at28c16 region '%s' wrong size (expected size = 0x%X)\n", tag(), AT28C16_DATA_BYTES );
+ fatalerror( "at28c16 region '%s' wrong size (expected size = 0x%X)\n", tag().c_str(), AT28C16_DATA_BYTES );
}
if( m_region->bytewidth() != 1 )
{
- fatalerror( "at28c16 region '%s' needs to be an 8-bit region\n", tag() );
+ fatalerror( "at28c16 region '%s' needs to be an 8-bit region\n", tag().c_str() );
}
UINT8 *default_data = m_region->base();
diff --git a/src/devices/machine/at28c16.h b/src/devices/machine/at28c16.h
index 5cc51cf9078..162f552dd62 100644
--- a/src/devices/machine/at28c16.h
+++ b/src/devices/machine/at28c16.h
@@ -35,7 +35,7 @@ class at28c16_device :
{
public:
// construction/destruction
- at28c16_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
+ at28c16_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
// I/O operations
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/at29x.cpp b/src/devices/machine/at29x.cpp
index bb2bdd8b8b9..097ab676fc7 100644
--- a/src/devices/machine/at29x.cpp
+++ b/src/devices/machine/at29x.cpp
@@ -54,7 +54,7 @@ enum
Constructor for all variants
*/
-at29x_device::at29x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+at29x_device::at29x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nvram_interface(mconfig, *this),
m_memory_size(0), // bytes
@@ -70,7 +70,7 @@ at29x_device::at29x_device(const machine_config &mconfig, device_type type, cons
/*
Constructor for AT29C020
*/
-at29c020_device::at29c020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at29c020_device::at29c020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: at29x_device(mconfig, AT29C020, "ATMEL 29C020 256K x 8 FEEPROM", tag, owner, clock, "at29c020", __FILE__)
{
m_memory_size = 256*1024;
@@ -81,7 +81,7 @@ at29c020_device::at29c020_device(const machine_config &mconfig, const char *tag,
/*
Constructor for AT29C040
*/
-at29c040_device::at29c040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at29c040_device::at29c040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: at29x_device(mconfig, AT29C040, "ATMEL 29C040 512K x 8 FEEPROM", tag, owner, clock, "at29c040", __FILE__)
{
m_memory_size = 512*1024;
@@ -92,7 +92,7 @@ at29c040_device::at29c040_device(const machine_config &mconfig, const char *tag,
/*
Constructor for AT29C040A
*/
-at29c040a_device::at29c040a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at29c040a_device::at29c040a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: at29x_device(mconfig, AT29C040A, "ATMEL 29C040A 512K x 8 FEEPROM", tag, owner, clock, "at29c040a", __FILE__)
{
m_memory_size = 512*1024;
@@ -129,7 +129,7 @@ void at29x_device::nvram_read(emu_file &file)
void at29x_device::nvram_write(emu_file &file)
{
// If we don't write (because there were no changes), the file will be wiped
- if (TRACE_PRG) logerror("%s: Write to NVRAM file\n", tag());
+ if (TRACE_PRG) logerror("%s: Write to NVRAM file\n", tag().c_str());
m_eememory[0] = m_version;
file.write(m_eememory.get(), m_memory_size+2);
}
@@ -143,13 +143,13 @@ void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param,
{
case PGM_1:
// Programming cycle timeout
- logerror("%s: Programming cycle timeout\n", tag());
+ logerror("%s: Programming cycle timeout\n", tag().c_str());
m_pgm = PGM_0;
break;
case PGM_2:
// Programming cycle start
- if (TRACE_PRG) logerror("%s: Sector write start\n", tag());
+ if (TRACE_PRG) logerror("%s: Sector write start\n", tag().c_str());
m_pgm = PGM_3;
// We assume a typical delay of 70% of the max value
m_programming_timer->adjust(attotime::from_msec(m_cycle_time*7/10));
@@ -159,7 +159,7 @@ void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// Programming cycle end; now burn the buffer into the flash EEPROM
memcpy(m_eememory.get() + 2 + get_sector_number(m_programming_last_offset) * m_sector_size, m_programming_buffer.get(), m_sector_size);
- if (TRACE_PRG) logerror("%s: Sector write completed at location %04x\n", tag(), m_programming_last_offset);
+ if (TRACE_PRG) logerror("%s: Sector write completed at location %04x\n", tag().c_str(), m_programming_last_offset);
// Data protect state will be activated at the end of the program cycle [1]
if (m_enabling_sdb) m_sdp = true;
@@ -167,7 +167,7 @@ void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// Data protect state will be deactivated at the end of the program period [1]
if (m_disabling_sdb) m_sdp = false;
- if (TRACE_PRG) logerror("%s: Software data protection = %d\n", tag(), m_sdp);
+ if (TRACE_PRG) logerror("%s: Software data protection = %d\n", tag().c_str(), m_sdp);
m_pgm = PGM_0;
m_enabling_sdb = false;
@@ -176,7 +176,7 @@ void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param,
break;
default:
- logerror("%s: Invalid state %d during programming\n", tag(), m_pgm);
+ logerror("%s: Invalid state %d during programming\n", tag().c_str(), m_pgm);
m_pgm = PGM_0;
break;
}
@@ -251,7 +251,7 @@ READ8_MEMBER( at29x_device::read )
m_programming_timer->adjust(attotime::from_msec(m_cycle_time*7/10));
}
- if (TRACE_READ) logerror("%s: DATA poll; toggle bit 1\n", tag());
+ if (TRACE_READ) logerror("%s: DATA poll; toggle bit 1\n", tag().c_str());
reply = m_toggle_bit? 0x02 : 0x00;
m_toggle_bit = !m_toggle_bit;
@@ -265,7 +265,7 @@ READ8_MEMBER( at29x_device::read )
// Simple case: just read the memory contents
reply = m_eememory[offset+2];
- if (TRACE_READ) logerror("%s: %05x -> %02x (PGM=%d)\n", tag(), offset, reply, m_pgm);
+ if (TRACE_READ) logerror("%s: %05x -> %02x (PGM=%d)\n", tag().c_str(), offset, reply, m_pgm);
return reply;
}
@@ -276,7 +276,7 @@ READ8_MEMBER( at29x_device::read )
WRITE8_MEMBER( at29x_device::write )
{
offset &= m_address_mask;
- if (TRACE_WRITE) logerror("%s: %05x <- %02x\n", tag(), offset, data);
+ if (TRACE_WRITE) logerror("%s: %05x <- %02x\n", tag().c_str(), offset, data);
// The special CFI commands assume a smaller address space according
// to the specification ("address format A14-A0")
@@ -285,12 +285,12 @@ WRITE8_MEMBER( at29x_device::write )
if (m_enabling_bbl)
{
// Determine whether we lock the upper or lower boot block
- if (TRACE_STATE) logerror("%s: Enabling boot block lockout\n", tag());
+ if (TRACE_STATE) logerror("%s: Enabling boot block lockout\n", tag().c_str());
m_enabling_bbl = false;
if ((offset == 0x00000) && (data == 0x00))
{
- if (TRACE_STATE) logerror("%s: Enabling lower boot block lockout\n", tag());
+ if (TRACE_STATE) logerror("%s: Enabling lower boot block lockout\n", tag().c_str());
m_lower_bbl = true;
sync_flags();
return;
@@ -299,14 +299,14 @@ WRITE8_MEMBER( at29x_device::write )
{
if ((offset == 0x7ffff) && (data == 0xff))
{
- if (TRACE_STATE) logerror("%s: Enabling higher boot block lockout\n", tag());
+ if (TRACE_STATE) logerror("%s: Enabling higher boot block lockout\n", tag().c_str());
m_higher_bbl = true;
sync_flags();
return;
}
else
{
- logerror("%s: Invalid boot block specification: %05x/%02x\n", tag(), offset, data);
+ logerror("%s: Invalid boot block specification: %05x/%02x\n", tag().c_str(), offset, data);
}
}
}
@@ -317,7 +317,7 @@ WRITE8_MEMBER( at29x_device::write )
// CMD_0: start state
if ((cfi_offset == 0x5555) && (data == 0xaa))
{
- if (TRACE_STATE) logerror("%s: Command sequence started (aa)\n", tag());
+ if (TRACE_STATE) logerror("%s: Command sequence started (aa)\n", tag().c_str());
m_cmd = CMD_1;
return;
}
@@ -332,7 +332,7 @@ WRITE8_MEMBER( at29x_device::write )
// CMD_1: state after writing aa to 5555
if ((cfi_offset == 0x2aaa) && (data == 0x55))
{
- if (TRACE_STATE) logerror("%s: Command sequence continued (55)\n", tag());
+ if (TRACE_STATE) logerror("%s: Command sequence continued (55)\n", tag().c_str());
m_cmd = CMD_2;
return;
}
@@ -340,7 +340,7 @@ WRITE8_MEMBER( at29x_device::write )
{
m_cmd = CMD_0;
m_long_sequence = false;
- if (TRACE_STATE) logerror("%s: Command sequence aborted\n", tag());
+ if (TRACE_STATE) logerror("%s: Command sequence aborted\n", tag().c_str());
}
break;
@@ -354,7 +354,7 @@ WRITE8_MEMBER( at29x_device::write )
m_programming_timer->adjust(attotime::never);
// Process command
- if (TRACE_STATE) logerror("%s: Command sequence continued (%2x)\n", tag(), data);
+ if (TRACE_STATE) logerror("%s: Command sequence continued (%2x)\n", tag().c_str(), data);
switch (data)
{
case 0x10:
@@ -362,10 +362,10 @@ WRITE8_MEMBER( at29x_device::write )
if (m_long_sequence)
{
if (m_lower_bbl || m_higher_bbl)
- logerror("%s: Boot block lockout active; chip cannot be erased.\n", tag());
+ logerror("%s: Boot block lockout active; chip cannot be erased.\n", tag().c_str());
else
{
- if (TRACE_STATE) logerror("%s: Erase chip\n", tag());
+ if (TRACE_STATE) logerror("%s: Erase chip\n", tag().c_str());
memset(m_eememory.get()+2, 0xff, m_memory_size);
}
}
@@ -377,7 +377,7 @@ WRITE8_MEMBER( at29x_device::write )
// so we need a 80 before, else the sequence is invalid
if (m_long_sequence)
{
- if (TRACE_STATE) logerror("%s: Software data protection disable\n", tag());
+ if (TRACE_STATE) logerror("%s: Software data protection disable\n", tag().c_str());
m_pgm = PGM_1;
m_disabling_sdb = true;
// It is not clear from the specification whether the byte cycle timer
@@ -388,7 +388,7 @@ WRITE8_MEMBER( at29x_device::write )
case 0x40:
// Boot block lockout enable
// Complete sequence is aa-55-80-aa-55-40
- if (TRACE_STATE) logerror("%s: Boot block lockout enable\n", tag());
+ if (TRACE_STATE) logerror("%s: Boot block lockout enable\n", tag().c_str());
if (m_long_sequence) m_enabling_bbl = true;
// We'll know which boot block is affected on the next write
break;
@@ -400,13 +400,13 @@ WRITE8_MEMBER( at29x_device::write )
case 0x90:
// Software product identification entry
- if (TRACE_STATE) logerror("%s: Entering Identification mode\n", tag());
+ if (TRACE_STATE) logerror("%s: Entering Identification mode\n", tag().c_str());
m_id_mode = true;
break;
case 0xa0:
// Software data protection enable
- if (TRACE_STATE) logerror("%s: Software data protection enable\n", tag());
+ if (TRACE_STATE) logerror("%s: Software data protection enable\n", tag().c_str());
m_pgm = PGM_1;
m_enabling_sdb = true;
// It is not clear from the specification whether the byte cycle timer
@@ -415,7 +415,7 @@ WRITE8_MEMBER( at29x_device::write )
case 0xf0:
// Software product identification exit
- if (TRACE_STATE) logerror("%s: Exiting Identification mode\n", tag());
+ if (TRACE_STATE) logerror("%s: Exiting Identification mode\n", tag().c_str());
m_id_mode = false;
break;
}
@@ -435,7 +435,7 @@ WRITE8_MEMBER( at29x_device::write )
if ((m_pgm == PGM_2) && (get_sector_number(offset) != get_sector_number(m_programming_last_offset)))
{
// cancel current programming cycle
- if (TRACE_WRITE) logerror("%s: Invalid sector change (from sector 0x%04x to 0x%04x); cancel programming cycle\n", tag(), get_sector_number(m_programming_last_offset), get_sector_number(offset));
+ if (TRACE_WRITE) logerror("%s: Invalid sector change (from sector 0x%04x to 0x%04x); cancel programming cycle\n", tag().c_str(), get_sector_number(m_programming_last_offset), get_sector_number(offset));
m_pgm = PGM_0;
m_enabling_sdb = false;
m_disabling_sdb = false;
@@ -450,7 +450,7 @@ WRITE8_MEMBER( at29x_device::write )
{
// attempt to access a locked out boot block: cancel programming
// command if necessary
- if (TRACE_WRITE) logerror("%s: Attempt to access a locked out boot block: offset = %05x, lowblock=%d, highblock=%d\n", tag(), offset, m_lower_bbl, m_higher_bbl);
+ if (TRACE_WRITE) logerror("%s: Attempt to access a locked out boot block: offset = %05x, lowblock=%d, highblock=%d\n", tag().c_str(), offset, m_lower_bbl, m_higher_bbl);
m_pgm = PGM_0;
m_enabling_sdb = false;
@@ -458,7 +458,7 @@ WRITE8_MEMBER( at29x_device::write )
}
else
{ // enter programming mode
- if (TRACE_STATE) logerror("%s: Enter programming mode (m_pgm=%d, m_sdp=%d)\n", tag(), m_pgm, m_sdp);
+ if (TRACE_STATE) logerror("%s: Enter programming mode (m_pgm=%d, m_sdp=%d)\n", tag().c_str(), m_pgm, m_sdp);
// Clear the programming buffer
memset(m_programming_buffer.get(), 0xff, m_sector_size);
m_pgm = PGM_2;
@@ -470,7 +470,7 @@ WRITE8_MEMBER( at29x_device::write )
if (m_pgm == PGM_2)
{
// write data to programming buffer
- if (TRACE_PRG) logerror("%s: Write data to programming buffer: buf[%x] = %02x\n", tag(), offset & m_sector_mask, data);
+ if (TRACE_PRG) logerror("%s: Write data to programming buffer: buf[%x] = %02x\n", tag().c_str(), offset & m_sector_mask, data);
m_programming_buffer[offset & m_sector_mask] = data;
m_programming_last_offset = offset;
m_programming_timer->adjust(attotime::from_usec(150)); // next byte must be written before the timer expires
@@ -498,7 +498,7 @@ void at29x_device::device_reset(void)
{
if (m_eememory[0] != m_version)
{
- logerror("%s: Warning: Version mismatch; expected %d but found %d in file. Resetting.\n", tag(), m_version, m_eememory[0]);
+ logerror("%s: Warning: Version mismatch; expected %d but found %d in file. Resetting.\n", tag().c_str(), m_version, m_eememory[0]);
m_eememory[0] = 0;
m_eememory[1] = 0;
}
@@ -507,7 +507,7 @@ void at29x_device::device_reset(void)
m_higher_bbl = ((m_eememory[1] & 0x02)!=0);
m_sdp = ((m_eememory[1] & 0x01)!=0);
- if (TRACE_CONFIG) logerror("%s: LowerBBL = %d, HigherBBL = %d, SoftDataProt = %d\n", tag(), m_lower_bbl, m_higher_bbl, m_sdp);
+ if (TRACE_CONFIG) logerror("%s: LowerBBL = %d, HigherBBL = %d, SoftDataProt = %d\n", tag().c_str(), m_lower_bbl, m_higher_bbl, m_sdp);
m_id_mode = false;
m_cmd = CMD_0;
diff --git a/src/devices/machine/at29x.h b/src/devices/machine/at29x.h
index 924a17e0f70..02f68d5b0c7 100644
--- a/src/devices/machine/at29x.h
+++ b/src/devices/machine/at29x.h
@@ -34,7 +34,7 @@ enum s_pgm_t
class at29x_device : public device_t, public device_nvram_interface
{
public:
- at29x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ at29x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -89,19 +89,19 @@ private:
class at29c020_device : public at29x_device
{
public:
- at29c020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at29c020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class at29c040_device : public at29x_device
{
public:
- at29c040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at29c040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class at29c040a_device : public at29x_device
{
public:
- at29c040a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at29c040a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
#define MCFG_AT29C020_ADD(_tag ) \
diff --git a/src/devices/machine/at45dbxx.cpp b/src/devices/machine/at45dbxx.cpp
index e61fcca498a..3a7a6efb105 100644
--- a/src/devices/machine/at45dbxx.cpp
+++ b/src/devices/machine/at45dbxx.cpp
@@ -45,7 +45,7 @@ const device_type AT45DB161 = &device_creator<at45db161_device>;
// at45db041_device - constructor
//-------------------------------------------------
-at45db041_device::at45db041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at45db041_device::at45db041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AT45DB041, "AT45DB041", tag, owner, clock, "at45db041", __FILE__),
device_nvram_interface(mconfig, *this),
write_so(*this)
@@ -53,7 +53,7 @@ at45db041_device::at45db041_device(const machine_config &mconfig, const char *ta
}
-at45db041_device::at45db041_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+at45db041_device::at45db041_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nvram_interface(mconfig, *this),
write_so(*this)
@@ -61,13 +61,13 @@ at45db041_device::at45db041_device(const machine_config &mconfig, device_type ty
}
-at45db081_device::at45db081_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at45db081_device::at45db081_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: at45db041_device(mconfig, AT45DB081, "AT45DB081", tag, owner, clock, "at45db081", __FILE__)
{
}
-at45db161_device::at45db161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at45db161_device::at45db161_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: at45db041_device(mconfig, AT45DB161, "AT45DB161", tag, owner, clock, "at45db161", __FILE__)
{
}
diff --git a/src/devices/machine/at45dbxx.h b/src/devices/machine/at45dbxx.h
index 40688fd786e..a7defed9e1f 100644
--- a/src/devices/machine/at45dbxx.h
+++ b/src/devices/machine/at45dbxx.h
@@ -41,8 +41,8 @@ class at45db041_device : public device_t,
public device_nvram_interface
{
public:
- at45db041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- at45db041_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ at45db041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ at45db041_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_WRITE_LINE_MEMBER(cs_w);
DECLARE_WRITE_LINE_MEMBER(sck_w);
@@ -117,7 +117,7 @@ protected:
class at45db081_device : public at45db041_device
{
public:
- at45db081_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at45db081_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int num_pages() const override { return 4096; }
@@ -132,7 +132,7 @@ protected:
class at45db161_device : public at45db041_device
{
public:
- at45db161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at45db161_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int num_pages() const override { return 4096; }
diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp
index c77e6c8eed2..5756ed8f9e2 100644
--- a/src/devices/machine/at_keybc.cpp
+++ b/src/devices/machine/at_keybc.cpp
@@ -58,7 +58,7 @@ ROM_END
// at_keyboard_controller_device - constructor
//-------------------------------------------------
-at_keyboard_controller_device::at_keyboard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+at_keyboard_controller_device::at_keyboard_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AT_KEYBOARD_CONTROLLER, "AT Keyboard Controller", tag, owner, clock, "at_keybc", __FILE__),
m_cpu(nullptr),
m_system_reset_cb(*this),
diff --git a/src/devices/machine/at_keybc.h b/src/devices/machine/at_keybc.h
index d6ff52d6975..1774efe74cb 100644
--- a/src/devices/machine/at_keybc.h
+++ b/src/devices/machine/at_keybc.h
@@ -47,7 +47,7 @@ class at_keyboard_controller_device : public device_t
{
public:
// construction/destruction
- at_keyboard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at_keyboard_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_system_reset_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_system_reset_cb.set_callback(object); }
template<class _Object> static devcb_base &set_gate_a20_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_gate_a20_cb.set_callback(object); }
diff --git a/src/devices/machine/ataflash.cpp b/src/devices/machine/ataflash.cpp
index a7491f1eb1e..87f614d4c36 100644
--- a/src/devices/machine/ataflash.cpp
+++ b/src/devices/machine/ataflash.cpp
@@ -8,7 +8,7 @@
const device_type ATA_FLASH_PCCARD = &device_creator<ata_flash_pccard_device>;
-ata_flash_pccard_device::ata_flash_pccard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ata_flash_pccard_device::ata_flash_pccard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
ide_hdd_device(mconfig, ATA_FLASH_PCCARD, "ATA Flash PCCARD", tag, owner, clock, "ataflash", __FILE__), m_gnetreadlock(0), m_locked(0)
{
}
diff --git a/src/devices/machine/ataflash.h b/src/devices/machine/ataflash.h
index e0504b2f180..3ef8eefef09 100644
--- a/src/devices/machine/ataflash.h
+++ b/src/devices/machine/ataflash.h
@@ -14,7 +14,7 @@ class ata_flash_pccard_device : public ide_hdd_device,
public pccard_interface
{
public:
- ata_flash_pccard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ata_flash_pccard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ16_MEMBER(read_memory) override;
virtual DECLARE_WRITE16_MEMBER(write_memory) override;
diff --git a/src/devices/machine/atahle.cpp b/src/devices/machine/atahle.cpp
index 6bd963f946c..08bf542136a 100644
--- a/src/devices/machine/atahle.cpp
+++ b/src/devices/machine/atahle.cpp
@@ -39,7 +39,7 @@ enum
#define DEVICE1_PDIAG_TIME (attotime::from_msec(2))
#define DIAGNOSTIC_TIME (attotime::from_msec(2))
-ata_hle_device::ata_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
+ata_hle_device::ata_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
ata_device_interface(mconfig, *this),
device_slot_card_interface(mconfig, *this),
@@ -550,27 +550,27 @@ UINT16 ata_hle_device::read_dma()
{
if (!m_dmack)
{
- logerror( "%s: %s dev %d read_dma ignored (!DMACK)\n", machine().describe_context(), tag(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (!DMACK)\n", machine().describe_context(), tag().c_str(), dev() );
}
else if (m_dmarq && single_word_dma_mode() >= 0)
{
- logerror( "%s: %s dev %d read_dma ignored (DMARQ)\n", machine().describe_context(), tag(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (DMARQ)\n", machine().describe_context(), tag().c_str(), dev() );
}
else if (!m_dmarq && multi_word_dma_mode() >= 0)
{
- logerror( "%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev() );
}
else if (!m_dmarq && ultra_dma_mode() >= 0)
{
- logerror("%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag(), dev());
+ logerror("%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev());
}
else if (m_status & IDE_STATUS_BSY)
{
- logerror( "%s: %s dev %d read_dma ignored (BSY)\n", machine().describe_context(), tag(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (BSY)\n", machine().describe_context(), tag().c_str(), dev() );
}
else if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d read_dma ignored (!DRQ)\n", machine().describe_context(), tag(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev() );
}
else
{
@@ -596,7 +596,7 @@ READ16_MEMBER( ata_hle_device::read_cs0 )
{
if (m_dmack)
{
- logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset, mem_mask );
+ logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag().c_str(), dev(), offset, mem_mask );
}
else if ((m_status & IDE_STATUS_BSY) && offset != IDE_CS0_STATUS_R)
{
@@ -607,7 +607,7 @@ READ16_MEMBER( ata_hle_device::read_cs0 )
switch (offset)
{
case IDE_CS0_DATA_RW:
- logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (BSY)\n", machine().describe_context(), tag(), dev(), offset, mem_mask );
+ logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (BSY)\n", machine().describe_context(), tag().c_str(), dev(), offset, mem_mask );
break;
default:
@@ -630,7 +630,7 @@ READ16_MEMBER( ata_hle_device::read_cs0 )
{
if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d read_cs0 ignored (!DRQ)\n", machine().describe_context(), tag(), dev() );
+ logerror( "%s: %s dev %d read_cs0 ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev() );
}
else
{
@@ -714,7 +714,7 @@ READ16_MEMBER( ata_hle_device::read_cs1 )
{
if (m_dmack)
{
- logerror( "%s: %s dev %d read_cs1 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset, mem_mask );
+ logerror( "%s: %s dev %d read_cs1 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag().c_str(), dev(), offset, mem_mask );
}
else
{
@@ -774,27 +774,27 @@ void ata_hle_device::write_dma( UINT16 data )
{
if (!m_dmack)
{
- logerror( "%s: %s dev %d write_dma %04x ignored (!DMACK)\n", machine().describe_context(), tag(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (!DMACK)\n", machine().describe_context(), tag().c_str(), dev(), data );
}
else if (m_dmarq && single_word_dma_mode() >= 0)
{
- logerror( "%s: %s dev %d write_dma %04x ignored (DMARQ)\n", machine().describe_context(), tag(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (DMARQ)\n", machine().describe_context(), tag().c_str(), dev(), data );
}
else if (!m_dmarq && multi_word_dma_mode() >= 0)
{
- logerror( "%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev(), data );
}
else if (!m_dmarq && ultra_dma_mode() >= 0)
{
- logerror("%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag(), dev(), data);
+ logerror("%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev(), data);
}
else if (m_status & IDE_STATUS_BSY)
{
- logerror( "%s: %s dev %d write_dma %04x ignored (BSY)\n", machine().describe_context(), tag(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (BSY)\n", machine().describe_context(), tag().c_str(), dev(), data );
}
else if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d write_dma %04x ignored (!DRQ)\n", machine().describe_context(), tag(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev(), data );
}
else
{
@@ -815,15 +815,15 @@ WRITE16_MEMBER( ata_hle_device::write_cs0 )
if (m_dmack)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask );
}
else if ((m_status & IDE_STATUS_BSY) && offset != IDE_CS0_COMMAND_W)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (BSY) command %02x\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask, m_command );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (BSY) command %02x\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask, m_command );
}
else if ((m_status & IDE_STATUS_DRQ) && offset != IDE_CS0_DATA_RW && offset != IDE_CS0_COMMAND_W)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DRQ) command %02x\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask, m_command );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DRQ) command %02x\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask, m_command );
}
else
{
@@ -837,7 +837,7 @@ WRITE16_MEMBER( ata_hle_device::write_cs0 )
{
if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (!DRQ)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask );
}
else
{
@@ -884,11 +884,11 @@ WRITE16_MEMBER( ata_hle_device::write_cs0 )
// Packet devices can accept DEVICE RESET when BSY or DRQ is set.
if (m_status & IDE_STATUS_BSY)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (BSY) command %02x\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask, m_command );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (BSY) command %02x\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask, m_command );
}
else if (m_status & IDE_STATUS_DRQ)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DRQ) command %02x\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask, m_command );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DRQ) command %02x\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask, m_command );
}
else if (device_selected() || m_command == IDE_COMMAND_DIAGNOSTIC)
{
@@ -922,7 +922,7 @@ WRITE16_MEMBER( ata_hle_device::write_cs1 )
if (m_dmack)
{
- logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask );
+ logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask );
}
else
{
@@ -944,7 +944,7 @@ WRITE16_MEMBER( ata_hle_device::write_cs1 )
{
if (m_resetting)
{
- logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (RESET)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask );
+ logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (RESET)\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask );
}
else
{
diff --git a/src/devices/machine/atahle.h b/src/devices/machine/atahle.h
index 8c83625c1d4..9d9e3b41179 100644
--- a/src/devices/machine/atahle.h
+++ b/src/devices/machine/atahle.h
@@ -20,7 +20,7 @@ class ata_hle_device : public device_t,
public device_slot_card_interface
{
public:
- ata_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ ata_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
virtual UINT16 read_dma() override;
virtual DECLARE_READ16_MEMBER(read_cs0) override;
diff --git a/src/devices/machine/ataintf.cpp b/src/devices/machine/ataintf.cpp
index b9c51351e71..f8e4669b577 100644
--- a/src/devices/machine/ataintf.cpp
+++ b/src/devices/machine/ataintf.cpp
@@ -207,7 +207,7 @@ SLOT_INTERFACE_START(ata_devices)
SLOT_INTERFACE("cdrom", ATAPI_CDROM)
SLOT_INTERFACE_END
-ata_interface_device::ata_interface_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ata_interface_device::ata_interface_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_irq_handler(*this),
m_dmarq_handler(*this),
@@ -217,7 +217,7 @@ ata_interface_device::ata_interface_device(const machine_config &mconfig, device
const device_type ATA_INTERFACE = &device_creator<ata_interface_device>;
-ata_interface_device::ata_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ata_interface_device::ata_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ATA_INTERFACE, "ATA Interface", tag, owner, clock, "ata_interface", __FILE__),
m_irq_handler(*this),
m_dmarq_handler(*this),
@@ -296,7 +296,7 @@ const device_type ATA_SLOT = &device_creator<ata_slot_device>;
// ata_slot_device - constructor
//-------------------------------------------------
-ata_slot_device::ata_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ata_slot_device::ata_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ATA_SLOT, "ATA Connector", tag, owner, clock, "ata_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_dev(nullptr)
diff --git a/src/devices/machine/ataintf.h b/src/devices/machine/ataintf.h
index d1752d5923b..d7006701188 100644
--- a/src/devices/machine/ataintf.h
+++ b/src/devices/machine/ataintf.h
@@ -26,7 +26,7 @@ class ata_slot_device : public device_t,
{
public:
// construction/destruction
- ata_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ata_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
ata_device_interface *dev() { return m_dev; }
protected:
@@ -77,8 +77,8 @@ SLOT_INTERFACE_EXTERN(ata_devices);
class ata_interface_device : public device_t
{
public:
- ata_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ata_interface_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ata_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ata_interface_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ata_interface_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/atapicdr.cpp b/src/devices/machine/atapicdr.cpp
index 1588f6d17cd..540aa493b66 100644
--- a/src/devices/machine/atapicdr.cpp
+++ b/src/devices/machine/atapicdr.cpp
@@ -5,12 +5,12 @@
// device type definition
const device_type ATAPI_CDROM = &device_creator<atapi_cdrom_device>;
-atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
atapi_hle_device(mconfig, ATAPI_CDROM, "ATAPI CDROM", tag, owner, clock, "cdrom", __FILE__)
{
}
-atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
atapi_hle_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/devices/machine/atapicdr.h b/src/devices/machine/atapicdr.h
index b18999839c7..99b2651c1a7 100644
--- a/src/devices/machine/atapicdr.h
+++ b/src/devices/machine/atapicdr.h
@@ -20,8 +20,8 @@ class atapi_cdrom_device : public atapi_hle_device,
public t10mmc
{
public:
- atapi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ atapi_cdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
UINT16 *identify_device_buffer() { return m_identify_buffer; }
diff --git a/src/devices/machine/atapihle.cpp b/src/devices/machine/atapihle.cpp
index dcbc00fb26c..9ca6e7c73f7 100644
--- a/src/devices/machine/atapihle.cpp
+++ b/src/devices/machine/atapihle.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "atapihle.h"
-atapi_hle_device::atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
+atapi_hle_device::atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
: ata_hle_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_packet(0),
m_data_size(0)
diff --git a/src/devices/machine/atapihle.h b/src/devices/machine/atapihle.h
index d124259e577..97cd3f50398 100644
--- a/src/devices/machine/atapihle.h
+++ b/src/devices/machine/atapihle.h
@@ -20,7 +20,7 @@ class atapi_hle_device : public ata_hle_device,
public virtual t10spc
{
public:
- atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
enum atapi_features_flag_t
{
diff --git a/src/devices/machine/ay31015.cpp b/src/devices/machine/ay31015.cpp
index f1db92a19d8..0effc877efd 100644
--- a/src/devices/machine/ay31015.cpp
+++ b/src/devices/machine/ay31015.cpp
@@ -97,7 +97,7 @@ Start bit (low), Bit 0, Bit 1... highest bit, Parity bit (if enabled), 1-2 stop
const device_type AY31015 = &device_creator<ay31015_device>;
const device_type AY51013 = &device_creator<ay51013_device>;
-ay31015_device::ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ay31015_device::ay31015_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_control_reg(0),
m_status_reg(0),
@@ -125,7 +125,7 @@ ay31015_device::ay31015_device(const machine_config &mconfig, device_type type,
elem = 0;
}
-ay31015_device::ay31015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ay31015_device::ay31015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AY31015, "AY-3-1015", tag, owner, clock, "ay31015", __FILE__),
m_control_reg(0),
m_status_reg(0),
@@ -153,7 +153,7 @@ ay31015_device::ay31015_device(const machine_config &mconfig, const char *tag, d
elem = 0;
}
-ay51013_device::ay51013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ay51013_device::ay51013_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ay31015_device(mconfig, AY31015, "AY-5-1013", tag, owner, clock, "ay51013", __FILE__)
{
}
diff --git a/src/devices/machine/ay31015.h b/src/devices/machine/ay31015.h
index acdf3a01536..a28595d723b 100644
--- a/src/devices/machine/ay31015.h
+++ b/src/devices/machine/ay31015.h
@@ -61,8 +61,8 @@ ALLOW_SAVE_TYPE(state_t);
class ay31015_device : public device_t
{
public:
- ay31015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ay31015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ay31015_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~ay31015_device() {}
static void set_tx_clock(device_t &device, double tx_clock) { downcast<ay31015_device &>(device).m_tx_clock = tx_clock; }
@@ -147,7 +147,7 @@ protected:
class ay51013_device : public ay31015_device
{
public:
- ay51013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ay51013_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void internal_reset() override;
diff --git a/src/devices/machine/bankdev.cpp b/src/devices/machine/bankdev.cpp
index 65d56a39819..757190247fa 100644
--- a/src/devices/machine/bankdev.cpp
+++ b/src/devices/machine/bankdev.cpp
@@ -5,7 +5,7 @@
// device type definition
const device_type ADDRESS_MAP_BANK = &device_creator<address_map_bank_device>;
-address_map_bank_device::address_map_bank_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+address_map_bank_device::address_map_bank_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t(mconfig, ADDRESS_MAP_BANK, "Address Map Bank", tag, owner, clock, "address_map_bank", __FILE__),
device_memory_interface(mconfig, *this),
m_endianness(ENDIANNESS_NATIVE),
diff --git a/src/devices/machine/bankdev.h b/src/devices/machine/bankdev.h
index 946faef53f0..1f26eb8eee9 100644
--- a/src/devices/machine/bankdev.h
+++ b/src/devices/machine/bankdev.h
@@ -25,7 +25,7 @@ class address_map_bank_device :
{
public:
// construction/destruction
- address_map_bank_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
+ address_map_bank_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
// static configuration helpers
static void set_endianness(device_t &device, endianness_t endianness) { downcast<address_map_bank_device &>(device).m_endianness = endianness; }
diff --git a/src/devices/machine/bcreader.cpp b/src/devices/machine/bcreader.cpp
index 5a5df7fb452..42d5528ec67 100644
--- a/src/devices/machine/bcreader.cpp
+++ b/src/devices/machine/bcreader.cpp
@@ -59,7 +59,7 @@ const device_type BARCODE_READER = &device_creator<barcode_reader_device>;
// barcode_reader_device - constructor
//-------------------------------------------------
-barcode_reader_device::barcode_reader_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+barcode_reader_device::barcode_reader_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, BARCODE_READER, "Barcode Reader", tag, owner, clock, "bcreader", __FILE__)
, m_byte_length(0)
, m_pixel_length(0)
diff --git a/src/devices/machine/bcreader.h b/src/devices/machine/bcreader.h
index ecb6908e0ae..95e49c4715b 100644
--- a/src/devices/machine/bcreader.h
+++ b/src/devices/machine/bcreader.h
@@ -24,7 +24,7 @@ class barcode_reader_device : public device_t
{
public:
// construction/destruction
- barcode_reader_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ barcode_reader_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
void write_code(const char *barcode, int len);
int get_pending_code() { return m_new_code; }
diff --git a/src/devices/machine/buffer.cpp b/src/devices/machine/buffer.cpp
index 6b2058c6937..91b7ef62a07 100644
--- a/src/devices/machine/buffer.cpp
+++ b/src/devices/machine/buffer.cpp
@@ -5,7 +5,7 @@
const device_type INPUT_BUFFER = &device_creator<input_buffer_device>;
-input_buffer_device::input_buffer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+input_buffer_device::input_buffer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, INPUT_BUFFER, "Input Buffer", tag, owner, clock, "input_buffer", __FILE__),
m_input_data(0xff)
{
diff --git a/src/devices/machine/buffer.h b/src/devices/machine/buffer.h
index 7c719c918af..e9dcd539ab4 100644
--- a/src/devices/machine/buffer.h
+++ b/src/devices/machine/buffer.h
@@ -6,7 +6,7 @@
class input_buffer_device : public device_t
{
public:
- input_buffer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ input_buffer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
UINT8 read() { return m_input_data; }
DECLARE_READ8_MEMBER(read) { return read(); }
diff --git a/src/devices/machine/cdp1852.cpp b/src/devices/machine/cdp1852.cpp
index 52fe18eb82b..90572f4dc87 100644
--- a/src/devices/machine/cdp1852.cpp
+++ b/src/devices/machine/cdp1852.cpp
@@ -38,7 +38,7 @@ enum
// cdp1852_device - constructor
//-------------------------------------------------
-cdp1852_device::cdp1852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cdp1852_device::cdp1852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CDP1852, "CDP1852 I/O", tag, owner, clock, "cdp1852", __FILE__),
m_read_mode(*this),
m_write_sr(*this),
diff --git a/src/devices/machine/cdp1852.h b/src/devices/machine/cdp1852.h
index eb8cef75dd4..ed8d9baa017 100644
--- a/src/devices/machine/cdp1852.h
+++ b/src/devices/machine/cdp1852.h
@@ -58,7 +58,7 @@ class cdp1852_device : public device_t
{
public:
// construction/destruction
- cdp1852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cdp1852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_mode_rd_callback(device_t &device, _Object object) { return downcast<cdp1852_device &>(device).m_read_mode.set_callback(object); }
template<class _Object> static devcb_base &set_sr_wr_callback(device_t &device, _Object object) { return downcast<cdp1852_device &>(device).m_write_sr.set_callback(object); }
diff --git a/src/devices/machine/cdp1871.cpp b/src/devices/machine/cdp1871.cpp
index e685f8c43ad..e7a19c97d49 100644
--- a/src/devices/machine/cdp1871.cpp
+++ b/src/devices/machine/cdp1871.cpp
@@ -95,7 +95,7 @@ const UINT8 cdp1871_device::key_codes[4][11][8] =
// cdp1871_device - constructor
//-------------------------------------------------
-cdp1871_device::cdp1871_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cdp1871_device::cdp1871_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CDP1871, "RCA CDP1871", tag, owner, clock, "cdp1871", __FILE__),
m_read_d1(*this),
m_read_d2(*this),
diff --git a/src/devices/machine/cdp1871.h b/src/devices/machine/cdp1871.h
index 02238822057..4fb1aa652db 100644
--- a/src/devices/machine/cdp1871.h
+++ b/src/devices/machine/cdp1871.h
@@ -93,7 +93,7 @@ class cdp1871_device : public device_t
{
public:
// construction/destruction
- cdp1871_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cdp1871_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_d1_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d1.set_callback(object); }
template<class _Object> static devcb_base &set_d2_rd_callback(device_t &device, _Object object) { return downcast<cdp1871_device &>(device).m_read_d2.set_callback(object); }
diff --git a/src/devices/machine/clock.cpp b/src/devices/machine/clock.cpp
index 70d3bd4fade..15b8320e23d 100644
--- a/src/devices/machine/clock.cpp
+++ b/src/devices/machine/clock.cpp
@@ -4,7 +4,7 @@
const device_type CLOCK = &device_creator<clock_device>;
-clock_device::clock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+clock_device::clock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CLOCK, "Clock", tag, owner, clock, "clock", __FILE__),
m_signal(0),
m_timer(nullptr),
diff --git a/src/devices/machine/clock.h b/src/devices/machine/clock.h
index 4be97128bfe..8a673443a1a 100644
--- a/src/devices/machine/clock.h
+++ b/src/devices/machine/clock.h
@@ -13,7 +13,7 @@
class clock_device : public device_t
{
public:
- clock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ clock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_signal_handler(device_t &device, _Object object) { return downcast<clock_device &>(device).m_signal_handler.set_callback(object); }
diff --git a/src/devices/machine/com8116.cpp b/src/devices/machine/com8116.cpp
index 46a0ce83986..10efcdf7a58 100644
--- a/src/devices/machine/com8116.cpp
+++ b/src/devices/machine/com8116.cpp
@@ -45,7 +45,7 @@ const int com8116_device::divisors_32X_5_0688MHz[] =
// com8116_device - constructor
//-------------------------------------------------
-com8116_device::com8116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+com8116_device::com8116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, COM8116, "COM8116", tag, owner, clock, "com8116", __FILE__),
m_fx4_handler(*this),
m_fr_handler(*this),
@@ -128,7 +128,7 @@ void com8116_device::str_w(UINT8 data)
int fr_divider = data & 0x0f;
int fr_clock = clock() / m_fr_divisors[fr_divider];
- if (LOG) logerror("COM8116 '%s' Receiver Divisor Select %01x: %u (%u Hz)\n", tag(), data & 0x0f, m_fr_divisors[fr_divider], fr_clock);
+ if (LOG) logerror("COM8116 '%s' Receiver Divisor Select %01x: %u (%u Hz)\n", tag().c_str(), data & 0x0f, m_fr_divisors[fr_divider], fr_clock);
m_fr_timer->adjust(attotime::from_nsec(3500), 0, attotime::from_hz(fr_clock * 2));
}
@@ -148,7 +148,7 @@ void com8116_device::stt_w(UINT8 data)
int ft_divider = data & 0x0f;
int ft_clock = clock() / m_ft_divisors[ft_divider];
- if (LOG) logerror("COM8116 '%s' Transmitter Divisor Select %01x: %u (%u Hz)\n", tag(), data & 0x0f, m_ft_divisors[ft_divider], ft_clock);
+ if (LOG) logerror("COM8116 '%s' Transmitter Divisor Select %01x: %u (%u Hz)\n", tag().c_str(), data & 0x0f, m_ft_divisors[ft_divider], ft_clock);
m_ft_timer->adjust(attotime::from_nsec(3500), 0, attotime::from_hz(ft_clock * 2));
}
diff --git a/src/devices/machine/com8116.h b/src/devices/machine/com8116.h
index 119f40d4b3d..96020f08931 100644
--- a/src/devices/machine/com8116.h
+++ b/src/devices/machine/com8116.h
@@ -51,7 +51,7 @@ class com8116_device : public device_t
{
public:
// construction/destruction
- com8116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ com8116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_fx4_handler(device_t &device, _Object object) { return downcast<com8116_device &>(device).m_fx4_handler.set_callback(object); }
template<class _Object> static devcb_base &set_fr_handler(device_t &device, _Object object) { return downcast<com8116_device &>(device).m_fr_handler.set_callback(object); }
diff --git a/src/devices/machine/corvushd.cpp b/src/devices/machine/corvushd.cpp
index 558851c0b7a..491ea9c0118 100644
--- a/src/devices/machine/corvushd.cpp
+++ b/src/devices/machine/corvushd.cpp
@@ -72,7 +72,7 @@
const device_type CORVUS_HDC = &device_creator<corvus_hdc_t>;
-corvus_hdc_t::corvus_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+corvus_hdc_t::corvus_hdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CORVUS_HDC, "Corvus Flat Cable HDC", tag, owner, clock, "corvus_hdc", __FILE__),
m_status(0),
m_prep_mode(false),
diff --git a/src/devices/machine/corvushd.h b/src/devices/machine/corvushd.h
index cb3bee03594..64d7d636b1a 100644
--- a/src/devices/machine/corvushd.h
+++ b/src/devices/machine/corvushd.h
@@ -182,7 +182,7 @@ class corvus_hdc_t : public device_t
{
public:
// construction/destruction
- corvus_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ corvus_hdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp
index debd3906fbc..9d579df4ac6 100644
--- a/src/devices/machine/cr511b.cpp
+++ b/src/devices/machine/cr511b.cpp
@@ -45,7 +45,7 @@ machine_config_constructor cr511b_device::device_mconfig_additions() const
// cr511b_device - constructor
//-------------------------------------------------
-cr511b_device::cr511b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cr511b_device::cr511b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CR511B, "CR-511-B CD-ROM drive", tag, owner, clock, "cr511b", __FILE__),
m_cdrom(*this, "cdrom"),
m_cdda(*this, "cdda"),
diff --git a/src/devices/machine/cr511b.h b/src/devices/machine/cr511b.h
index b4b3529f061..05053525812 100644
--- a/src/devices/machine/cr511b.h
+++ b/src/devices/machine/cr511b.h
@@ -75,7 +75,7 @@ class cr511b_device : public device_t
{
public:
// construction/destruction
- cr511b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cr511b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// callbacks
template<class _Object> static devcb_base &set_stch_handler(device_t &device, _Object object)
diff --git a/src/devices/machine/cr589.cpp b/src/devices/machine/cr589.cpp
index 8c0ae34f6c9..31bc4f3d077 100644
--- a/src/devices/machine/cr589.cpp
+++ b/src/devices/machine/cr589.cpp
@@ -139,7 +139,7 @@ void matsushita_cr589_device::WriteData( UINT8 *data, int dataLength )
// device type definition
const device_type CR589 = &device_creator<matsushita_cr589_device>;
-matsushita_cr589_device::matsushita_cr589_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+matsushita_cr589_device::matsushita_cr589_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
atapi_cdrom_device(mconfig, CR589, "Matsushita CR589 CD-ROM Drive", tag, owner, clock, "cr589", __FILE__),
device_nvram_interface(mconfig, *this)
{
diff --git a/src/devices/machine/cr589.h b/src/devices/machine/cr589.h
index e74e2612663..6f485a243ed 100644
--- a/src/devices/machine/cr589.h
+++ b/src/devices/machine/cr589.h
@@ -20,7 +20,7 @@ class matsushita_cr589_device : public atapi_cdrom_device,
public device_nvram_interface
{
public:
- matsushita_cr589_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ matsushita_cr589_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void ExecCommand() override;
virtual void WriteData( UINT8 *data, int dataLength ) override;
diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp
index b6d8de1acd8..3f81bced150 100644
--- a/src/devices/machine/cs4031.cpp
+++ b/src/devices/machine/cs4031.cpp
@@ -154,7 +154,7 @@ machine_config_constructor cs4031_device::device_mconfig_additions() const
// cs4031_device - constructor
//-------------------------------------------------
-cs4031_device::cs4031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cs4031_device::cs4031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CS4031, "CS4031", tag, owner, clock, "cs4031", __FILE__),
m_read_ior(*this),
m_write_iow(*this),
@@ -190,25 +190,25 @@ cs4031_device::cs4031_device(const machine_config &mconfig, const char *tag, dev
{
}
-void cs4031_device::static_set_cputag(device_t &device, const char *tag)
+void cs4031_device::static_set_cputag(device_t &device, std::string tag)
{
cs4031_device &cs4031 = downcast<cs4031_device &>(device);
cs4031.m_cputag = tag;
}
-void cs4031_device::static_set_isatag(device_t &device, const char *tag)
+void cs4031_device::static_set_isatag(device_t &device, std::string tag)
{
cs4031_device &cs4031 = downcast<cs4031_device &>(device);
cs4031.m_isatag = tag;
}
-void cs4031_device::static_set_biostag(device_t &device, const char *tag)
+void cs4031_device::static_set_biostag(device_t &device, std::string tag)
{
cs4031_device &cs4031 = downcast<cs4031_device &>(device);
cs4031.m_biostag = tag;
}
-void cs4031_device::static_set_keybctag(device_t &device, const char *tag)
+void cs4031_device::static_set_keybctag(device_t &device, std::string tag)
{
cs4031_device &cs4031 = downcast<cs4031_device &>(device);
cs4031.m_keybctag = tag;
diff --git a/src/devices/machine/cs4031.h b/src/devices/machine/cs4031.h
index 9a194a8699b..2880d330cf8 100644
--- a/src/devices/machine/cs4031.h
+++ b/src/devices/machine/cs4031.h
@@ -82,7 +82,7 @@ class cs4031_device : public device_t
{
public:
// construction/destruction
- cs4031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cs4031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -181,10 +181,10 @@ public:
IRQ_CALLBACK_MEMBER(int_ack_r) { return m_intc1->acknowledge(); }
// inline configuration
- static void static_set_cputag(device_t &device, const char *tag);
- static void static_set_isatag(device_t &device, const char *tag);
- static void static_set_biostag(device_t &device, const char *tag);
- static void static_set_keybctag(device_t &device, const char *tag);
+ static void static_set_cputag(device_t &device, std::string tag);
+ static void static_set_isatag(device_t &device, std::string tag);
+ static void static_set_biostag(device_t &device, std::string tag);
+ static void static_set_keybctag(device_t &device, std::string tag);
protected:
// device-level overrides
@@ -221,10 +221,10 @@ private:
void update_write_regions();
// internal state
- const char *m_cputag;
- const char *m_isatag;
- const char *m_biostag;
- const char *m_keybctag;
+ std::string m_cputag;
+ std::string m_isatag;
+ std::string m_biostag;
+ std::string m_keybctag;
address_space *m_space;
address_space *m_space_io;
diff --git a/src/devices/machine/cs8221.cpp b/src/devices/machine/cs8221.cpp
index 95a890d7bba..118c9b08c3d 100644
--- a/src/devices/machine/cs8221.cpp
+++ b/src/devices/machine/cs8221.cpp
@@ -58,26 +58,26 @@ static const char *const register_names[] =
// cs8221_device - constructor
//-------------------------------------------------
-cs8221_device::cs8221_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cs8221_device::cs8221_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CS8221, "CS8221", tag, owner, clock, "cs8221", __FILE__),
m_address(0),
m_address_valid(false)
{
}
-void cs8221_device::static_set_cputag(device_t &device, const char *tag)
+void cs8221_device::static_set_cputag(device_t &device, std::string tag)
{
cs8221_device &cs8221 = downcast<cs8221_device &>(device);
cs8221.m_cputag = tag;
}
-void cs8221_device::static_set_isatag(device_t &device, const char *tag)
+void cs8221_device::static_set_isatag(device_t &device, std::string tag)
{
cs8221_device &cs8221 = downcast<cs8221_device &>(device);
cs8221.m_isatag = tag;
}
-void cs8221_device::static_set_biostag(device_t &device, const char *tag)
+void cs8221_device::static_set_biostag(device_t &device, std::string tag)
{
cs8221_device &cs8221 = downcast<cs8221_device &>(device);
cs8221.m_biostag = tag;
diff --git a/src/devices/machine/cs8221.h b/src/devices/machine/cs8221.h
index ea7cc4a99b4..b53d63a76b5 100644
--- a/src/devices/machine/cs8221.h
+++ b/src/devices/machine/cs8221.h
@@ -44,16 +44,16 @@ class cs8221_device : public device_t
{
public:
// construction/destruction
- cs8221_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cs8221_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( address_w );
DECLARE_READ8_MEMBER( data_r );
DECLARE_WRITE8_MEMBER( data_w );
// inline configuration
- static void static_set_cputag(device_t &device, const char *tag);
- static void static_set_isatag(device_t &device, const char *tag);
- static void static_set_biostag(device_t &device, const char *tag);
+ static void static_set_cputag(device_t &device, std::string tag);
+ static void static_set_isatag(device_t &device, std::string tag);
+ static void static_set_biostag(device_t &device, std::string tag);
protected:
// device-level overrides
@@ -72,9 +72,9 @@ private:
UINT8 m_address;
bool m_address_valid;
- const char *m_cputag;
- const char *m_isatag;
- const char *m_biostag;
+ std::string m_cputag;
+ std::string m_isatag;
+ std::string m_biostag;
UINT8 m_registers[0x10];
diff --git a/src/devices/machine/diablo_hd.cpp b/src/devices/machine/diablo_hd.cpp
index f833cf54504..8cc89ca66f1 100644
--- a/src/devices/machine/diablo_hd.cpp
+++ b/src/devices/machine/diablo_hd.cpp
@@ -57,7 +57,7 @@
* </PRE>
*/
-diablo_hd_device::diablo_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+diablo_hd_device::diablo_hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, DIABLO_HD, "Diablo Disk", tag, owner, clock, "diablo_hd", __FILE__),
#if DIABLO_DEBUG
m_log_level(8),
@@ -1322,7 +1322,7 @@ void diablo_hd_device::device_start()
m_image = static_cast<diablo_image_device *>(subdevice("drive"));
m_packs = 1; // FIXME: get from configuration?
- m_unit = strstr(m_image->tag(), "diablo0") ? 0 : 1;
+ m_unit = strstr(m_image->tag().c_str(), "diablo0") ? 0 : 1;
m_timer = timer_alloc(1, nullptr);
}
diff --git a/src/devices/machine/diablo_hd.h b/src/devices/machine/diablo_hd.h
index c3fadd2a073..a391e352199 100644
--- a/src/devices/machine/diablo_hd.h
+++ b/src/devices/machine/diablo_hd.h
@@ -22,7 +22,7 @@ extern const device_type DIABLO_HD;
class diablo_hd_device : public device_t
{
public:
- diablo_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ diablo_hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~diablo_hd_device();
static const int DIABLO_UNIT_MAX = 2; //!< max number of drive units
diff --git a/src/devices/machine/dmac.cpp b/src/devices/machine/dmac.cpp
index 34992fc4f5c..ea1c16fa61c 100644
--- a/src/devices/machine/dmac.cpp
+++ b/src/devices/machine/dmac.cpp
@@ -37,7 +37,7 @@ const device_type DMAC = &device_creator<dmac_device>;
// dmac_device - constructor
//-------------------------------------------------
-dmac_device::dmac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+dmac_device::dmac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, DMAC, "DMAC DMA Controller", tag, owner, clock, "dmac", __FILE__),
amiga_autoconfig(),
m_cfgout_handler(*this),
diff --git a/src/devices/machine/dmac.h b/src/devices/machine/dmac.h
index 2d86c427013..494888cecf1 100644
--- a/src/devices/machine/dmac.h
+++ b/src/devices/machine/dmac.h
@@ -55,7 +55,7 @@ class dmac_device : public device_t, public amiga_autoconfig
{
public:
// construction/destruction
- dmac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// callbacks
template<class _Object> static devcb_base &set_cfgout_handler(device_t &device, _Object object)
diff --git a/src/devices/machine/dp8390.cpp b/src/devices/machine/dp8390.cpp
index 52e66168322..87c9725ee9f 100644
--- a/src/devices/machine/dp8390.cpp
+++ b/src/devices/machine/dp8390.cpp
@@ -9,17 +9,17 @@
const device_type DP8390D = &device_creator<dp8390d_device>;
const device_type RTL8019A = &device_creator<rtl8019a_device>;
-dp8390d_device::dp8390d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dp8390d_device::dp8390d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dp8390_device(mconfig, DP8390D, "DP8390D", tag, owner, clock, 10.0f, "dp8390d", __FILE__) {
m_type = TYPE_DP8390D;
}
-rtl8019a_device::rtl8019a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rtl8019a_device::rtl8019a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: dp8390_device(mconfig, RTL8019A, "RTL8019A", tag, owner, clock, 10.0f, "rtl8019a", __FILE__) {
m_type = TYPE_RTL8019A;
}
-dp8390_device::dp8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source)
+dp8390_device::dp8390_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_network_interface(mconfig, *this, bandwidth), m_type(0),
m_irq_cb(*this),
diff --git a/src/devices/machine/dp8390.h b/src/devices/machine/dp8390.h
index 49341e30e49..bb3f39bc314 100644
--- a/src/devices/machine/dp8390.h
+++ b/src/devices/machine/dp8390.h
@@ -38,7 +38,7 @@ class dp8390_device : public device_t,
{
public:
// construction/destruction
- dp8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source);
+ dp8390_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_breq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_breq_cb.set_callback(object); }
@@ -130,13 +130,13 @@ private:
class rtl8019a_device : public dp8390_device
{
public:
- rtl8019a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rtl8019a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class dp8390d_device : public dp8390_device
{
public:
- dp8390d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dp8390d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// device type definition
diff --git a/src/devices/machine/ds1204.cpp b/src/devices/machine/ds1204.cpp
index 72029b2aecc..b882022d306 100644
--- a/src/devices/machine/ds1204.cpp
+++ b/src/devices/machine/ds1204.cpp
@@ -22,14 +22,14 @@ inline void ATTR_PRINTF( 3, 4 ) ds1204_device::verboselog( int n_level, const ch
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: ds1204(%s) %s", machine().describe_context(), tag(), buf );
+ logerror( "%s: ds1204(%s) %s", machine().describe_context(), tag().c_str(), buf );
}
}
// device type definition
const device_type DS1204 = &device_creator<ds1204_device>;
-ds1204_device::ds1204_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+ds1204_device::ds1204_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t( mconfig, DS1204, "DS1204", tag, owner, clock, "ds1204", __FILE__ ),
device_nvram_interface(mconfig, *this),
m_rst( 0 ),
@@ -71,11 +71,11 @@ void ds1204_device::nvram_default()
if( !m_region )
{
- logerror( "ds1204(%s) region not found\n", tag() );
+ logerror( "ds1204(%s) region not found\n", tag().c_str() );
}
else if( m_region->bytes() != expected_bytes )
{
- logerror( "ds1204(%s) region length 0x%x expected 0x%x\n", tag(), m_region->bytes(), expected_bytes );
+ logerror( "ds1204(%s) region length 0x%x expected 0x%x\n", tag().c_str(), m_region->bytes(), expected_bytes );
}
else
{
diff --git a/src/devices/machine/ds1204.h b/src/devices/machine/ds1204.h
index 42b68de7538..61e317126c6 100644
--- a/src/devices/machine/ds1204.h
+++ b/src/devices/machine/ds1204.h
@@ -22,7 +22,7 @@ class ds1204_device : public device_t,
{
public:
// construction/destruction
- ds1204_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
+ ds1204_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
DECLARE_WRITE_LINE_MEMBER( write_rst );
DECLARE_WRITE_LINE_MEMBER( write_clk );
diff --git a/src/devices/machine/ds128x.cpp b/src/devices/machine/ds128x.cpp
index 5b7fa8e0663..6c0e9a2696b 100644
--- a/src/devices/machine/ds128x.cpp
+++ b/src/devices/machine/ds128x.cpp
@@ -10,7 +10,7 @@ const device_type DS12885 = &device_creator<ds12885_device>;
// ds12885_device - constructor
//-------------------------------------------------
-ds12885_device::ds12885_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds12885_device::ds12885_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: mc146818_device(mconfig, DS12885, "DS12885", tag, owner, clock, "ds12885", __FILE__)
{
}
diff --git a/src/devices/machine/ds128x.h b/src/devices/machine/ds128x.h
index 7dbd2deb92c..e61bad76964 100644
--- a/src/devices/machine/ds128x.h
+++ b/src/devices/machine/ds128x.h
@@ -14,7 +14,7 @@ class ds12885_device : public mc146818_device
{
public:
// construction/destruction
- ds12885_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds12885_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual int data_size() override { return 128; }
diff --git a/src/devices/machine/ds1302.cpp b/src/devices/machine/ds1302.cpp
index c2cd23b560f..108d4740c0c 100644
--- a/src/devices/machine/ds1302.cpp
+++ b/src/devices/machine/ds1302.cpp
@@ -72,7 +72,7 @@ const device_type DS1302 = &device_creator<ds1302_device>;
// ds1302_device - constructor
//-------------------------------------------------
-ds1302_device::ds1302_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds1302_device::ds1302_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS1302, "DS1302", tag, owner, clock, "ds1302", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this)
@@ -191,7 +191,7 @@ void ds1302_device::rtc_clock_updated(int year, int month, int day, int day_of_w
WRITE_LINE_MEMBER( ds1302_device::ce_w )
{
- if (LOG) logerror("DS1302 '%s' CE: %u\n", tag(), state);
+ if (LOG) logerror("DS1302 '%s' CE: %u\n", tag().c_str(), state);
if (!state && m_ce)
{
@@ -224,26 +224,26 @@ void ds1302_device::load_shift_register()
{
m_data = m_ram[m_addr];
- if (LOG) logerror("DS1302 '%s' Read RAM %u:%02x\n", tag(), m_addr, m_data);
+ if (LOG) logerror("DS1302 '%s' Read RAM %u:%02x\n", tag().c_str(), m_addr, m_data);
}
else
{
m_data = m_user[m_addr];
- if (LOG) logerror("DS1302 '%s' Read Clock %u:%02x\n", tag(), m_addr, m_data);
+ if (LOG) logerror("DS1302 '%s' Read Clock %u:%02x\n", tag().c_str(), m_addr, m_data);
}
}
else
{
if (COMMAND_RAM)
{
- if (LOG) logerror("DS1302 '%s' Write RAM %u:%02x\n", tag(), m_addr, m_data);
+ if (LOG) logerror("DS1302 '%s' Write RAM %u:%02x\n", tag().c_str(), m_addr, m_data);
m_ram[m_addr] = m_data;
}
else if (m_addr < 9)
{
- if (LOG) logerror("DS1302 '%s' Write Clock %u:%02x\n", tag(), m_addr, m_data);
+ if (LOG) logerror("DS1302 '%s' Write Clock %u:%02x\n", tag().c_str(), m_addr, m_data);
m_reg[m_addr] = m_data;
}
@@ -266,7 +266,7 @@ void ds1302_device::input_bit()
if (m_bits == 8)
{
- if (LOG) logerror("DS1302 '%s' Command: %02x\n", tag(), m_cmd);
+ if (LOG) logerror("DS1302 '%s' Command: %02x\n", tag().c_str(), m_cmd);
m_bits = 0;
m_addr = (m_cmd >> 1) & 0x1f;
@@ -303,7 +303,7 @@ void ds1302_device::input_bit()
if (m_bits == 8)
{
- if (LOG) logerror("DS1302 '%s' Data: %02x\n", tag(), m_data);
+ if (LOG) logerror("DS1302 '%s' Data: %02x\n", tag().c_str(), m_data);
m_bits = 0;
@@ -374,7 +374,7 @@ void ds1302_device::output_bit()
WRITE_LINE_MEMBER( ds1302_device::sclk_w )
{
- if (LOG) logerror("DS1302 '%s' CLK: %u\n", tag(), state);
+ if (LOG) logerror("DS1302 '%s' CLK: %u\n", tag().c_str(), state);
if (!m_ce) return;
@@ -397,7 +397,7 @@ WRITE_LINE_MEMBER( ds1302_device::sclk_w )
WRITE_LINE_MEMBER( ds1302_device::io_w )
{
- if (LOG) logerror("DS1302 '%s' I/O: %u\n", tag(), state);
+ if (LOG) logerror("DS1302 '%s' I/O: %u\n", tag().c_str(), state);
m_io = state;
}
diff --git a/src/devices/machine/ds1302.h b/src/devices/machine/ds1302.h
index 515613579b2..5f0784519b7 100644
--- a/src/devices/machine/ds1302.h
+++ b/src/devices/machine/ds1302.h
@@ -43,7 +43,7 @@ class ds1302_device : public device_t,
{
public:
// construction/destruction
- ds1302_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds1302_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( ce_w );
DECLARE_WRITE_LINE_MEMBER( sclk_w );
diff --git a/src/devices/machine/ds1315.cpp b/src/devices/machine/ds1315.cpp
index e9c984e4716..239f2ca866a 100644
--- a/src/devices/machine/ds1315.cpp
+++ b/src/devices/machine/ds1315.cpp
@@ -27,7 +27,7 @@
const device_type DS1315 = &device_creator<ds1315_device>;
-ds1315_device::ds1315_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds1315_device::ds1315_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS1315, "Dallas Semiconductor DS1315", tag, owner, clock, "ds1315", __FILE__), m_mode(), m_count(0)
{
}
diff --git a/src/devices/machine/ds1315.h b/src/devices/machine/ds1315.h
index 1894a05aac7..ae51a2a753d 100644
--- a/src/devices/machine/ds1315.h
+++ b/src/devices/machine/ds1315.h
@@ -31,7 +31,7 @@ ALLOW_SAVE_TYPE(ds1315_mode_t);
class ds1315_device : public device_t
{
public:
- ds1315_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds1315_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~ds1315_device() {}
DECLARE_READ8_MEMBER(read_0);
diff --git a/src/devices/machine/ds2401.cpp b/src/devices/machine/ds2401.cpp
index 7298fa888ee..889baf7ebaa 100644
--- a/src/devices/machine/ds2401.cpp
+++ b/src/devices/machine/ds2401.cpp
@@ -22,14 +22,14 @@ inline void ds2401_device::verboselog(int n_level, const char *s_fmt, ...)
va_start(v, s_fmt);
vsprintf(buf, s_fmt, v);
va_end(v);
- logerror("ds2401 %s %s: %s", tag(), machine().describe_context(), buf);
+ logerror("ds2401 %s %s: %s", tag().c_str(), machine().describe_context(), buf);
}
}
// device type definition
const device_type DS2401 = &device_creator<ds2401_device>;
-ds2401_device::ds2401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds2401_device::ds2401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS2401, "DS2401", tag, owner, clock, "ds2401", __FILE__), m_state(0), m_bit(0), m_shift(0), m_byte(0), m_rx(false), m_tx(false), m_timer_main(nullptr), m_timer_reset(nullptr)
{
}
@@ -73,11 +73,11 @@ void ds2401_device::device_reset()
return;
}
- logerror("ds2401 %s: Wrong region length for id data, expected 0x%x, got 0x%x\n", tag(), SIZE_DATA, m_region->bytes());
+ logerror("ds2401 %s: Wrong region length for id data, expected 0x%x, got 0x%x\n", tag().c_str(), SIZE_DATA, m_region->bytes());
}
else
{
- logerror("ds2401 %s: Warning, no id provided, answer will be all zeroes.\n", tag());
+ logerror("ds2401 %s: Warning, no id provided, answer will be all zeroes.\n", tag().c_str());
}
memset(m_data, 0, SIZE_DATA);
diff --git a/src/devices/machine/ds2401.h b/src/devices/machine/ds2401.h
index 11c05f27a02..7bef492f499 100644
--- a/src/devices/machine/ds2401.h
+++ b/src/devices/machine/ds2401.h
@@ -20,7 +20,7 @@ class ds2401_device : public device_t
{
public:
// construction/destruction
- ds2401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds2401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( write );
DECLARE_READ_LINE_MEMBER( read );
diff --git a/src/devices/machine/ds2404.cpp b/src/devices/machine/ds2404.cpp
index 68082389cee..7a437332620 100644
--- a/src/devices/machine/ds2404.cpp
+++ b/src/devices/machine/ds2404.cpp
@@ -24,7 +24,7 @@ const device_type DS2404 = &device_creator<ds2404_device>;
// ds2404_device - constructor
//-------------------------------------------------
-ds2404_device::ds2404_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds2404_device::ds2404_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS2404, "DS2404", tag, owner, clock, "ds2404", __FILE__),
device_nvram_interface(mconfig, *this), m_tick_timer(nullptr), m_ref_year(0), m_ref_month(0), m_ref_day(0),
m_address(0),
diff --git a/src/devices/machine/ds2404.h b/src/devices/machine/ds2404.h
index 86b9c7be05d..5510afc9006 100644
--- a/src/devices/machine/ds2404.h
+++ b/src/devices/machine/ds2404.h
@@ -49,7 +49,7 @@ class ds2404_device : public device_t,
{
public:
// construction/destruction
- ds2404_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds2404_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_ref_year(device_t &device, UINT32 m_ref_year);
diff --git a/src/devices/machine/ds75160a.cpp b/src/devices/machine/ds75160a.cpp
index 1560fa4f0b2..56a602fd607 100644
--- a/src/devices/machine/ds75160a.cpp
+++ b/src/devices/machine/ds75160a.cpp
@@ -26,7 +26,7 @@ const device_type DS75160A = &device_creator<ds75160a_device>;
// ds75160a_device - constructor
//-------------------------------------------------
-ds75160a_device::ds75160a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds75160a_device::ds75160a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS75160A, "DS75160A", tag, owner, clock, "ds75160a", __FILE__),
m_read(*this),
m_write(*this),
diff --git a/src/devices/machine/ds75160a.h b/src/devices/machine/ds75160a.h
index 5cb4898322d..0ac0f1c4d4d 100644
--- a/src/devices/machine/ds75160a.h
+++ b/src/devices/machine/ds75160a.h
@@ -48,7 +48,7 @@ class ds75160a_device : public device_t
{
public:
// construction/destruction
- ds75160a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds75160a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _read, class _write> void set_callbacks(_read rd, _write wr) {
m_read.set_callback(rd);
diff --git a/src/devices/machine/ds75161a.cpp b/src/devices/machine/ds75161a.cpp
index 5ec21a0e003..6280661e6aa 100644
--- a/src/devices/machine/ds75161a.cpp
+++ b/src/devices/machine/ds75161a.cpp
@@ -26,7 +26,7 @@ const device_type DS75161A = &device_creator<ds75161a_device>;
// ds75161a_device - constructor
//-------------------------------------------------
-ds75161a_device::ds75161a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ds75161a_device::ds75161a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS75161A, "DS75161A", tag, owner, clock, "ds75161a", __FILE__),
m_in_ren_cb(*this),
m_in_ifc_cb(*this),
diff --git a/src/devices/machine/ds75161a.h b/src/devices/machine/ds75161a.h
index 33c244f6528..9ff55d436e7 100644
--- a/src/devices/machine/ds75161a.h
+++ b/src/devices/machine/ds75161a.h
@@ -90,7 +90,7 @@ class ds75161a_device : public device_t
{
public:
// construction/destruction
- ds75161a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ds75161a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_in_ren_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_ren_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_ifc_callback(device_t &device, _Object object) { return downcast<ds75161a_device &>(device).m_in_ifc_cb.set_callback(object); }
diff --git a/src/devices/machine/e0516.cpp b/src/devices/machine/e0516.cpp
index f80cad5bdb5..fd09cf68137 100644
--- a/src/devices/machine/e0516.cpp
+++ b/src/devices/machine/e0516.cpp
@@ -38,7 +38,7 @@ const device_type E0516 = &device_creator<e0516_device>;
// e0516_device - constructor
//-------------------------------------------------
-e0516_device::e0516_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e0516_device::e0516_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, E0516, "E05-16", tag, owner, clock, "e0516", __FILE__),
device_rtc_interface(mconfig, *this), m_cs(0), m_clk(0), m_data_latch(0), m_reg_latch(0), m_read_write(0), m_state(0), m_bits(0), m_dio(0), m_timer(nullptr)
{
@@ -93,7 +93,7 @@ void e0516_device::device_timer(emu_timer &timer, device_timer_id id, int param,
WRITE_LINE_MEMBER( e0516_device::cs_w )
{
- if (LOG) logerror("E05-16 '%s' CS %u\n", tag(), state);
+ if (LOG) logerror("E05-16 '%s' CS %u\n", tag().c_str(), state);
m_cs = state;
@@ -113,7 +113,7 @@ WRITE_LINE_MEMBER( e0516_device::cs_w )
WRITE_LINE_MEMBER( e0516_device::clk_w )
{
- if (LOG) logerror("E05-16 '%s' CLK %u\n", tag(), state);
+ if (LOG) logerror("E05-16 '%s' CLK %u\n", tag().c_str(), state);
m_clk = state;
@@ -123,7 +123,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w )
if (m_state == STATE_ADDRESS)
{
- if (LOG) logerror("E05-16 '%s' Command Bit %u\n", tag(), m_dio);
+ if (LOG) logerror("E05-16 '%s' Command Bit %u\n", tag().c_str(), m_dio);
// command
m_reg_latch |= m_dio << 3;
@@ -147,7 +147,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w )
if (BIT(m_reg_latch, 0))
{
// read
- if (LOG) logerror("E05-16 '%s' Data Bit OUT %u\n", tag(), m_dio);
+ if (LOG) logerror("E05-16 '%s' Data Bit OUT %u\n", tag().c_str(), m_dio);
m_dio = BIT(m_data_latch, 0);
m_data_latch >>= 1;
@@ -155,7 +155,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w )
else
{
// write
- if (LOG) logerror("E05-16 '%s' Data Bit IN %u\n", tag(), m_dio);
+ if (LOG) logerror("E05-16 '%s' Data Bit IN %u\n", tag().c_str(), m_dio);
m_data_latch |= m_dio << 7;
m_data_latch >>= 1;
@@ -182,7 +182,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w )
WRITE_LINE_MEMBER( e0516_device::dio_w )
{
- if (LOG) logerror("E05-16 '%s' DIO %u\n", tag(), state);
+ if (LOG) logerror("E05-16 '%s' DIO %u\n", tag().c_str(), state);
m_dio = state;
}
diff --git a/src/devices/machine/e0516.h b/src/devices/machine/e0516.h
index 7e95be0dfc1..edecd2d613d 100644
--- a/src/devices/machine/e0516.h
+++ b/src/devices/machine/e0516.h
@@ -46,7 +46,7 @@ class e0516_device : public device_t,
{
public:
// construction/destruction
- e0516_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e0516_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( cs_w );
DECLARE_WRITE_LINE_MEMBER( clk_w );
diff --git a/src/devices/machine/e05a03.cpp b/src/devices/machine/e05a03.cpp
index b0389abb6df..71b985967de 100644
--- a/src/devices/machine/e05a03.cpp
+++ b/src/devices/machine/e05a03.cpp
@@ -16,7 +16,7 @@
const device_type E05A03 = &device_creator<e05a03_device>;
-e05a03_device::e05a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e05a03_device::e05a03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, E05A03, "E05A03", tag, owner, clock, "e05a03", __FILE__),
m_write_nlq_lp(*this),
m_write_pe_lp(*this),
diff --git a/src/devices/machine/e05a03.h b/src/devices/machine/e05a03.h
index 86b36b673b0..ab768434d68 100644
--- a/src/devices/machine/e05a03.h
+++ b/src/devices/machine/e05a03.h
@@ -36,7 +36,7 @@
class e05a03_device : public device_t
{
public:
- e05a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e05a03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~e05a03_device() {}
template<class _Object> static devcb_base &set_nlq_lp_wr_callback(device_t &device, _Object object) { return downcast<e05a03_device &>(device).m_write_nlq_lp.set_callback(object); }
diff --git a/src/devices/machine/e05a30.cpp b/src/devices/machine/e05a30.cpp
index 8bb802f9265..331584e57b8 100644
--- a/src/devices/machine/e05a30.cpp
+++ b/src/devices/machine/e05a30.cpp
@@ -22,7 +22,7 @@
const device_type E05A30 = &device_creator<e05a30_device>;
-e05a30_device::e05a30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e05a30_device::e05a30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, E05A30, "E05A30", tag, owner, clock, "e05a30", __FILE__),
m_write_printhead(*this),
m_write_pf_stepper(*this),
diff --git a/src/devices/machine/e05a30.h b/src/devices/machine/e05a30.h
index f05b3fd35c9..b3b90086860 100644
--- a/src/devices/machine/e05a30.h
+++ b/src/devices/machine/e05a30.h
@@ -46,7 +46,7 @@
class e05a30_device : public device_t
{
public:
- e05a30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e05a30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~e05a30_device() {}
template<class _Object> static devcb_base &set_printhead_wr_callback(device_t &device, _Object object) { return downcast<e05a30_device &>(device).m_write_printhead.set_callback(object); }
diff --git a/src/devices/machine/eeprom.cpp b/src/devices/machine/eeprom.cpp
index 53b92a0ee0d..5909d6781a1 100644
--- a/src/devices/machine/eeprom.cpp
+++ b/src/devices/machine/eeprom.cpp
@@ -44,7 +44,7 @@ ADDRESS_MAP_END
// eeprom_base_device - constructor
//-------------------------------------------------
-eeprom_base_device::eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_base_device::eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: device_t(mconfig, devtype, name, tag, owner, 0, shortname, file),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -292,12 +292,12 @@ void eeprom_base_device::nvram_default()
if (m_region != nullptr)
{
if (m_region->bytes() != eeprom_bytes)
- fatalerror("eeprom region '%s' wrong size (expected size = 0x%X)\n", tag(), eeprom_bytes);
+ fatalerror("eeprom region '%s' wrong size (expected size = 0x%X)\n", tag().c_str(), eeprom_bytes);
if (m_data_bits == 8 && m_region->bytewidth() != 1)
- fatalerror("eeprom region '%s' needs to be an 8-bit region\n", tag());
+ fatalerror("eeprom region '%s' needs to be an 8-bit region\n", tag().c_str());
if (m_data_bits == 16 && (m_region->bytewidth() != 2 || m_region->endianness() != ENDIANNESS_BIG))
- fatalerror("eeprom region '%s' needs to be a 16-bit big-endian region\n", tag());
- osd_printf_verbose("Loading data from EEPROM region '%s'\n", tag());
+ fatalerror("eeprom region '%s' needs to be a 16-bit big-endian region\n", tag().c_str());
+ osd_printf_verbose("Loading data from EEPROM region '%s'\n", tag().c_str());
if (m_data_bits == 8)
{
diff --git a/src/devices/machine/eeprom.h b/src/devices/machine/eeprom.h
index 23ba81cf42f..605ff258a07 100644
--- a/src/devices/machine/eeprom.h
+++ b/src/devices/machine/eeprom.h
@@ -49,7 +49,7 @@ class eeprom_base_device : public device_t,
{
protected:
// construction/destruction
- eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// timing constants
diff --git a/src/devices/machine/eeprompar.cpp b/src/devices/machine/eeprompar.cpp
index af575ec1419..df360f69b09 100644
--- a/src/devices/machine/eeprompar.cpp
+++ b/src/devices/machine/eeprompar.cpp
@@ -51,7 +51,7 @@
// eeprom_parallel_base_device - constructor
//-------------------------------------------------
-eeprom_parallel_base_device::eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_parallel_base_device::eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -88,7 +88,7 @@ void eeprom_parallel_base_device::device_reset()
// eeprom_parallel_28xx_device - constructor
//-------------------------------------------------
-eeprom_parallel_28xx_device::eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_parallel_28xx_device::eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: eeprom_parallel_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -116,7 +116,7 @@ READ8_MEMBER(eeprom_parallel_28xx_device::read)
// macro for defining a new device class
#define DEFINE_PARALLEL_EEPROM_DEVICE(_baseclass, _lowercase, _uppercase, _bits, _cells) \
-eeprom_parallel_##_lowercase##_device::eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) \
+eeprom_parallel_##_lowercase##_device::eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) \
: eeprom_parallel_##_baseclass##_device(mconfig, EEPROM_PARALLEL_##_uppercase, "Parallel EEPROM " #_uppercase " (" #_cells "x" #_bits ")", tag, owner, #_lowercase, __FILE__) \
{ \
static_set_size(*this, _cells, _bits); \
diff --git a/src/devices/machine/eeprompar.h b/src/devices/machine/eeprompar.h
index e8ed153dd97..814a1e5d674 100644
--- a/src/devices/machine/eeprompar.h
+++ b/src/devices/machine/eeprompar.h
@@ -51,7 +51,7 @@ class eeprom_parallel_base_device : public eeprom_base_device
{
protected:
// construction/destruction
- eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
protected:
// device-level overrides
@@ -67,7 +67,7 @@ class eeprom_parallel_28xx_device : public eeprom_parallel_base_device
{
protected:
// construction/destruction
- eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// read/write data lines - for now we cheat and ignore the control lines, assuming
@@ -87,7 +87,7 @@ public:
class eeprom_parallel_##_lowercase##_device : public eeprom_parallel_##_baseclass##_device \
{ \
public: \
- eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); \
+ eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); \
}; \
extern const device_type EEPROM_PARALLEL_##_uppercase;
// standard 28XX class of 8-bit EEPROMs
diff --git a/src/devices/machine/eepromser.cpp b/src/devices/machine/eepromser.cpp
index 347accae06f..9419993bc29 100644
--- a/src/devices/machine/eepromser.cpp
+++ b/src/devices/machine/eepromser.cpp
@@ -143,7 +143,7 @@ ALLOW_SAVE_TYPE(eeprom_serial_base_device::eeprom_state);
// eeprom_serial_base_device - constructor
//-------------------------------------------------
-eeprom_serial_base_device::eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_serial_base_device::eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, file),
m_command_address_bits(0),
m_streaming_enabled(false),
@@ -625,7 +625,7 @@ void eeprom_serial_base_device::execute_write_command()
// eeprom_serial_93cxx_device - constructor
//-------------------------------------------------
-eeprom_serial_93cxx_device::eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_serial_93cxx_device::eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -692,7 +692,7 @@ WRITE_LINE_MEMBER(eeprom_serial_93cxx_device::di_write) { base_di_write(state);
// eeprom_serial_er5911_device - constructor
//-------------------------------------------------
-eeprom_serial_er5911_device::eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_serial_er5911_device::eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -760,7 +760,7 @@ WRITE_LINE_MEMBER(eeprom_serial_er5911_device::di_write) { base_di_write(state);
// eeprom_serial_x24c44_device - constructor
//-------------------------------------------------
-eeprom_serial_x24c44_device::eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
+eeprom_serial_x24c44_device::eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
: eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -1127,7 +1127,7 @@ WRITE_LINE_MEMBER(eeprom_serial_x24c44_device::di_write) { base_di_write(state);
// macro for defining a new device class
#define DEFINE_SERIAL_EEPROM_DEVICE(_baseclass, _lowercase, _uppercase, _bits, _cells, _addrbits) \
-eeprom_serial_##_lowercase##_##_bits##bit_device::eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) \
+eeprom_serial_##_lowercase##_##_bits##bit_device::eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) \
: eeprom_serial_##_baseclass##_device(mconfig, EEPROM_SERIAL_##_uppercase##_##_bits##BIT, "Serial EEPROM " #_uppercase " (" #_cells "x" #_bits ")", tag, owner, #_lowercase "_" #_bits, __FILE__) \
{ \
static_set_size(*this, _cells, _bits); \
diff --git a/src/devices/machine/eepromser.h b/src/devices/machine/eepromser.h
index cbba81bfbbe..84c20239572 100644
--- a/src/devices/machine/eepromser.h
+++ b/src/devices/machine/eepromser.h
@@ -85,7 +85,7 @@ class eeprom_serial_base_device : public eeprom_base_device
{
protected:
// construction/destruction
- eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// inline configuration helpers
@@ -178,7 +178,7 @@ class eeprom_serial_93cxx_device : public eeprom_serial_base_device
{
protected:
// construction/destruction
- eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// read handlers
@@ -201,7 +201,7 @@ class eeprom_serial_er5911_device : public eeprom_serial_base_device
{
protected:
// construction/destruction
- eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// read handlers
@@ -227,7 +227,7 @@ class eeprom_serial_x24c44_device : public eeprom_serial_base_device
//async store not implemented
protected:
// construction/destruction
- eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
public:
// read handlers
@@ -264,7 +264,7 @@ protected:
class eeprom_serial_##_lowercase##_##_bits##bit_device : public eeprom_serial_##_baseclass##_device \
{ \
public: \
- eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); \
+ eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); \
}; \
extern const device_type EEPROM_SERIAL_##_uppercase##_##_bits##BIT;
// standard 93CX6 class of 16-bit EEPROMs
diff --git a/src/devices/machine/er2055.cpp b/src/devices/machine/er2055.cpp
index 7c395a83b62..f6f5e891320 100644
--- a/src/devices/machine/er2055.cpp
+++ b/src/devices/machine/er2055.cpp
@@ -33,7 +33,7 @@ ADDRESS_MAP_END
// er2055_device - constructor
//-------------------------------------------------
-er2055_device::er2055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+er2055_device::er2055_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ER2055, "ER2055 EAROM", tag, owner, clock, "er2055", __FILE__),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -85,9 +85,9 @@ void er2055_device::nvram_default()
if (m_region != nullptr)
{
if (m_region->bytes() != SIZE_DATA)
- fatalerror("er2055 region '%s' wrong size (expected size = 0x40)\n", tag());
+ fatalerror("er2055 region '%s' wrong size (expected size = 0x40)\n", tag().c_str());
if (m_region->bytewidth() != 1)
- fatalerror("er2055 region '%s' needs to be an 8-bit region\n", tag());
+ fatalerror("er2055 region '%s' needs to be an 8-bit region\n", tag().c_str());
UINT8 *default_data = m_region->base();
for (int byte = 0; byte < SIZE_DATA; byte++)
diff --git a/src/devices/machine/er2055.h b/src/devices/machine/er2055.h
index 900cac15b06..39a7767adee 100644
--- a/src/devices/machine/er2055.h
+++ b/src/devices/machine/er2055.h
@@ -36,7 +36,7 @@ class er2055_device : public device_t,
{
public:
// construction/destruction
- er2055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ er2055_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
UINT8 data() const { return m_data; }
diff --git a/src/devices/machine/f3853.cpp b/src/devices/machine/f3853.cpp
index a37e1b7e59b..adc0aa82ea5 100644
--- a/src/devices/machine/f3853.cpp
+++ b/src/devices/machine/f3853.cpp
@@ -49,7 +49,7 @@ const device_type F3853 = &device_creator<f3853_device>;
// f3853_device - constructor
//-------------------------------------------------
-f3853_device::f3853_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+f3853_device::f3853_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, F3853, "F3853", tag, owner, clock, "f3853", __FILE__)
{
}
diff --git a/src/devices/machine/f3853.h b/src/devices/machine/f3853.h
index 82e9610c174..61a1e0dd131 100644
--- a/src/devices/machine/f3853.h
+++ b/src/devices/machine/f3853.h
@@ -62,7 +62,7 @@ class f3853_device : public device_t
{
public:
// construction/destruction
- f3853_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ f3853_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_interrupt_req_callback(device_t &device, f3853_interrupt_req_delegate callback) { downcast<f3853_device &>(device).m_interrupt_req_cb = callback; }
diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp
index 671d0314560..21429d640b8 100644
--- a/src/devices/machine/fdc37c665gt.cpp
+++ b/src/devices/machine/fdc37c665gt.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "fdc37c665gt.h"
-fdc37c665gt_device::fdc37c665gt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+fdc37c665gt_device::fdc37c665gt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, FDC37C665GT, "FDC37C665GT", tag, owner, clock, "fdc37c665gt", __FILE__),
m_uart1(*this, "uart1"),
m_uart2(*this, "uart2")
diff --git a/src/devices/machine/fdc37c665gt.h b/src/devices/machine/fdc37c665gt.h
index 569bf8ed0e8..822bb3cb80e 100644
--- a/src/devices/machine/fdc37c665gt.h
+++ b/src/devices/machine/fdc37c665gt.h
@@ -16,7 +16,7 @@ class fdc37c665gt_device : public device_t
{
public:
// construction/destruction
- fdc37c665gt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fdc37c665gt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/devices/machine/gayle.cpp b/src/devices/machine/gayle.cpp
index 93ea9034eb0..03f96ac1517 100644
--- a/src/devices/machine/gayle.cpp
+++ b/src/devices/machine/gayle.cpp
@@ -33,7 +33,7 @@ const device_type GAYLE = &device_creator<gayle_device>;
// gayle_device - constructor
//-------------------------------------------------
-gayle_device::gayle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+gayle_device::gayle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, GAYLE, "GAYLE", tag, owner, clock, "gayle", __FILE__),
m_int2_w(*this),
m_cs0_read(*this),
diff --git a/src/devices/machine/gayle.h b/src/devices/machine/gayle.h
index 6ea542dd392..92d7d95b3c7 100644
--- a/src/devices/machine/gayle.h
+++ b/src/devices/machine/gayle.h
@@ -50,7 +50,7 @@ class gayle_device : public device_t
{
public:
// construction/destruction
- gayle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gayle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// callbacks
template<class _Object> static devcb_base &set_int2_handler(device_t &device, _Object object)
diff --git a/src/devices/machine/hd63450.cpp b/src/devices/machine/hd63450.cpp
index e15039fbb38..99460c3e16b 100644
--- a/src/devices/machine/hd63450.cpp
+++ b/src/devices/machine/hd63450.cpp
@@ -10,7 +10,7 @@
const device_type HD63450 = &device_creator<hd63450_device>;
-hd63450_device::hd63450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd63450_device::hd63450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HD63450, "Hitachi HD63450", tag, owner, clock, "hd63450", __FILE__),
m_dma_end(*this),
m_dma_error(*this),
@@ -22,7 +22,6 @@ hd63450_device::hd63450_device(const machine_config &mconfig, const char *tag, d
m_dma_write_1(*this),
m_dma_write_2(*this),
m_dma_write_3(*this),
- m_cpu_tag(nullptr),
m_cpu(nullptr)
{
for (int i = 0; i < 4; i++)
diff --git a/src/devices/machine/hd63450.h b/src/devices/machine/hd63450.h
index e303a0d28b2..86e5f6d2ee3 100644
--- a/src/devices/machine/hd63450.h
+++ b/src/devices/machine/hd63450.h
@@ -71,7 +71,7 @@ struct hd63450_regs
class hd63450_device : public device_t
{
public:
- hd63450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd63450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~hd63450_device() {}
template<class _Object> static devcb_base &set_dma_end_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_end.set_callback(object); }
@@ -85,7 +85,7 @@ public:
template<class _Object> static devcb_base &set_dma_write_2_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_write_2.set_callback(object); }
template<class _Object> static devcb_base &set_dma_write_3_callback(device_t &device, _Object object) { return downcast<hd63450_device &>(device).m_dma_write_3.set_callback(object); }
- static void set_cpu_tag(device_t &device, const char *tag) { downcast<hd63450_device &>(device).m_cpu_tag = tag; }
+ static void set_cpu_tag(device_t &device, std::string tag) { downcast<hd63450_device &>(device).m_cpu_tag = tag; }
static void set_our_clocks(device_t &device, const attotime &clk1, const attotime &clk2, const attotime &clk3, const attotime &clk4)
{
hd63450_device &dev = downcast<hd63450_device &>(device);
@@ -132,7 +132,7 @@ private:
devcb_write8 m_dma_write_2;
devcb_write8 m_dma_write_3;
- const char *m_cpu_tag;
+ std::string m_cpu_tag;
attotime m_our_clock[4];
attotime m_burst_clock[4];
diff --git a/src/devices/machine/hd64610.cpp b/src/devices/machine/hd64610.cpp
index d4639892e17..95b6a556e99 100644
--- a/src/devices/machine/hd64610.cpp
+++ b/src/devices/machine/hd64610.cpp
@@ -86,7 +86,7 @@ inline void hd64610_device::set_irq_line()
if (m_irq_out != irq_out)
{
- if (LOG) logerror("HD64610 '%s' IRQ %u\n", tag(), irq_out);
+ if (LOG) logerror("HD64610 '%s' IRQ %u\n", tag().c_str(), irq_out);
m_out_irq_cb(irq_out);
m_irq_out = irq_out;
@@ -150,7 +150,7 @@ inline void hd64610_device::check_alarm()
// hd64610_device - constructor
//-------------------------------------------------
-hd64610_device::hd64610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hd64610_device::hd64610_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HD64610, "HD64610", tag, owner, clock, "hd64610", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -298,7 +298,7 @@ READ8_MEMBER( hd64610_device::read )
{
UINT8 data = m_regs[offset & 0x0f];
- if (LOG) logerror("HD64610 '%s' Register %u Read %02x\n", tag(), offset, data);
+ if (LOG) logerror("HD64610 '%s' Register %u Read %02x\n", tag().c_str(), offset, data);
return data;
}
@@ -314,7 +314,7 @@ WRITE8_MEMBER( hd64610_device::write )
{
case REG_64HZ:
// read only
- logerror("HD64610 '%s' Writing to read-only register 64Hz Counter\n", tag());
+ logerror("HD64610 '%s' Writing to read-only register 64Hz Counter\n", tag().c_str());
break;
case REG_CRA:
@@ -322,17 +322,17 @@ WRITE8_MEMBER( hd64610_device::write )
if ((data & CRA_CF) == 0)
{
- if (LOG) logerror("HD64610 '%s' clear carry flag\n", tag());
+ if (LOG) logerror("HD64610 '%s' clear carry flag\n", tag().c_str());
m_regs[REG_CRA] &= 0x7f;
}
if ((data & CRA_AF) == 0)
{
- if (LOG) logerror("HD64610 '%s' clear alarm flag\n", tag());
+ if (LOG) logerror("HD64610 '%s' clear alarm flag\n", tag().c_str());
m_regs[REG_CRA] &= 0xfe;
}
- if (LOG) logerror("HD64610 '%s' set alarm IRQ %d\n", tag(), BIT(data, 3));
- if (LOG) logerror("HD64610 '%s' set carry IRQ %d\n", tag(), BIT(data, 4));
+ if (LOG) logerror("HD64610 '%s' set alarm IRQ %d\n", tag().c_str(), BIT(data, 3));
+ if (LOG) logerror("HD64610 '%s' set carry IRQ %d\n", tag().c_str(), BIT(data, 4));
break;
case REG_CRB:
@@ -340,7 +340,7 @@ WRITE8_MEMBER( hd64610_device::write )
if (data & CRB_ADJ)
{
- if (LOG) logerror("HD64610 '%s' 30-sec adjustament\n", tag());
+ if (LOG) logerror("HD64610 '%s' 30-sec adjustament\n", tag().c_str());
adjust_seconds();
m_regs[REG_64HZ] = 0;
@@ -349,18 +349,18 @@ WRITE8_MEMBER( hd64610_device::write )
if (data & CRB_RESET)
{
- if (LOG) logerror("HD64610 '%s' CRB reset\n", tag());
+ if (LOG) logerror("HD64610 '%s' CRB reset\n", tag().c_str());
m_regs[REG_64HZ] = 0;
m_regs[REG_CRB] &= ~CRB_RESET;
}
- if (LOG) logerror("HD64610 '%s' set timer %d\n", tag(), BIT(data, 0));
+ if (LOG) logerror("HD64610 '%s' set timer %d\n", tag().c_str(), BIT(data, 0));
break;
default:
m_regs[offset & 0x0f] = data & REG_WRITE_MASK[offset & 0x0f];
- if (LOG) logerror("HD64610 '%s' Register %u Write %02x\n", tag(), offset & 0x0f, data);
+ if (LOG) logerror("HD64610 '%s' Register %u Write %02x\n", tag().c_str(), offset & 0x0f, data);
break;
}
}
diff --git a/src/devices/machine/hd64610.h b/src/devices/machine/hd64610.h
index 021cf181c27..001d9e67b18 100644
--- a/src/devices/machine/hd64610.h
+++ b/src/devices/machine/hd64610.h
@@ -53,7 +53,7 @@ class hd64610_device : public device_t,
{
public:
// construction/destruction
- hd64610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hd64610_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<hd64610_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_1hz_callback(device_t &device, _Object object) { return downcast<hd64610_device &>(device).m_out_1hz_cb.set_callback(object); }
diff --git a/src/devices/machine/hdc92x4.cpp b/src/devices/machine/hdc92x4.cpp
index 54a8f802b99..c2659edcfd0 100644
--- a/src/devices/machine/hdc92x4.cpp
+++ b/src/devices/machine/hdc92x4.cpp
@@ -431,7 +431,7 @@ const hdc92x4_device::cmddef hdc92x4_device::s_command[] =
/*
Standard constructor for the base class and the two variants
*/
-hdc92x4_device::hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+hdc92x4_device::hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_out_intrq(*this),
m_out_dmarq(*this),
@@ -443,13 +443,13 @@ hdc92x4_device::hdc92x4_device(const machine_config &mconfig, device_type type,
{
}
-hdc9224_device::hdc9224_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hdc9224_device::hdc9224_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hdc92x4_device(mconfig, HDC9224, "SMC HDC9224 Universal Disk Controller", tag, owner, clock, "hdc9224", __FILE__)
{
m_is_hdc9234 = false;
}
-hdc9234_device::hdc9234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hdc9234_device::hdc9234_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: hdc92x4_device(mconfig, HDC9234, "SMC HDC9234 Universal Disk Controller", tag, owner, clock, "hdc9234", __FILE__)
{
m_is_hdc9234 = true;
@@ -622,7 +622,7 @@ void hdc92x4_device::wait_time(emu_timer *tm, int microsec, int next_substate)
void hdc92x4_device::wait_time(emu_timer *tm, const attotime &delay, int param)
{
- if (TRACE_DELAY) logerror("%s: [%s] Delaying by %4.2f microsecs\n", tag(), ttsn().c_str(), delay.as_double()*1000000);
+ if (TRACE_DELAY) logerror("%s: [%s] Delaying by %4.2f microsecs\n", tag().c_str(), ttsn().c_str(), delay.as_double()*1000000);
tm->adjust(delay);
m_substate = param;
m_state_after_line = UNDEF;
@@ -639,19 +639,19 @@ void hdc92x4_device::wait_line(int line, line_state level, int substate, bool st
if (line == SEEKCOMP_LINE && (seek_complete() == (level==ASSERT_LINE)))
{
- if (TRACE_LINES) logerror("%s: SEEK_COMPLETE line is already %d\n", tag(), level);
+ if (TRACE_LINES) logerror("%s: SEEK_COMPLETE line is already %d\n", tag().c_str(), level);
}
else
{
if (line == INDEX_LINE && (index_hole() == (level==ASSERT_LINE)))
{
- if (TRACE_LINES) logerror("%s: INDEX line is already %d\n", tag(), level);
+ if (TRACE_LINES) logerror("%s: INDEX line is already %d\n", tag().c_str(), level);
}
else
{
if (line == READY_LINE && (drive_ready() == (level==ASSERT_LINE)))
{
- if (TRACE_LINES) logerror("%s: READY line is already %d\n", tag(), level);
+ if (TRACE_LINES) logerror("%s: READY line is already %d\n", tag().c_str(), level);
}
else
{
@@ -698,7 +698,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
{
case READ_ID:
// Implied seek: Enter the READ_ID subprogram.
- if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate READ_ID\n", tag());
+ if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate READ_ID\n", tag().c_str());
// First step: Search the next IDAM, and if found, read the
// ID values into the registers
@@ -716,22 +716,22 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
// If an error occurred (no IDAM found), terminate the command
if ((m_register_r[CHIP_STATUS] & CS_SYNCERR) != 0)
{
- if (TRACE_FAIL) logerror("%s: READ_ID failed to find any IDAM\n", tag());
+ if (TRACE_FAIL) logerror("%s: READ_ID failed to find any IDAM\n", tag().c_str());
cont = ERROR;
break;
}
if (TRACE_READID)
{
- if (TRACE_SUBSTATES) logerror("%s: substate READ_ID1\n", tag());
- logerror("%s: DESIRED_CYL = %d; CURRENT_CYL = %d\n", tag(), desired_cylinder(), current_cylinder());
+ if (TRACE_SUBSTATES) logerror("%s: substate READ_ID1\n", tag().c_str());
+ logerror("%s: DESIRED_CYL = %d; CURRENT_CYL = %d\n", tag().c_str(), desired_cylinder(), current_cylinder());
}
// The CRC has been updated automatically with each read_one_bit during the live_run.
// We just need to check whether it ended in 0000
if (m_live_state.crc != 0)
{
- if (TRACE_FAIL) logerror("%s: CRC error in sector header\n", tag());
+ if (TRACE_FAIL) logerror("%s: CRC error in sector header\n", tag().c_str());
set_bits(m_register_r[CHIP_STATUS], CS_CRCERR, true);
cont = ERROR;
break;
@@ -752,7 +752,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
if (wait_seek_complete)
{
// We have to wait for SEEK COMPLETE
- if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: Waiting for SEEK COMPLETE\n", tag());
+ if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: Waiting for SEEK COMPLETE\n", tag().c_str());
wait_line(SEEKCOMP_LINE, ASSERT_LINE, READ_ID_SEEK_COMPLETE, false);
cont = WAIT;
}
@@ -765,7 +765,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
break;
}
- if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag());
+ if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag().c_str());
// STEPDIR = 0 -> towards TRK00
set_bits(m_output2, OUT2_STEPDIR, (m_track_delta>0));
set_bits(m_output2, OUT2_STEPPULSE, true);
@@ -774,7 +774,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
break;
case READ_ID_STEPOFF:
- if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag());
+ if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag().c_str());
set_bits(m_output2, OUT2_STEPPULSE, false);
m_track_delta += (m_track_delta<0)? 1 : -1;
// Return to STEP_ON, check whether there are more steps
@@ -788,7 +788,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
break;
default:
- logerror("%s: BUG: Unknown substate %02x in read_id, aborting command\n", tag(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in read_id, aborting command\n", tag().c_str(), m_substate);
cont = ERROR;
}
}
@@ -820,8 +820,8 @@ void hdc92x4_device::verify(int& cont)
// After seeking (or immediately when implied seek has been disabled),
// find the desired sector.
- if (TRACE_VERIFY && TRACE_SUBSTATES) logerror("%s: substate VERIFY\n", tag());
- if (TRACE_VERIFY) logerror("%s: VERIFY: Find sector CHS=(%d,%d,%d)\n", tag(),
+ if (TRACE_VERIFY && TRACE_SUBSTATES) logerror("%s: substate VERIFY\n", tag().c_str());
+ if (TRACE_VERIFY) logerror("%s: VERIFY: Find sector CHS=(%d,%d,%d)\n", tag().c_str(),
desired_cylinder(),
desired_head(),
desired_sector());
@@ -830,7 +830,7 @@ void hdc92x4_device::verify(int& cont)
// (This test is only relevant when we did not have a seek phase before)
if ((m_register_r[CHIP_STATUS] & CS_SYNCERR) != 0)
{
- if (TRACE_FAIL) logerror("%s: VERIFY failed to find any IDAM\n", tag());
+ if (TRACE_FAIL) logerror("%s: VERIFY failed to find any IDAM\n", tag().c_str());
cont = ERROR;
break;
}
@@ -846,7 +846,7 @@ void hdc92x4_device::verify(int& cont)
&& desired_head() == current_head()
&& desired_sector() == current_sector())
{
- if (TRACE_VERIFY) logerror("%s: Found the desired sector CHS=(%d,%d,%d)\n", tag(),
+ if (TRACE_VERIFY) logerror("%s: Found the desired sector CHS=(%d,%d,%d)\n", tag().c_str(),
desired_cylinder(),
desired_head(),
desired_sector());
@@ -856,7 +856,7 @@ void hdc92x4_device::verify(int& cont)
}
else
{
- if (TRACE_VERIFY && TRACE_DETAIL) logerror("%s: Current CHS=(%d,%d,%d), desired CHS=(%d,%d,%d).\n", tag(),
+ if (TRACE_VERIFY && TRACE_DETAIL) logerror("%s: Current CHS=(%d,%d,%d), desired CHS=(%d,%d,%d).\n", tag().c_str(),
current_cylinder(),
current_head(),
current_sector(),
@@ -875,10 +875,10 @@ void hdc92x4_device::verify(int& cont)
break;
case VERIFY3:
- if (TRACE_VERIFY) logerror("%s: Next IDAM found; total bytes read: %d\n", tag(), m_live_state.bit_count_total / 16);
+ if (TRACE_VERIFY) logerror("%s: Next IDAM found; total bytes read: %d\n", tag().c_str(), m_live_state.bit_count_total / 16);
if ((m_register_r[CHIP_STATUS] & CS_COMPERR) != 0)
{
- if (TRACE_FAIL) logerror("%s: VERIFY failed to find sector CHS=(%d,%d,%d)\n", tag(), desired_cylinder(), desired_head(), desired_sector());
+ if (TRACE_FAIL) logerror("%s: VERIFY failed to find sector CHS=(%d,%d,%d)\n", tag().c_str(), desired_cylinder(), desired_head(), desired_sector());
cont = ERROR;
break;
}
@@ -900,7 +900,7 @@ void hdc92x4_device::verify(int& cont)
break;
default:
- logerror("%s: BUG: Unknown substate %02x in verify, aborting command\n", tag(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in verify, aborting command\n", tag().c_str(), m_substate);
cont = ERROR;
}
}
@@ -931,7 +931,7 @@ void hdc92x4_device::data_transfer(int& cont)
switch (m_substate)
{
case DATA_TRANSFER:
- if (TRACE_TRANSFER && TRACE_SUBSTATES) logerror("%s: substate DATA_TRANSFER (%s)\n", tag(), m_write? "write" : "read");
+ if (TRACE_TRANSFER && TRACE_SUBSTATES) logerror("%s: substate DATA_TRANSFER (%s)\n", tag().c_str(), m_write? "write" : "read");
// Count from 0 again
m_live_state.bit_count_total = 0;
@@ -941,12 +941,12 @@ void hdc92x4_device::data_transfer(int& cont)
if (TRACE_TRANSFER && TRACE_DETAIL)
{
if (m_logical)
- logerror("%s: %s sector CHS=(%d,%d,%d)\n", tag(), m_write? "Write" : "Read",
+ logerror("%s: %s sector CHS=(%d,%d,%d)\n", tag().c_str(), m_write? "Write" : "Read",
desired_cylinder(),
desired_head(),
desired_sector());
else
- logerror("%s: %s next sector on track\n", tag(), m_write? "Write" : "Read");
+ logerror("%s: %s next sector on track\n", tag().c_str(), m_write? "Write" : "Read");
}
if (m_write)
@@ -974,12 +974,12 @@ void hdc92x4_device::data_transfer(int& cont)
// Decrement the retry register (one's complemented value; 0000 = 15)
int retry = 15-((m_register_w[RETRY_COUNT] >> 4)&0x0f);
- if (TRACE_FAIL) logerror("%s: DATA TRANSFER got CRC error in sector data, retries = %d\n", tag(), retry);
+ if (TRACE_FAIL) logerror("%s: DATA TRANSFER got CRC error in sector data, retries = %d\n", tag().c_str(), retry);
m_register_w[RETRY_COUNT] = (m_register_w[RETRY_COUNT] & 0x0f) | ((15-(retry-1))<<4);
if (retry == 0)
{
- if (TRACE_FAIL) logerror("%s: CRC error; no retries left\n", tag());
+ if (TRACE_FAIL) logerror("%s: CRC error; no retries left\n", tag().c_str());
set_bits(m_register_r[CHIP_STATUS], CS_CRCERR, true);
cont = ERROR;
}
@@ -997,7 +997,7 @@ void hdc92x4_device::data_transfer(int& cont)
}
else
{
- if (TRACE_TRANSFER) logerror("%s: Sector successfully read (count=%d)\n", tag(), m_register_w[SECTOR_COUNT]-1);
+ if (TRACE_TRANSFER) logerror("%s: Sector successfully read (count=%d)\n", tag().c_str(), m_register_w[SECTOR_COUNT]-1);
// Update the DMA registers for multi-sector operations
if (m_multi_sector)
@@ -1011,7 +1011,7 @@ void hdc92x4_device::data_transfer(int& cont)
m_register_w[DMA23_16] = m_register_r[DMA23_16] = (dma_address & 0xff0000) >> 16;
m_register_w[DMA15_8] = m_register_r[DMA15_8] = (dma_address & 0x00ff00) >> 8;
m_register_w[DMA7_0] = m_register_r[DMA7_0] = (dma_address & 0x0000ff);
- if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag(), dma_address);
+ if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag().c_str(), dma_address);
}
// Decrement the count
@@ -1040,7 +1040,7 @@ void hdc92x4_device::data_transfer(int& cont)
break;
case DATA_TRANSFER_WRITE:
- if (TRACE_TRANSFER) logerror("%s: Sector successfully written (count=%d)\n", tag(), m_register_w[SECTOR_COUNT]-1);
+ if (TRACE_TRANSFER) logerror("%s: Sector successfully written (count=%d)\n", tag().c_str(), m_register_w[SECTOR_COUNT]-1);
// Update the DMA registers for multi-sector operations
if (m_multi_sector)
@@ -1054,7 +1054,7 @@ void hdc92x4_device::data_transfer(int& cont)
m_register_w[DMA23_16] = m_register_r[DMA23_16] = (dma_address & 0xff0000) >> 16;
m_register_w[DMA15_8] = m_register_r[DMA15_8] = (dma_address & 0x00ff00) >> 8;
m_register_w[DMA7_0] = m_register_r[DMA7_0] = (dma_address & 0x0000ff);
- if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag(), dma_address);
+ if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag().c_str(), dma_address);
}
// Decrement the count
@@ -1072,7 +1072,7 @@ void hdc92x4_device::data_transfer(int& cont)
break;
default:
- logerror("%s: BUG: Unknown substate %02x in data_transfer, aborting command\n", tag(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in data_transfer, aborting command\n", tag().c_str(), m_substate);
cont = ERROR;
}
}
@@ -1105,7 +1105,7 @@ void hdc92x4_device::data_transfer(int& cont)
*/
void hdc92x4_device::reset_controller()
{
- logerror("%s: RESET command\n", tag());
+ logerror("%s: RESET command\n", tag().c_str());
device_reset();
}
@@ -1122,7 +1122,7 @@ void hdc92x4_device::reset_controller()
*/
void hdc92x4_device::drive_deselect()
{
- if (TRACE_SELECT) logerror("%s: DESELECT command\n", tag());
+ if (TRACE_SELECT) logerror("%s: DESELECT command\n", tag().c_str());
m_selected_drive_number = NODRIVE;
m_output1 = 0x00;
set_command_done(TC_SUCCESS);
@@ -1151,7 +1151,7 @@ void hdc92x4_device::restore_drive()
if (m_substate == UNDEF)
{
- if (TRACE_RESTORE) logerror("%s: RESTORE command %02x\n", tag(), current_command());
+ if (TRACE_RESTORE) logerror("%s: RESTORE command %02x\n", tag().c_str(), current_command());
m_seek_count = 0;
m_substate = RESTORE_CHECK;
}
@@ -1164,7 +1164,7 @@ void hdc92x4_device::restore_drive()
// Track 0 has not been reached yet
if (!drive_ready())
{
- if (TRACE_RESTORE) logerror("%s: restore command: Drive not ready\n", tag());
+ if (TRACE_RESTORE) logerror("%s: restore command: Drive not ready\n", tag().c_str());
// Does not look like a success, but this takes into account
// that if a drive is not connected we do not want an error message
cont = SUCCESS;
@@ -1179,7 +1179,7 @@ void hdc92x4_device::restore_drive()
// When we have buffered steps, the seek limit will be reached
// before TRK00 is asserted. In that case we have to wait for
// SEEK_COMPLETE. We also wait as soon as TRK00 is asserted.
- if (TRACE_RESTORE) logerror("%s: restore using buffered steps\n", tag());
+ if (TRACE_RESTORE) logerror("%s: restore using buffered steps\n", tag().c_str());
wait_line(SEEKCOMP_LINE, ASSERT_LINE, SEEK_COMPLETE, false);
cont = WAIT;
}
@@ -1194,7 +1194,7 @@ void hdc92x4_device::restore_drive()
break;
case STEP_ON:
- if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_ON\n", tag(), ttsn().c_str());
+ if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_ON\n", tag().c_str(), ttsn().c_str());
// Increase step count
m_seek_count++;
@@ -1209,7 +1209,7 @@ void hdc92x4_device::restore_drive()
break;
case STEP_OFF:
- if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_OFF\n", tag(), ttsn().c_str());
+ if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_OFF\n", tag().c_str(), ttsn().c_str());
set_bits(m_output2, OUT2_STEPPULSE, false);
wait_time(m_timer, step_time(), RESTORE_CHECK);
cont = WAIT;
@@ -1219,7 +1219,7 @@ void hdc92x4_device::restore_drive()
// If TRK00 is not set, the drive failed to reach it.
if (!on_track00())
{
- if (TRACE_FAIL) logerror("%s: restore command: failed to reach track 00\n", tag());
+ if (TRACE_FAIL) logerror("%s: restore command: failed to reach track 00\n", tag().c_str());
set_command_done(TC_VRFYERR);
cont = ERROR;
}
@@ -1250,7 +1250,7 @@ void hdc92x4_device::step_drive()
if (m_substate == UNDEF)
{
- if (TRACE_STEP) logerror("%s: STEP IN/OUT command %02x\n", tag(), current_command());
+ if (TRACE_STEP) logerror("%s: STEP IN/OUT command %02x\n", tag().c_str(), current_command());
m_substate = STEP_ON;
}
@@ -1259,7 +1259,7 @@ void hdc92x4_device::step_drive()
switch (m_substate)
{
case STEP_ON:
- if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag());
+ if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag().c_str());
// STEPDIR = 0 -> towards TRK00
set_bits(m_output2, OUT2_STEPDIR, (current_command() & 0x02)==0);
@@ -1271,7 +1271,7 @@ void hdc92x4_device::step_drive()
break;
case STEP_OFF:
- if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag());
+ if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag().c_str());
set_bits(m_output2, OUT2_STEPPULSE, false);
wait_time(m_timer, step_time(), ((current_command() & 0x01)!=0)? WAIT_SEEK_COMPLETE : DONE);
cont = WAIT;
@@ -1296,7 +1296,7 @@ void hdc92x4_device::step_drive()
*/
void hdc92x4_device::tape_backup()
{
- logerror("%s: TAPE BACKUP command %02x not implemented\n", tag(), current_command());
+ logerror("%s: TAPE BACKUP command %02x not implemented\n", tag().c_str(), current_command());
set_command_done(TC_SUCCESS);
}
@@ -1322,7 +1322,7 @@ void hdc92x4_device::poll_drives()
UINT8 drivebit;
if (m_substate == UNDEF)
{
- logerror("%s: POLL DRIVES command %02x\n", tag(), current_command());
+ logerror("%s: POLL DRIVES command %02x\n", tag().c_str(), current_command());
m_substate = POLL1;
m_selected_drive_number = 0;
// If there is no selection, do not enter the loop
@@ -1344,7 +1344,7 @@ void hdc92x4_device::poll_drives()
m_register_r[CHIP_STATUS] = (m_register_r[CHIP_STATUS] & 0xfc) | m_selected_drive_number;
m_output1 = (drivebit << 4) | (m_register_w[RETRY_COUNT]&0x0f);
- if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag(), m_output1);
+ if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag().c_str(), m_output1);
wait_time(m_timer, 1, POLL2); // Wait for 1 usec
cont = WAIT;
}
@@ -1419,7 +1419,7 @@ void hdc92x4_device::drive_select()
head_load_delay = head_load_delay_enable? m_register_w[DATA] * head_load_timer_increment[m_selected_drive_type] : 0;
if (fm_mode()) head_load_delay <<= 1;
- if (TRACE_SELECT) logerror("%s: DRIVE SELECT command (%02x): head load delay=%d, type=%d, drive=%d, pout=%02x, step_rate=%d\n", tag(), current_command(), head_load_delay, m_selected_drive_type, driveparm&3, m_register_w[RETRY_COUNT]&0x0f, pulse_width() + step_time());
+ if (TRACE_SELECT) logerror("%s: DRIVE SELECT command (%02x): head load delay=%d, type=%d, drive=%d, pout=%02x, step_rate=%d\n", tag().c_str(), current_command(), head_load_delay, m_selected_drive_type, driveparm&3, m_register_w[RETRY_COUNT]&0x0f, pulse_width() + step_time());
// Copy the DMA registers to registers CURRENT_HEAD, CURRENT_CYLINDER,
// and CURRENT_IDENT. This is required during formatting ([1], p. 14)
@@ -1433,7 +1433,7 @@ void hdc92x4_device::drive_select()
m_output1 = (m_selected_drive_number != NODRIVE)? (0x10 << m_selected_drive_number) : 0;
m_output1 |= (m_register_w[RETRY_COUNT]&0x0f);
- if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag(), m_output1);
+ if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag().c_str(), m_output1);
m_substate = (head_load_delay>0)? HEAD_DELAY : DONE;
}
@@ -1464,12 +1464,12 @@ void hdc92x4_device::drive_select()
void hdc92x4_device::set_register_pointer()
{
m_register_pointer = current_command() & 0xf;
- if (TRACE_SETPTR) logerror("%s: SET REGISTER POINTER command; start reg=%d\n", tag(), m_register_pointer);
+ if (TRACE_SETPTR) logerror("%s: SET REGISTER POINTER command; start reg=%d\n", tag().c_str(), m_register_pointer);
// The specification does not say anything about the effect of setting an
// invalid value (only "care should be taken")
if (m_register_pointer > 10)
{
- logerror("%s: set register pointer: Invalid register number: %d. Setting to 10.\n", tag(), m_register_pointer);
+ logerror("%s: set register pointer: Invalid register number: %d. Setting to 10.\n", tag().c_str(), m_register_pointer);
m_register_pointer = 10;
}
set_command_done(TC_SUCCESS);
@@ -1495,7 +1495,7 @@ void hdc92x4_device::seek_read_id()
if (m_substate == UNDEF)
{
// Command init
- if (TRACE_READ) logerror("%s: SEEK / READ ID command %02x, CHS=(%d,%d,%d)\n", tag(), current_command(), desired_cylinder(), desired_head(), desired_sector());
+ if (TRACE_READ) logerror("%s: SEEK / READ ID command %02x, CHS=(%d,%d,%d)\n", tag().c_str(), current_command(), desired_cylinder(), desired_head(), desired_sector());
m_substate = READ_ID;
}
@@ -1523,7 +1523,7 @@ void hdc92x4_device::seek_read_id()
cont = SUCCESS;
break;
default:
- logerror("%s: BUG: Unknown substate %02x in seek_read_id, aborting command\n", tag(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in seek_read_id, aborting command\n", tag().c_str(), m_substate);
set_command_done(TC_DATAERR);
cont = ERROR;
}
@@ -1560,7 +1560,7 @@ void hdc92x4_device::read_sectors()
if (m_substate == UNDEF)
{
// Command init
- if (TRACE_READ) logerror("%s: READ SECTORS %s command %02x, CHS=(%d,%d,%d)\n", tag(), m_logical? "LOGICAL": "PHYSICAL", current_command(), desired_cylinder(), desired_head(), desired_sector());
+ if (TRACE_READ) logerror("%s: READ SECTORS %s command %02x, CHS=(%d,%d,%d)\n", tag().c_str(), m_logical? "LOGICAL": "PHYSICAL", current_command(), desired_cylinder(), desired_head(), desired_sector());
m_retry_save = m_register_w[RETRY_COUNT];
m_multi_sector = (m_register_w[SECTOR_COUNT] != 1);
m_write = false;
@@ -1586,7 +1586,7 @@ void hdc92x4_device::read_sectors()
data_transfer(cont);
break;
default:
- logerror("%s: BUG: Unknown substate %02x in read_sectors, aborting command\n", tag(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in read_sectors, aborting command\n", tag().c_str(), m_substate);
set_command_done(TC_DATAERR);
cont = ERROR;
}
@@ -1612,7 +1612,7 @@ void hdc92x4_device::read_track()
{
if (m_substate == UNDEF)
{
- if (TRACE_READTRACK) logerror("%s: READ TRACK command %02x, head = %d\n", tag(), current_command(), desired_head());
+ if (TRACE_READTRACK) logerror("%s: READ TRACK command %02x, head = %d\n", tag().c_str(), current_command(), desired_head());
dma_address_out(m_register_w[DMA23_16], m_register_w[DMA15_8], m_register_w[DMA7_0]);
m_transfer_enabled = (current_command() & 1)!=0;
}
@@ -1623,7 +1623,7 @@ void hdc92x4_device::read_track()
switch (m_substate)
{
case WAITINDEX0:
- if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - waiting for index hole\n", tag());
+ if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - waiting for index hole\n", tag().c_str());
if (!index_hole())
{
m_substate = WAITINDEX1;
@@ -1632,7 +1632,7 @@ void hdc92x4_device::read_track()
else
{
// We're above the index hole; wait for the index line going down
- if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Index hole just passing by ... waiting for next\n", tag());
+ if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Index hole just passing by ... waiting for next\n", tag().c_str());
wait_line(INDEX_LINE, ASSERT_LINE, WAITINDEX1, false);
cont = WAIT;
}
@@ -1643,12 +1643,12 @@ void hdc92x4_device::read_track()
cont = WAIT;
break;
case TRACKSTART:
- if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - index hole arrived\n", tag());
+ if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - index hole arrived\n", tag().c_str());
live_start(READ_TRACK);
cont = WAIT;
break;
case TRACKDONE:
- if (TRACE_READTRACK && TRACE_SUBSTATES) logerror("%s: Track reading done\n", tag());
+ if (TRACE_READTRACK && TRACE_SUBSTATES) logerror("%s: Track reading done\n", tag().c_str());
cont = SUCCESS;
m_out_dmarq(CLEAR_LINE);
m_out_dip(CLEAR_LINE);
@@ -1720,7 +1720,7 @@ void hdc92x4_device::format_track()
{
if (m_substate == UNDEF)
{
- if (TRACE_FORMAT) logerror("%s: FORMAT TRACK command %02x, head = %d\n", tag(), current_command(), desired_head());
+ if (TRACE_FORMAT) logerror("%s: FORMAT TRACK command %02x, head = %d\n", tag().c_str(), current_command(), desired_head());
m_substate = WAITINDEX0;
m_deleted = (current_command() & 0x10)!=0;
m_reduced_write_current = (current_command() & 0x08)!=0;
@@ -1737,13 +1737,13 @@ void hdc92x4_device::format_track()
if (TRACE_FORMAT && TRACE_DETAIL)
{
- logerror("%s: GAP0 length = %d\n", tag(), m_gap0_size);
- logerror("%s: GAP1 length = %d\n", tag(), m_gap1_size);
- logerror("%s: GAP2 length = %d\n", tag(), m_gap2_size);
- logerror("%s: GAP3 length = %d\n", tag(), m_gap3_size);
- logerror("%s: Sync size = %d\n", tag(), m_sync_size);
- logerror("%s: Sector count = %d\n", tag(), m_sector_count);
- logerror("%s: Sector size = %d\n", tag(), m_sector_size);
+ logerror("%s: GAP0 length = %d\n", tag().c_str(), m_gap0_size);
+ logerror("%s: GAP1 length = %d\n", tag().c_str(), m_gap1_size);
+ logerror("%s: GAP2 length = %d\n", tag().c_str(), m_gap2_size);
+ logerror("%s: GAP3 length = %d\n", tag().c_str(), m_gap3_size);
+ logerror("%s: Sync size = %d\n", tag().c_str(), m_sync_size);
+ logerror("%s: Sector count = %d\n", tag().c_str(), m_sector_count);
+ logerror("%s: Sector size = %d\n", tag().c_str(), m_sector_size);
}
dma_address_out(m_register_r[CURRENT_IDENT], m_register_r[CURRENT_CYLINDER], m_register_r[CURRENT_HEAD]);
@@ -1755,7 +1755,7 @@ void hdc92x4_device::format_track()
switch (m_substate)
{
case WAITINDEX0:
- if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track; looking for track start\n", tag());
+ if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track; looking for track start\n", tag().c_str());
if (!index_hole())
{
m_substate = WAITINDEX1;
@@ -1764,24 +1764,24 @@ void hdc92x4_device::format_track()
else
{
// We're above the index hole right now, so wait for the line going down
- if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Index hole just passing by ... \n", tag());
+ if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Index hole just passing by ... \n", tag().c_str());
wait_line(INDEX_LINE, CLEAR_LINE, WAITINDEX1, false);
cont = WAIT;
}
break;
case WAITINDEX1:
// Waiting for the next rising edge
- if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Waiting for next index hole\n", tag());
+ if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Waiting for next index hole\n", tag().c_str());
wait_line(INDEX_LINE, ASSERT_LINE, TRACKSTART, false);
cont = WAIT;
break;
case TRACKSTART:
- if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track - index hole arrived\n", tag());
+ if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track - index hole arrived\n", tag().c_str());
live_start(FORMAT_TRACK);
cont = WAIT;
break;
case TRACKDONE:
- if (FORMAT_TRACK && TRACE_SUBSTATES) logerror("%s: Track writing done\n", tag());
+ if (FORMAT_TRACK && TRACE_SUBSTATES) logerror("%s: Track writing done\n", tag().c_str());
cont = SUCCESS;
break;
}
@@ -1817,7 +1817,7 @@ void hdc92x4_device::write_sectors()
if (m_substate == UNDEF)
{
- if (TRACE_WRITE) logerror("%s: WRITE SECTORS %s command %02x, CHS=(%d,%d,%d)\n", tag(), m_logical? "LOGICAL" : "PHYSICAL", current_command(), desired_cylinder(), desired_head(), desired_sector());
+ if (TRACE_WRITE) logerror("%s: WRITE SECTORS %s command %02x, CHS=(%d,%d,%d)\n", tag().c_str(), m_logical? "LOGICAL" : "PHYSICAL", current_command(), desired_cylinder(), desired_head(), desired_sector());
m_multi_sector = (m_register_w[SECTOR_COUNT] != 1);
m_substate = READ_ID;
@@ -1869,7 +1869,7 @@ void hdc92x4_device::write_sectors()
data_transfer(cont);
break;
default:
- logerror("%s: BUG: Unknown substate %02x in write_sectors, aborting command\n", tag(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in write_sectors, aborting command\n", tag().c_str(), m_substate);
set_command_done(TC_DATAERR);
cont = ERROR;
}
@@ -1948,7 +1948,7 @@ bool hdc92x4_device::found_mark(int state)
*/
void hdc92x4_device::live_start(int state)
{
- if (TRACE_LIVE) logerror("%s: [%s] Live start substate=%02x\n", tag(), ttsn().c_str(), state);
+ if (TRACE_LIVE) logerror("%s: [%s] Live start substate=%02x\n", tag().c_str(), ttsn().c_str(), state);
m_live_state.time = machine().time();
m_live_state.state = state;
m_live_state.next_state = -1;
@@ -1969,7 +1969,7 @@ void hdc92x4_device::live_start(int state)
live_run();
m_last_live_state = UNDEF;
- if (TRACE_LIVE) logerror("%s: [%s] Live start end\n", tag(), ttsn().c_str()); // delete
+ if (TRACE_LIVE) logerror("%s: [%s] Live start end\n", tag().c_str(), ttsn().c_str()); // delete
}
void hdc92x4_device::live_run()
@@ -1996,9 +1996,9 @@ void hdc92x4_device::live_run_until(attotime limit)
if (TRACE_LIVE)
{
if (limit == attotime::never)
- logerror("%s: [%s live] live_run, live_state=%02x, mode=%s\n", tag(), tts(m_live_state.time).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
+ logerror("%s: [%s live] live_run, live_state=%02x, mode=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
else
- logerror("%s: [%s live] live_run until %s, live_state=%02x, mode=%s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
+ logerror("%s: [%s live] live_run until %s, live_state=%02x, mode=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
}
if (limit == attotime::never)
@@ -2030,7 +2030,7 @@ void hdc92x4_device::live_run_until(attotime limit)
if (TRACE_LIVE && m_last_live_state != SEARCH_IDAM)
{
- logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag(),tts(m_live_state.time).c_str(), tts(limit).c_str());
+ logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag().c_str(),tts(m_live_state.time).c_str(), tts(limit).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2039,11 +2039,11 @@ void hdc92x4_device::live_run_until(attotime limit)
if (read_one_bit(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag().c_str(), tts(m_live_state.time).c_str());
return;
}
// logerror("%s: SEARCH_IDAM\n", tts(m_live_state.time).c_str());
- if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
+ if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
get_data_from_encoding(m_live_state.shift_reg), m_live_state.bit_counter);
// [1] p. 9: The ID field sync mark must be found within 33,792 byte times
@@ -2062,7 +2062,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// MFM case
if (m_live_state.shift_reg == 0x4489)
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
m_live_state.crc = 0x443b;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2075,7 +2075,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// FM case
if (m_live_state.shift_reg == 0xf57e)
{
- if (TRACE_LIVE) logerror("%s: SEARCH_IDAM: IDAM found\n", tag());
+ if (TRACE_LIVE) logerror("%s: SEARCH_IDAM: IDAM found\n", tag().c_str());
m_live_state.crc = 0xef21;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2098,14 +2098,14 @@ void hdc92x4_device::live_run_until(attotime limit)
if (TRACE_LIVE && m_last_live_state != READ_TWO_MORE_A1_IDAM)
{
- logerror("%s: [%s live] READ_TWO_MORE_A1\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_TWO_MORE_A1\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
// Beyond time limit?
if (read_one_bit(limit)) return;
- if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
+ if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
get_data_from_encoding(m_live_state.shift_reg), m_live_state.bit_counter);
if (m_live_state.bit_count_total > 33792*16)
@@ -2127,12 +2127,12 @@ void hdc92x4_device::live_run_until(attotime limit)
m_live_state.state = SEARCH_IDAM;
}
else
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
// Continue
break;
}
- if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag(),tts(m_live_state.time).c_str(), m_live_state.data_reg);
+ if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag().c_str(),tts(m_live_state.time).c_str(), m_live_state.data_reg);
// Check for ident field (fe, ff, fd, fc)
if ((m_live_state.data_reg & 0xfc) != 0xfc)
@@ -2141,9 +2141,9 @@ void hdc92x4_device::live_run_until(attotime limit)
if (TRACE_LIVE)
{
if (m_live_state.data_reg == 0xf8 || m_live_state.data_reg == 0xfb)
- logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag().c_str(), tts(m_live_state.time).c_str());
else
- logerror("%s: [%s live] Missing ident data after A1A1A1, and it was not DAM; format corrupt?\n", tag(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] Missing ident data after A1A1A1, and it was not DAM; format corrupt?\n", tag().c_str(), tts(m_live_state.time).c_str());
}
m_live_state.state = SEARCH_IDAM;
break;
@@ -2159,7 +2159,7 @@ void hdc92x4_device::live_run_until(attotime limit)
case READ_ID_FIELDS_INTO_REGS:
if (TRACE_LIVE && m_last_live_state != READ_ID_FIELDS_INTO_REGS)
{
- logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2172,7 +2172,7 @@ void hdc92x4_device::live_run_until(attotime limit)
slot = (m_live_state.bit_counter >> 4)-1;
- if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag(), slot, m_live_state.data_reg, m_live_state.crc);
+ if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag().c_str(), slot, m_live_state.data_reg, m_live_state.crc);
// The id_field is an array of indexes into the chip registers.
// Thus we get the values properly assigned to the registers.
@@ -2198,7 +2198,7 @@ void hdc92x4_device::live_run_until(attotime limit)
case SEARCH_DAM:
if (TRACE_LIVE && m_last_live_state != SEARCH_DAM)
{
- logerror("%s: [%s live] SEARCH_DAM\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] SEARCH_DAM\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2207,21 +2207,21 @@ void hdc92x4_device::live_run_until(attotime limit)
if(read_one_bit(limit))
return;
- if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
+ if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
get_data_from_encoding(m_live_state.shift_reg), m_live_state.bit_counter);
if (!fm_mode())
{ // MFM
if(m_live_state.bit_counter > 43*16)
{
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
if (m_live_state.bit_counter >= 28*16 && m_live_state.shift_reg == 0x4489)
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
m_live_state.crc = 0x443b;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2232,14 +2232,14 @@ void hdc92x4_device::live_run_until(attotime limit)
{ // FM
if (m_live_state.bit_counter > 23*16)
{
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
if (m_live_state.bit_counter >= 11*16 && (m_live_state.shift_reg == 0xf56a || m_live_state.shift_reg == 0xf56b ||
m_live_state.shift_reg == 0xf56e || m_live_state.shift_reg == 0xf56f)) {
- if (TRACE_LIVE) logerror("%s: SEARCH_DAM: found DAM = %04x\n", tag(), m_live_state.shift_reg);
+ if (TRACE_LIVE) logerror("%s: SEARCH_DAM: found DAM = %04x\n", tag().c_str(), m_live_state.shift_reg);
m_live_state.crc =
m_live_state.shift_reg == 0xf56a ? 0x8fe7 :
m_live_state.shift_reg == 0xf56b ? 0x9fc6 :
@@ -2255,14 +2255,14 @@ void hdc92x4_device::live_run_until(attotime limit)
case READ_TWO_MORE_A1_DAM: {
if (TRACE_LIVE && m_last_live_state != READ_TWO_MORE_A1_DAM)
{
- logerror("%s: [%s live] READ_TWO_MORE_A1_DAM\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_TWO_MORE_A1_DAM\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
if(read_one_bit(limit))
return;
- if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
+ if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
get_data_from_encoding(m_live_state.shift_reg), m_live_state.bit_counter);
// Repeat until we have collected 16 bits
@@ -2279,23 +2279,23 @@ void hdc92x4_device::live_run_until(attotime limit)
return;
}
else
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
// Continue
break;
}
- if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag(),tts(m_live_state.time).c_str(), m_live_state.data_reg);
+ if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag().c_str(),tts(m_live_state.time).c_str(), m_live_state.data_reg);
if ((m_live_state.data_reg & 0xff) == 0xf8)
{
- if (TRACE_LIVE) logerror("%s: Found deleted data mark F8 after DAM sync\n", tag());
+ if (TRACE_LIVE) logerror("%s: Found deleted data mark F8 after DAM sync\n", tag().c_str());
set_bits(m_register_r[CHIP_STATUS], CS_DELDATA, true);
}
else
{
if ((m_live_state.data_reg & 0xff) != 0xfb)
{
- if (TRACE_FAIL) logerror("%s: Missing FB/F8 data mark after DAM sync\n", tag());
+ if (TRACE_FAIL) logerror("%s: Missing FB/F8 data mark after DAM sync\n", tag().c_str());
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
@@ -2306,7 +2306,7 @@ void hdc92x4_device::live_run_until(attotime limit)
break;
}
case SEARCH_DAM_FAILED:
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
m_live_state.state = IDLE;
return;
@@ -2314,7 +2314,7 @@ void hdc92x4_device::live_run_until(attotime limit)
{
if (TRACE_LIVE && m_last_live_state != READ_SECTOR_DATA)
{
- logerror("%s: [%s live] READ_SECTOR_DATA\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_SECTOR_DATA\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2339,7 +2339,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// Repeat until we have collected 16 bits
if (m_live_state.bit_counter & 15) break;
- if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X, CRC=%04x\n", tag(),tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.crc);
+ if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X, CRC=%04x\n", tag().c_str(),tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.crc);
int slot = (m_live_state.bit_counter >> 4)-1;
if (slot < calc_sector_size())
@@ -2360,7 +2360,7 @@ void hdc92x4_device::live_run_until(attotime limit)
}
else
{
- if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag().c_str(),tts(m_live_state.time).c_str());
wait_for_realtime(IDLE);
}
return;
@@ -2372,14 +2372,14 @@ void hdc92x4_device::live_run_until(attotime limit)
case READ_SECTOR_DATA_CONT:
if (TRACE_LIVE && m_last_live_state != READ_SECTOR_DATA_CONT)
{
- logerror("%s: [%s live] READ_SECTOR_DATA_CONT\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_SECTOR_DATA_CONT\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
// Did the system CPU send the DMA ACK in the meantime?
if ((m_register_r[INT_STATUS] & ST_OVRUN)!=0)
{
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag().c_str());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_live_state.state = IDLE;
return;
@@ -2418,13 +2418,13 @@ void hdc92x4_device::live_run_until(attotime limit)
// 5. Write the CRC bytes
if (TRACE_LIVE)
- logerror("%s: [%s live] WRITE_DAM_AND_SECTOR\n", tag(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] WRITE_DAM_AND_SECTOR\n", tag().c_str(), tts(m_live_state.time).c_str());
skip_on_track(m_gap2_size, WRITE_DAM_SYNC);
break;
case WRITE_DAM_SYNC:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag().c_str());
// Clear the overrun/underrun flag
set_bits(m_register_r[INT_STATUS], ST_OVRUN, false);
@@ -2432,12 +2432,12 @@ void hdc92x4_device::live_run_until(attotime limit)
break;
case WRITE_A1:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write three A1\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write three A1\n", tag().c_str());
write_on_track(0x4489, 3, WRITE_DATAMARK);
break;
case WRITE_DATAMARK:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark and sector contents\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark and sector contents\n", tag().c_str());
if (fm_mode())
{
// Init the CRC for the DAM and sector
@@ -2515,7 +2515,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// byte in two iterations to get both
if (m_live_state.byte_counter > 0)
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag().c_str());
m_live_state.byte_counter--;
write_on_track(encode((m_live_state.crc >> 8) & 0xff), 1, WRITE_DATA_CRC);
}
@@ -2529,7 +2529,7 @@ void hdc92x4_device::live_run_until(attotime limit)
case WRITE_DONE:
if (m_substate == DATA_TRANSFER_WRITE)
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag().c_str());
m_pll.stop_writing(m_floppy, m_live_state.time);
m_live_state.state = IDLE;
return;
@@ -2560,19 +2560,19 @@ void hdc92x4_device::live_run_until(attotime limit)
// ==================================================
case FORMAT_TRACK:
- if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag());
+ if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag().c_str());
m_live_state.state = WRITE_GAP0;
m_pll.start_writing(m_live_state.time);
break;
case WRITE_GAP0:
// GAP0 length is in DMA7_0 (negated, 2s comp)
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP0\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP0\n", tag().c_str());
write_on_track(encode(fm_mode()? 0xff : 0x4e), m_gap0_size, WRITE_IXAM_SYNC);
break;
case WRITE_IXAM_SYNC:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM sync\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM sync\n", tag().c_str());
write_on_track(encode(0x00), m_sync_size, WRITE_IXAM);
break;
@@ -2580,7 +2580,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// FM: FC with clock D7 = 1111 -111 -111 1010
// MFM: C2 = 11000010
// 0101 0010 -010 0100
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM\n", tag().c_str());
if (fm_mode())
write_on_track(0xf77a, 1, WRITE_GAP1);
else
@@ -2595,7 +2595,7 @@ void hdc92x4_device::live_run_until(attotime limit)
case WRITE_GAP1:
// GAP1 length is in DMA15_8
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP1\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP1\n", tag().c_str());
write_on_track(encode(fm_mode()? 0xff : 0x4e), m_gap1_size, WRITE_IDAM_SYNC);
break;
@@ -2604,7 +2604,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// We assume it reads the bytes and writes them directly on the disk
case WRITE_IDAM_SYNC:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM sync\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM sync\n", tag().c_str());
write_on_track(encode(0x00), m_sync_size, WRITE_IDAM);
break;
@@ -2613,7 +2613,7 @@ void hdc92x4_device::live_run_until(attotime limit)
set_bits(m_register_r[INT_STATUS], ST_OVRUN, true);
m_out_dmarq(ASSERT_LINE);
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM and header\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM and header\n", tag().c_str());
if (fm_mode())
{
write_on_track(0xf57e, 1, WRITE_HEADER);
@@ -2657,7 +2657,7 @@ void hdc92x4_device::live_run_until(attotime limit)
if (m_live_state.byte_counter > 0)
{
UINT8 crct = (m_live_state.crc >> 8) & 0xff;
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC byte %02x\n", tag(), crct);
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC byte %02x\n", tag().c_str(), crct);
m_live_state.byte_counter--;
write_on_track(encode(crct), 1, WRITE_HEADER_CRC);
}
@@ -2667,13 +2667,13 @@ void hdc92x4_device::live_run_until(attotime limit)
break;
case WRITE_GAP2:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP2\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP2\n", tag().c_str());
write_on_track(encode(fm_mode()? 0xff : 0x4e), m_gap2_size, WRITE_DAM_SYNC);
break;
case WRITE_GAP3:
m_sector_count--;
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP3\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP3\n", tag().c_str());
write_on_track(encode(fm_mode()? 0xff : 0x4e), m_gap3_size, (m_sector_count>0)? WRITE_IDAM_SYNC : WRITE_GAP4);
break;
@@ -2682,7 +2682,7 @@ void hdc92x4_device::live_run_until(attotime limit)
wait_line(INDEX_LINE, ASSERT_LINE, TRACKDONE, true);
if (TRACE_WRITE && TRACE_DETAIL && m_last_live_state != WRITE_GAP4)
{
- logerror("%s: Writing GAP4\n", tag());
+ logerror("%s: Writing GAP4\n", tag().c_str());
m_last_live_state = WRITE_GAP4;
}
// Write a single byte; when the index hole shows up, the live run will be aborted
@@ -2697,7 +2697,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// Quite simple. Read the next ID fields, then the sector contents.
// Continue until the next index hole shows up (live_abort).
case READ_TRACK:
- if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag());
+ if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag().c_str());
m_live_state.state = READ_TRACK_ID;
break;
@@ -2711,12 +2711,12 @@ void hdc92x4_device::live_run_until(attotime limit)
case READ_TRACK_ID_DONE:
if ((m_register_r[INT_STATUS] & ST_OVRUN)!=0)
{
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag().c_str());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_live_state.state = IDLE;
return;
}
- if (TRACE_LIVE) logerror("%s: READ_TRACK1\n", tag());
+ if (TRACE_LIVE) logerror("%s: READ_TRACK1\n", tag().c_str());
m_out_dip(ASSERT_LINE);
@@ -2737,14 +2737,14 @@ void hdc92x4_device::live_run_until(attotime limit)
// The pause is implemented by doing dummy reads on the floppy
if (read_one_bit(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str());
return;
}
// Repeat until we have collected 16 bits
if ((m_live_state.bit_counter & 15)==0)
{
- if (TRACE_READ && TRACE_DETAIL) logerror("%s: [%s live] Read byte %02x, repeat = %d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.repeat);
+ if (TRACE_READ && TRACE_DETAIL) logerror("%s: [%s live] Read byte %02x, repeat = %d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.repeat);
wait_for_realtime(READ_TRACK_NEXT_BYTE);
return;
}
@@ -2790,14 +2790,14 @@ void hdc92x4_device::live_run_until(attotime limit)
break;
case NO_DMA_ACK:
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer underrun\n", tag());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer underrun\n", tag().c_str());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_pll.stop_writing(m_floppy, m_live_state.time);
m_live_state.state = IDLE;
return;
default:
- logerror("%s: Unknown live state: %02x\n", tag(), m_live_state.state);
+ logerror("%s: Unknown live state: %02x\n", tag().c_str(), m_live_state.state);
m_last_live_state = m_live_state.state;
return;
}
@@ -2820,7 +2820,7 @@ void hdc92x4_device::live_run_until(attotime limit)
void hdc92x4_device::live_run_hd_until(attotime limit)
{
int slot = 0;
- if (TRACE_LIVE) logerror("%s: live_run_hd\n", tag());
+ if (TRACE_LIVE) logerror("%s: live_run_hd\n", tag().c_str());
if (m_live_state.state == IDLE || m_live_state.next_state != -1)
return;
@@ -2828,16 +2828,16 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (TRACE_LIVE)
{
if (limit == attotime::never)
- logerror("%s: [%s live] live_run_hd, live_state=%02x, mode=%s\n", tag(), tts(m_live_state.time).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
+ logerror("%s: [%s live] live_run_hd, live_state=%02x, mode=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
else
- logerror("%s: [%s live] live_run_hd until %s, live_state=%02x, mode=%s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
+ logerror("%s: [%s live] live_run_hd until %s, live_state=%02x, mode=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
}
// We did not specify an upper time bound, so we take the next index pulse
if (limit == attotime::never && m_harddisk != nullptr)
{
limit = m_harddisk->track_end_time();
- if (TRACE_LIVE) logerror("%s: [%s live] live_run_hd new limit %s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] live_run_hd new limit %s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str());
}
while (true)
@@ -2847,7 +2847,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case SEARCH_IDAM:
if (TRACE_LIVE && m_last_live_state != SEARCH_IDAM)
{
- logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag(),tts(m_live_state.time).c_str(), tts(limit).c_str());
+ logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag().c_str(),tts(m_live_state.time).c_str(), tts(limit).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2856,12 +2856,12 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (read_from_mfmhd(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag().c_str(), tts(m_live_state.time).c_str());
return;
}
if (TRACE_LIVE)
- if ((m_live_state.bit_counter & 0x000f)==0) logerror("%s: [%s live] Read %04x\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
+ if ((m_live_state.bit_counter & 0x000f)==0) logerror("%s: [%s live] Read %04x\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
// [1] p. 9: The ID field sync mark must be found within 33,792 byte times
if (m_live_state.bit_count_total > 33792*16)
@@ -2876,7 +2876,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (found_mark(SEARCH_IDAM))
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(), tts(m_live_state.time).c_str());
m_live_state.crc = 0x443b;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2907,9 +2907,9 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (TRACE_LIVE)
{
if (m_live_state.data_reg == 0xf8 || m_live_state.data_reg == 0xfb)
- logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag().c_str(), tts(m_live_state.time).c_str());
else
- logerror("%s: [%s live] Missing ident data after A1, and it was not DAM; format corrupt?\n", tag(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] Missing ident data after A1, and it was not DAM; format corrupt?\n", tag().c_str(), tts(m_live_state.time).c_str());
}
m_live_state.state = SEARCH_IDAM;
}
@@ -2924,7 +2924,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case READ_ID_FIELDS_INTO_REGS:
if (TRACE_LIVE && m_last_live_state != READ_ID_FIELDS_INTO_REGS)
{
- logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2933,7 +2933,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Repeat until we have collected 16 bits
if (m_live_state.bit_counter & 15) break;
- if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag(), slot, m_live_state.data_reg, m_live_state.crc);
+ if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag().c_str(), slot, m_live_state.data_reg, m_live_state.crc);
m_register_r[id_field[slot++]] = m_live_state.data_reg;
if(slot > 5)
@@ -2952,7 +2952,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case SEARCH_DAM:
if (TRACE_LIVE && m_last_live_state != SEARCH_DAM)
{
- logerror("%s: [%s live] SEARCH_DAM\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] SEARCH_DAM\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
set_bits(m_register_r[CHIP_STATUS], CS_DELDATA, false);
@@ -2960,18 +2960,18 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (read_from_mfmhd(limit)) return;
if (TRACE_LIVE)
- if ((m_live_state.bit_counter & 15)==0) logerror("%s: [%s live] Read %04x\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
+ if ((m_live_state.bit_counter & 15)==0) logerror("%s: [%s live] Read %04x\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
if (m_live_state.bit_counter > 30*16)
{
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
if (found_mark(SEARCH_DAM))
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
m_live_state.crc = 0x443b;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2986,14 +2986,14 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if ((m_live_state.data_reg & 0xff) == 0xf8)
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found deleted data mark F8 after DAM sync\n", tag(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found deleted data mark F8 after DAM sync\n", tag().c_str(), tts(m_live_state.time).c_str());
set_bits(m_register_r[CHIP_STATUS], CS_DELDATA, true);
}
else
{
if ((m_live_state.data_reg & 0xff) != 0xfb)
{
- if (TRACE_FAIL) logerror("%s: [%s live] Missing FB/F8 data mark after DAM sync; found %04x\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
+ if (TRACE_FAIL) logerror("%s: [%s live] Missing FB/F8 data mark after DAM sync; found %04x\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
@@ -3003,14 +3003,14 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
break;
case SEARCH_DAM_FAILED:
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
m_live_state.state = IDLE;
return;
case READ_SECTOR_DATA:
if (TRACE_LIVE && m_last_live_state != READ_SECTOR_DATA)
{
- logerror("%s: [%s live] READ_SECTOR_DATA\n", tag(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_SECTOR_DATA\n", tag().c_str(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -3030,7 +3030,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (m_live_state.bit_counter & 15) break;
slot = (m_live_state.bit_counter >> 4)-1;
- if (TRACE_LIVE) logerror("%s: [%s live] Found data value [%d/%d] = %02X, CRC=%04x\n", tag(),tts(m_live_state.time).c_str(), slot, calc_sector_size(), m_live_state.data_reg, m_live_state.crc);
+ if (TRACE_LIVE) logerror("%s: [%s live] Found data value [%d/%d] = %02X, CRC=%04x\n", tag().c_str(),tts(m_live_state.time).c_str(), slot, calc_sector_size(), m_live_state.data_reg, m_live_state.crc);
if (slot < calc_sector_size())
{
@@ -3058,7 +3058,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
}
else
{
- if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag().c_str(),tts(m_live_state.time).c_str());
wait_for_realtime(IDLE);
}
return;
@@ -3071,7 +3071,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Did the system CPU send the DMA ACK in the meantime?
if ((m_register_r[INT_STATUS] & ST_OVRUN)!=0)
{
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag().c_str());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_live_state.state = IDLE;
return;
@@ -3085,7 +3085,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
m_out_dip(ASSERT_LINE);
m_out_dma(0, m_register_r[DATA], 0xff);
- if (TRACE_LIVE) logerror("%s: [%s live] Byte %02x sent via DMA\n", tag(),tts(m_live_state.time).c_str(), m_register_r[DATA] & 0xff);
+ if (TRACE_LIVE) logerror("%s: [%s live] Byte %02x sent via DMA\n", tag().c_str(),tts(m_live_state.time).c_str(), m_register_r[DATA] & 0xff);
}
m_live_state.state = READ_SECTOR_DATA;
break;
@@ -3096,14 +3096,14 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// The pause is implemented by doing dummy reads on the hard disk
if (read_from_mfmhd(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str());
return;
}
// Repeat until we have collected 16 bits
if ((m_live_state.bit_counter & 15)==0)
{
- if (TRACE_READ && TRACE_DETAIL) logerror("%s: [%s live] Read byte %02x, repeat = %d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.repeat);
+ if (TRACE_READ && TRACE_DETAIL) logerror("%s: [%s live] Read byte %02x, repeat = %d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.repeat);
wait_for_realtime(READ_TRACK_NEXT_BYTE);
return;
}
@@ -3123,7 +3123,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case WRITE_TRACK_BYTE:
if (write_to_mfmhd(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] write limit reached\n", tag(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] write limit reached\n", tag().c_str(), tts(m_live_state.time).c_str());
return;
}
@@ -3154,13 +3154,13 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// ======= HD sector write =====================================
case WRITE_DAM_AND_SECTOR:
- if (TRACE_LIVE) logerror("%s: [%s live] Skipping GAP2\n", tag(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Skipping GAP2\n", tag().c_str(), tts(m_live_state.time).c_str());
skip_on_track(m_gap2_size, WRITE_DAM_SYNC);
break;
case WRITE_DAM_SYNC:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag().c_str());
// Clear the overrun/underrun flag
set_bits(m_register_r[INT_STATUS], ST_OVRUN, false);
@@ -3168,12 +3168,12 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
break;
case WRITE_A1:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write one A1\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write one A1\n", tag().c_str());
write_on_track(encode_a1_hd(), 1, WRITE_DATAMARK);
break;
case WRITE_DATAMARK:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark\n", tag().c_str());
// Init the CRC for the ident byte and sector
m_live_state.crc = 0x443b; // value for 1*A1
@@ -3202,7 +3202,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
}
else
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector byte, %d to go\n", tag(), m_live_state.byte_counter);
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector byte, %d to go\n", tag().c_str(), m_live_state.byte_counter);
// For floppies, set this for each byte; for hard disk, set it only at the beginning
if (m_live_state.byte_counter == calc_sector_size())
@@ -3241,7 +3241,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case WRITE_DATA_CRC:
if (m_live_state.byte_counter > 0)
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag().c_str());
m_live_state.byte_counter--;
write_on_track(encode_hd((m_live_state.crc >> 8) & 0xff), 1, WRITE_DATA_CRC);
}
@@ -3254,7 +3254,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case WRITE_DONE:
if (m_substate == DATA_TRANSFER_WRITE)
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag().c_str());
m_live_state.state = IDLE;
return;
}
@@ -3272,7 +3272,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Read the next ID fields, then the sector contents.
// Continue until the next index hole shows up (live_abort).
case READ_TRACK:
- if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag());
+ if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag().c_str());
m_live_state.state = READ_TRACK_ID;
break;
@@ -3287,12 +3287,12 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if ((m_register_r[INT_STATUS] & ST_OVRUN)!=0)
{
// We need an ACK right now, or the header bytes will be lost
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag().c_str());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_live_state.state = IDLE;
return;
}
- if (TRACE_LIVE) logerror("%s: READ_TRACK_ID_DONE\n", tag());
+ if (TRACE_LIVE) logerror("%s: READ_TRACK_ID_DONE\n", tag().c_str());
m_out_dip(ASSERT_LINE);
// Write the header via DMA
@@ -3319,18 +3319,18 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Write GAP4 until the next pulse
// ==================================================
case FORMAT_TRACK:
- if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag());
+ if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag().c_str());
m_live_state.state = WRITE_GAP1;
break;
case WRITE_GAP1:
// GAP1 length is in DMA15_8
- if (TRACE_GAPS) logerror("%s: Writing GAP1; size=%d\n", tag(), m_gap1_size);
+ if (TRACE_GAPS) logerror("%s: Writing GAP1; size=%d\n", tag().c_str(), m_gap1_size);
write_on_track(encode_hd(0x4e), m_gap1_size, WRITE_IDAM_SYNC);
break;
case WRITE_IDAM_SYNC:
- if (TRACE_GAPS) logerror("%s: Writing IDAM sync, size=%d\n", tag(), m_sync_size);
+ if (TRACE_GAPS) logerror("%s: Writing IDAM sync, size=%d\n", tag().c_str(), m_sync_size);
write_on_track(encode_hd(0x00), m_sync_size, WRITE_IDAM);
break;
@@ -3338,7 +3338,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Set the over/underrun flag and hope that it will be cleared before we enter the next state (after writing)
set_bits(m_register_r[INT_STATUS], ST_OVRUN, true);
m_out_dmarq(ASSERT_LINE);
- if (TRACE_HEADER) logerror("%s: Writing IDAM and header: ", tag());
+ if (TRACE_HEADER) logerror("%s: Writing IDAM and header: ", tag().c_str());
write_on_track(encode_a1_hd(), 1, WRITE_HEADER);
m_live_state.byte_counter = 5; // TODO: Check this for AT mode
m_live_state.crc = 0xffff;
@@ -3382,13 +3382,13 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
break;
case WRITE_GAP2:
- if (TRACE_GAPS) logerror("%s: Writing GAP2, size=%d\n", tag(), m_gap2_size);
+ if (TRACE_GAPS) logerror("%s: Writing GAP2, size=%d\n", tag().c_str(), m_gap2_size);
write_on_track(encode_hd(0x4e), m_gap2_size, WRITE_DAM_SYNC);
break;
case WRITE_GAP3:
m_sector_count--;
- if (TRACE_GAPS) logerror("%s: Writing GAP3, size=%d\n", tag(), m_gap3_size);
+ if (TRACE_GAPS) logerror("%s: Writing GAP3, size=%d\n", tag().c_str(), m_gap3_size);
write_on_track(encode_hd(0x4e), m_gap3_size, (m_sector_count>0)? WRITE_IDAM_SYNC : WRITE_GAP4);
break;
@@ -3397,7 +3397,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
wait_line(INDEX_LINE, ASSERT_LINE, TRACKDONE, true);
if (TRACE_GAPS && m_last_live_state != WRITE_GAP4)
{
- logerror("%s: Writing GAP4\n", tag());
+ logerror("%s: Writing GAP4\n", tag().c_str());
m_last_live_state = WRITE_GAP4;
}
// Write a single byte; when the index hole shows up, the live run will be aborted
@@ -3406,7 +3406,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// --------------------------------------------------------
default:
- if (TRACE_LIVE) logerror("%s: Unknown state: %02x\n", tag(), m_live_state.state);
+ if (TRACE_LIVE) logerror("%s: Unknown state: %02x\n", tag().c_str(), m_live_state.state);
break;
}
}
@@ -3427,7 +3427,7 @@ void hdc92x4_device::live_sync()
if(m_live_state.time > machine().time())
{
// If so, we must roll back to the last checkpoint
- if (TRACE_SYNC) logerror("%s: [%s] Rolling back and replaying [%s live]\n", tag(), ttsn().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_SYNC) logerror("%s: [%s] Rolling back and replaying [%s live]\n", tag().c_str(), ttsn().c_str(), tts(m_live_state.time).c_str());
rollback();
// and replay until we reach the machine time
@@ -3447,7 +3447,7 @@ void hdc92x4_device::live_sync()
{
// We are behind machine time, so we will never get back to that
// time, thus we can commit that position
- if (TRACE_SYNC) logerror("%s: [%s] Committing [%s live]\n", tag(), ttsn().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_SYNC) logerror("%s: [%s] Committing [%s live]\n", tag().c_str(), ttsn().c_str(), tts(m_live_state.time).c_str());
// Commit bits from pll buffer to disk until live time (if there is something to write)
if (using_floppy())
@@ -3474,7 +3474,7 @@ void hdc92x4_device::live_abort()
{
if (!m_live_state.time.is_never() && m_live_state.time > machine().time())
{
- if (TRACE_LIVE) logerror("%s: [%s] Abort; rolling back and replaying [%s live]\n", tag(), ttsn().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s] Abort; rolling back and replaying [%s live]\n", tag().c_str(), ttsn().c_str(), tts(m_live_state.time).c_str());
rollback();
live_run_until(machine().time());
}
@@ -3541,7 +3541,7 @@ void hdc92x4_device::wait_for_realtime(int state)
{
m_live_state.next_state = state;
m_timer->adjust(m_live_state.time - machine().time());
- if (TRACE_LIVE) logerror("%s: [%s live] Waiting for real time [%s] to catch up; next state = %02x\n", tag(), tts(m_live_state.time).c_str(), ttsn().c_str(), state);
+ if (TRACE_LIVE) logerror("%s: [%s live] Waiting for real time [%s] to catch up; next state = %02x\n", tag().c_str(), tts(m_live_state.time).c_str(), ttsn().c_str(), state);
}
/*
@@ -3666,7 +3666,7 @@ void hdc92x4_device::encode_raw(UINT16 raw)
m_live_state.bit_counter = 16;
m_live_state.shift_reg = m_live_state.shift_reg_save = raw;
m_live_state.last_data_bit = raw & 1;
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: [%s live] Write %02x (%04x)\n", tag(), tts(m_live_state.time).c_str(), get_data_from_encoding(raw), raw);
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: [%s live] Write %02x (%04x)\n", tag().c_str(), tts(m_live_state.time).c_str(), get_data_from_encoding(raw), raw);
checkpoint();
}
@@ -3923,7 +3923,7 @@ READ8_MEMBER( hdc92x4_device::read )
{
// Data register
reply = m_register_r[m_register_pointer];
- if (TRACE_READREG) logerror("%s: Read register[%d] -> %02x\n", tag(), m_register_pointer, reply);
+ if (TRACE_READREG) logerror("%s: Read register[%d] -> %02x\n", tag().c_str(), m_register_pointer, reply);
// Autoincrement until DATA is reached.
if (m_register_pointer < DATA) m_register_pointer++;
@@ -3935,7 +3935,7 @@ READ8_MEMBER( hdc92x4_device::read )
// "The interrupt pin is reset to its inactive state
// when the UDC interrupt status register is read." [1] (p.3)
- if (TRACE_READREG) logerror("%s: Read interrupt status register -> %02x\n", tag(), reply);
+ if (TRACE_READREG) logerror("%s: Read interrupt status register -> %02x\n", tag().c_str(), reply);
set_interrupt(CLEAR_LINE);
// Clear the bits due to interrupt status register read.
@@ -3955,8 +3955,8 @@ WRITE8_MEMBER( hdc92x4_device::write )
{
if ((offset & 1) == 0)
{
- if (TRACE_COMMAND) logerror("%s: New register write access %02x\n", tag(), data & 0xff);
- if (m_executing) logerror("%s: Error - previous command %02x not completed; register access ignored\n", tag(), current_command());
+ if (TRACE_COMMAND) logerror("%s: New register write access %02x\n", tag().c_str(), data & 0xff);
+ if (m_executing) logerror("%s: Error - previous command %02x not completed; register access ignored\n", tag().c_str(), current_command());
else
{
m_regvalue = data & 0xff;
@@ -3965,8 +3965,8 @@ WRITE8_MEMBER( hdc92x4_device::write )
}
else
{
- if (TRACE_COMMAND) logerror("%s: New incoming command %02x\n", tag(), data);
- if (m_executing) logerror("%s: Error - previous command %02x not completed; new command %02x ignored\n", tag(), current_command(), data);
+ if (TRACE_COMMAND) logerror("%s: New incoming command %02x\n", tag().c_str(), data);
+ if (m_executing) logerror("%s: Error - previous command %02x not completed; new command %02x ignored\n", tag().c_str(), current_command(), data);
else
{
m_register_w[COMMAND] = data;
@@ -3987,9 +3987,9 @@ void hdc92x4_device::process_command()
if (TRACE_SETREG)
{
if (m_register_pointer == INT_COMM_TERM)
- logerror("%s: Setting interrupt trigger DONE=%d READY=%d\n", tag(), (m_regvalue & TC_INTDONE)? 1:0, (m_regvalue & TC_INTRDCH)? 1:0);
+ logerror("%s: Setting interrupt trigger DONE=%d READY=%d\n", tag().c_str(), (m_regvalue & TC_INTDONE)? 1:0, (m_regvalue & TC_INTRDCH)? 1:0);
else
- logerror("%s: register[%d] <- %02x\n", tag(), m_register_pointer, m_regvalue);
+ logerror("%s: register[%d] <- %02x\n", tag().c_str(), m_register_pointer, m_regvalue);
}
m_register_w[m_register_pointer] = m_regvalue;
@@ -4032,7 +4032,7 @@ void hdc92x4_device::process_command()
}
if (!found)
{
- logerror("%s: Command %02x not defined\n", tag(), m_register_w[COMMAND]);
+ logerror("%s: Command %02x not defined\n", tag().c_str(), m_register_w[COMMAND]);
}
}
auxbus_out();
@@ -4040,7 +4040,7 @@ void hdc92x4_device::process_command()
void hdc92x4_device::reenter_command_processing()
{
- if (TRACE_DELAY) logerror("%s: Re-enter command processing; live state = %02x\n", tag(), m_live_state.state);
+ if (TRACE_DELAY) logerror("%s: Re-enter command processing; live state = %02x\n", tag().c_str(), m_live_state.state);
// Do we have a live run on the track?
if (m_live_state.state != IDLE)
{
@@ -4052,7 +4052,7 @@ void hdc92x4_device::reenter_command_processing()
// We're here when there is no live_run anymore
// Where were we last time?
// Take care not to restart commands because of the index callback
- if (TRACE_DELAY) logerror("%s: Continue with substate %02x\n", tag(), m_substate);
+ if (TRACE_DELAY) logerror("%s: Continue with substate %02x\n", tag().c_str(), m_substate);
if (m_executing && m_substate != UNDEF) (this->*m_command)();
auxbus_out();
}
@@ -4071,15 +4071,15 @@ void hdc92x4_device::set_command_done(int flags)
{
set_bits(m_register_r[INT_STATUS], ST_TERMCOD, false); // clear the previously set flags
m_register_r[INT_STATUS] |= flags;
- if (TRACE_DONE) logerror("%s: command %02x done, flags=%02x\n", tag(), current_command(), flags);
+ if (TRACE_DONE) logerror("%s: command %02x done, flags=%02x\n", tag().c_str(), current_command(), flags);
}
else
{
- if (TRACE_DONE) logerror("%s: command %02x done\n", tag(), current_command());
+ if (TRACE_DONE) logerror("%s: command %02x done\n", tag().c_str(), current_command());
}
// [1], p. 6
- if (TRACE_INT) logerror("%s: Raise interrupt DONE\n", tag());
+ if (TRACE_INT) logerror("%s: Raise interrupt DONE\n", tag().c_str());
set_interrupt(ASSERT_LINE);
m_substate = UNDEF;
@@ -4147,7 +4147,7 @@ void hdc92x4_device::auxbus_in(UINT8 data)
return;
if (TRACE_AUXBUS) logerror("%s: Got value %02x via auxbus: ecc=%d index=%d seek_comp=%d tr00=%d user=%d writeprot=%d ready=%d fault=%d\n",
- tag(), data,
+ tag().c_str(), data,
(data&HDC_DS_ECCERR)? 1:0, (data&HDC_DS_INDEX)? 1:0,
(data&HDC_DS_SKCOM)? 1:0, (data&HDC_DS_TRK00)? 1:0,
(data&HDC_DS_UDEF)? 1:0, (data&HDC_DS_WRPROT)? 1:0,
@@ -4181,20 +4181,20 @@ bool hdc92x4_device::waiting_for_other_line(int line)
void hdc92x4_device::index_handler()
{
int level = index_hole()? ASSERT_LINE : CLEAR_LINE;
- if (TRACE_LINES) logerror("%s: [%s] Index handler; level=%d\n", tag(), ttsn().c_str(), level);
+ if (TRACE_LINES) logerror("%s: [%s] Index handler; level=%d\n", tag().c_str(), ttsn().c_str(), level);
// Synchronize our position on the track
live_sync();
if (level==ASSERT_LINE)
{
- if (TRACE_INDEX) logerror("%s: Index pulse\n", tag());
+ if (TRACE_INDEX) logerror("%s: Index pulse\n", tag().c_str());
if (m_wait_for_index) m_stop_after_index = true;
}
if (waiting_for_line(INDEX_LINE, level))
{
- if (TRACE_LINES) logerror("%s: [%s] Index pulse level=%d triggers event\n", tag(), ttsn().c_str(), level);
+ if (TRACE_LINES) logerror("%s: [%s] Index pulse level=%d triggers event\n", tag().c_str(), ttsn().c_str(), level);
m_substate = m_state_after_line;
m_state_after_line = UNDEF;
if (m_stopwrite)
@@ -4216,7 +4216,7 @@ void hdc92x4_device::index_handler()
void hdc92x4_device::ready_handler()
{
int level = drive_ready()? ASSERT_LINE : CLEAR_LINE;
- if (TRACE_LINES) logerror("%s: [%s] Ready handler; level=%d\n", tag(), ttsn().c_str(), level);
+ if (TRACE_LINES) logerror("%s: [%s] Ready handler; level=%d\n", tag().c_str(), ttsn().c_str(), level);
// Set the interrupt status flag
set_bits(m_register_r[INT_STATUS], ST_RDYCHNG, true);
@@ -4227,7 +4227,7 @@ void hdc92x4_device::ready_handler()
// Raise an interrupt if desired
if (m_register_w[INT_COMM_TERM] & TC_INTRDCH)
{
- if (TRACE_INT) logerror("%s: Raise interrupt READY change\n", tag());
+ if (TRACE_INT) logerror("%s: Raise interrupt READY change\n", tag().c_str());
set_interrupt(ASSERT_LINE);
}
@@ -4243,7 +4243,7 @@ void hdc92x4_device::ready_handler()
void hdc92x4_device::seek_complete_handler()
{
int level = seek_complete()? ASSERT_LINE : CLEAR_LINE;
- if (TRACE_LINES) logerror("%s: [%s] Seek complete handler; level=%d\n", tag(), ttsn().c_str(), level);
+ if (TRACE_LINES) logerror("%s: [%s] Seek complete handler; level=%d\n", tag().c_str(), ttsn().c_str(), level);
// Synchronize our position on the track
live_sync();
@@ -4290,7 +4290,7 @@ void hdc92x4_device::auxbus_out()
m_output2 = (m_output2 & 0xb0) | desired_head();
if (m_reduced_write_current) m_output2 |= OUT2_REDWRT;
- if (TRACE_AUXBUS) logerror("%s: [%s] Setting OUTPUT1=%02x, OUTPUT2=%02x\n", tag(), ttsn().c_str(), m_output1, m_output2);
+ if (TRACE_AUXBUS) logerror("%s: [%s] Setting OUTPUT1=%02x, OUTPUT2=%02x\n", tag().c_str(), ttsn().c_str(), m_output1, m_output2);
if (m_output1 != m_output1_old || m_output2 != m_output2_old)
{
@@ -4304,7 +4304,7 @@ void hdc92x4_device::auxbus_out()
void hdc92x4_device::dma_address_out(UINT8 addrub, UINT8 addrhb, UINT8 addrlb)
{
- if (TRACE_DMA) logerror("%s: Setting DMA address %06x\n", tag(), (addrub<<16 | addrhb<<8 | addrlb)&0xffffff);
+ if (TRACE_DMA) logerror("%s: Setting DMA address %06x\n", tag().c_str(), (addrub<<16 | addrhb<<8 | addrlb)&0xffffff);
m_out_auxbus((offs_t)HDC_OUTPUT_DMA_ADDR, addrub);
m_out_auxbus((offs_t)HDC_OUTPUT_DMA_ADDR, addrhb);
m_out_auxbus((offs_t)HDC_OUTPUT_DMA_ADDR, addrlb);
@@ -4344,7 +4344,7 @@ WRITE_LINE_MEMBER( hdc92x4_device::dmaack )
{
if (state==ASSERT_LINE)
{
- if (TRACE_DMA) logerror("%s: [%s] DMA acknowledged\n", tag(), ttsn().c_str());
+ if (TRACE_DMA) logerror("%s: [%s] DMA acknowledged\n", tag().c_str(), ttsn().c_str());
set_bits(m_register_r[INT_STATUS], ST_OVRUN, false);
}
}
@@ -4365,7 +4365,7 @@ void hdc92x4_device::connect_hard_drive(mfm_harddisk_device* harddisk)
{
m_harddisk = harddisk;
m_hd_encoding = m_harddisk->get_encoding();
- if (TRACE_SELECT && TRACE_DETAIL) logerror("%s: HD encoding = %d\n", tag(), m_hd_encoding);
+ if (TRACE_SELECT && TRACE_DETAIL) logerror("%s: HD encoding = %d\n", tag().c_str(), m_hd_encoding);
}
/*
@@ -4405,7 +4405,7 @@ WRITE_LINE_MEMBER( hdc92x4_device::reset )
{
if (state == ASSERT_LINE)
{
- if (TRACE_LINES) logerror("%s: Reset via RST line\n", tag());
+ if (TRACE_LINES) logerror("%s: Reset via RST line\n", tag().c_str());
device_reset();
}
}
diff --git a/src/devices/machine/hdc92x4.h b/src/devices/machine/hdc92x4.h
index fccf23666d7..e15fc72230e 100644
--- a/src/devices/machine/hdc92x4.h
+++ b/src/devices/machine/hdc92x4.h
@@ -79,7 +79,7 @@ enum
class hdc92x4_device : public device_t
{
public:
- hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// Accesors from the CPU side
DECLARE_READ8_MEMBER( read );
@@ -475,13 +475,13 @@ protected:
class hdc9224_device : public hdc92x4_device
{
public:
- hdc9224_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hdc9224_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class hdc9234_device : public hdc92x4_device
{
public:
- hdc9234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hdc9234_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
#endif
diff --git a/src/devices/machine/i2cmem.cpp b/src/devices/machine/i2cmem.cpp
index d77e12ef4be..b345dd3817b 100644
--- a/src/devices/machine/i2cmem.cpp
+++ b/src/devices/machine/i2cmem.cpp
@@ -49,7 +49,7 @@ static inline void ATTR_PRINTF( 3, 4 ) verboselog( device_t *device, int n_level
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- device->logerror( "%s: I2CMEM(%s) %s", device->machine().describe_context( ), device->tag(), buf );
+ device->logerror( "%s: I2CMEM(%s) %s", device->machine().describe_context( ), device->tag().c_str(), buf );
}
}
@@ -74,7 +74,7 @@ ADDRESS_MAP_END
// i2cmem_device - constructor
//-------------------------------------------------
-i2cmem_device::i2cmem_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+i2cmem_device::i2cmem_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t(mconfig, I2CMEM, "I2C Memory", tag, owner, clock, "i2cmem", __FILE__),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -183,12 +183,12 @@ void i2cmem_device::nvram_default()
{
if( m_region->bytes() != i2cmem_bytes )
{
- fatalerror( "i2cmem region '%s' wrong size (expected size = 0x%X)\n", tag(), i2cmem_bytes );
+ fatalerror( "i2cmem region '%s' wrong size (expected size = 0x%X)\n", tag().c_str(), i2cmem_bytes );
}
if( m_region->bytewidth() != 1 )
{
- fatalerror( "i2cmem region '%s' needs to be an 8-bit region\n", tag() );
+ fatalerror( "i2cmem region '%s' needs to be an 8-bit region\n", tag().c_str() );
}
UINT8 *default_data = m_region->base();
diff --git a/src/devices/machine/i2cmem.h b/src/devices/machine/i2cmem.h
index d17d6f2f277..167ea117348 100644
--- a/src/devices/machine/i2cmem.h
+++ b/src/devices/machine/i2cmem.h
@@ -90,7 +90,7 @@ class i2cmem_device :
{
public:
// construction/destruction
- i2cmem_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
+ i2cmem_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
static void set_address(device_t &device, int address) { downcast<i2cmem_device &>(device).m_slave_address = address; }
static void set_page_size(device_t &device, int page_size) { downcast<i2cmem_device &>(device).m_page_size = page_size; }
diff --git a/src/devices/machine/i6300esb.cpp b/src/devices/machine/i6300esb.cpp
index ec7ca934d31..538a36340d6 100644
--- a/src/devices/machine/i6300esb.cpp
+++ b/src/devices/machine/i6300esb.cpp
@@ -8,7 +8,7 @@ const device_type I6300ESB_LPC = &device_creator<i6300esb_lpc_device>;
DEVICE_ADDRESS_MAP_START(map, 32, i6300esb_watchdog_device)
ADDRESS_MAP_END
-i6300esb_watchdog_device::i6300esb_watchdog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i6300esb_watchdog_device::i6300esb_watchdog_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I6300ESB_WATCHDOG, "i6300ESB southbridge watchdog", tag, owner, clock, "i6300esb_watchdog", __FILE__)
{
}
@@ -86,7 +86,7 @@ DEVICE_ADDRESS_MAP_START(internal_io_map, 32, i6300esb_lpc_device)
ADDRESS_MAP_END
-i6300esb_lpc_device::i6300esb_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i6300esb_lpc_device::i6300esb_lpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I6300ESB_LPC, "i6300ESB southbridge ISA/LPC bridge", tag, owner, clock, "i6300esb_lpc", __FILE__),
acpi(*this, "acpi"),
rtc (*this, "rtc"),
@@ -156,7 +156,7 @@ WRITE32_MEMBER(i6300esb_lpc_device::pmbase_w)
{
COMBINE_DATA(&pmbase);
pmbase &= 0x0000ff80;
- logerror("%s: pmbase = %08x\n", tag(), pmbase);
+ logerror("%s: pmbase = %08x\n", tag().c_str(), pmbase);
remap_cb();
}
@@ -168,7 +168,7 @@ READ8_MEMBER (i6300esb_lpc_device::acpi_cntl_r)
WRITE8_MEMBER(i6300esb_lpc_device::acpi_cntl_w)
{
acpi_cntl = data;
- logerror("%s: acpi_cntl = %08x\n", tag(), acpi_cntl);
+ logerror("%s: acpi_cntl = %08x\n", tag().c_str(), acpi_cntl);
remap_cb();
}
@@ -180,7 +180,7 @@ READ16_MEMBER (i6300esb_lpc_device::bios_cntl_r)
WRITE16_MEMBER(i6300esb_lpc_device::bios_cntl_w)
{
COMBINE_DATA(&bios_cntl);
- logerror("%s: bios_cntl = %08x\n", tag(), bios_cntl);
+ logerror("%s: bios_cntl = %08x\n", tag().c_str(), bios_cntl);
remap_cb();
}
@@ -192,7 +192,7 @@ READ8_MEMBER (i6300esb_lpc_device::tco_cntl_r)
WRITE8_MEMBER (i6300esb_lpc_device::tco_cntl_w)
{
tco_cntl = data;
- logerror("%s: tco_cntl = %02x\n", tag(), tco_cntl);
+ logerror("%s: tco_cntl = %02x\n", tag().c_str(), tco_cntl);
}
READ32_MEMBER (i6300esb_lpc_device::gpio_base_r)
@@ -204,7 +204,7 @@ WRITE32_MEMBER(i6300esb_lpc_device::gpio_base_w)
{
COMBINE_DATA(&gpio_base);
gpio_base &= 0x0000ffc0;
- logerror("%s: gpio_base = %08x\n", tag(), gpio_base);
+ logerror("%s: gpio_base = %08x\n", tag().c_str(), gpio_base);
remap_cb();
}
@@ -216,7 +216,7 @@ READ8_MEMBER (i6300esb_lpc_device::gpio_cntl_r)
WRITE8_MEMBER (i6300esb_lpc_device::gpio_cntl_w)
{
gpio_cntl = data;
- logerror("%s: gpio_cntl = %02x\n", tag(), gpio_cntl);
+ logerror("%s: gpio_cntl = %02x\n", tag().c_str(), gpio_cntl);
remap_cb();
}
@@ -228,7 +228,7 @@ READ8_MEMBER (i6300esb_lpc_device::pirq_rout_r)
WRITE8_MEMBER (i6300esb_lpc_device::pirq_rout_w)
{
pirq_rout[offset] = data;
- logerror("%s: pirq_rout[%d] = %02x\n", tag(), offset, pirq_rout[offset]);
+ logerror("%s: pirq_rout[%d] = %02x\n", tag().c_str(), offset, pirq_rout[offset]);
}
READ8_MEMBER (i6300esb_lpc_device::serirq_cntl_r)
@@ -239,7 +239,7 @@ READ8_MEMBER (i6300esb_lpc_device::serirq_cntl_r)
WRITE8_MEMBER (i6300esb_lpc_device::serirq_cntl_w)
{
serirq_cntl = data;
- logerror("%s: serirq_cntl = %02x\n", tag(), serirq_cntl);
+ logerror("%s: serirq_cntl = %02x\n", tag().c_str(), serirq_cntl);
}
READ8_MEMBER (i6300esb_lpc_device::pirq2_rout_r)
@@ -260,7 +260,7 @@ READ8_MEMBER (i6300esb_lpc_device::d31_err_cfg_r)
WRITE8_MEMBER (i6300esb_lpc_device::d31_err_cfg_w)
{
d31_err_cfg = data;
- logerror("%s: d31_err_cfg = %02x\n", tag(), d31_err_cfg);
+ logerror("%s: d31_err_cfg = %02x\n", tag().c_str(), d31_err_cfg);
}
READ8_MEMBER (i6300esb_lpc_device::d31_err_sts_r)
@@ -271,7 +271,7 @@ READ8_MEMBER (i6300esb_lpc_device::d31_err_sts_r)
WRITE8_MEMBER (i6300esb_lpc_device::d31_err_sts_w)
{
d31_err_sts &= ~data;
- logerror("%s: d31_err_sts = %02x\n", tag(), d31_err_sts);
+ logerror("%s: d31_err_sts = %02x\n", tag().c_str(), d31_err_sts);
}
READ16_MEMBER (i6300esb_lpc_device::pci_dma_cfg_r)
@@ -282,7 +282,7 @@ READ16_MEMBER (i6300esb_lpc_device::pci_dma_cfg_r)
WRITE16_MEMBER(i6300esb_lpc_device::pci_dma_cfg_w)
{
COMBINE_DATA(&pci_dma_cfg);
- logerror("%s: pci_dma_cfg = %04x\n", tag(), pci_dma_cfg);
+ logerror("%s: pci_dma_cfg = %04x\n", tag().c_str(), pci_dma_cfg);
}
READ16_MEMBER (i6300esb_lpc_device::gen_pmcon_1_r)
@@ -293,7 +293,7 @@ READ16_MEMBER (i6300esb_lpc_device::gen_pmcon_1_r)
WRITE16_MEMBER(i6300esb_lpc_device::gen_pmcon_1_w)
{
COMBINE_DATA(&gen_pmcon_1);
- logerror("%s: gen_pmcon_1 = %04x\n", tag(), gen_pmcon_1);
+ logerror("%s: gen_pmcon_1 = %04x\n", tag().c_str(), gen_pmcon_1);
}
READ8_MEMBER (i6300esb_lpc_device::gen_pmcon_2_r)
@@ -304,7 +304,7 @@ READ8_MEMBER (i6300esb_lpc_device::gen_pmcon_2_r)
WRITE8_MEMBER (i6300esb_lpc_device::gen_pmcon_2_w)
{
gen_pmcon_2 = data;
- logerror("%s: gen_pmcon_2 = %02x\n", tag(), gen_pmcon_2);
+ logerror("%s: gen_pmcon_2 = %02x\n", tag().c_str(), gen_pmcon_2);
}
READ8_MEMBER (i6300esb_lpc_device::gen_pmcon_3_r)
@@ -315,7 +315,7 @@ READ8_MEMBER (i6300esb_lpc_device::gen_pmcon_3_r)
WRITE8_MEMBER (i6300esb_lpc_device::gen_pmcon_3_w)
{
gen_pmcon_3 = data;
- logerror("%s: gen_pmcon_3 = %02x\n", tag(), gen_pmcon_3);
+ logerror("%s: gen_pmcon_3 = %02x\n", tag().c_str(), gen_pmcon_3);
}
READ32_MEMBER (i6300esb_lpc_device::rst_cnt2_r)
@@ -326,7 +326,7 @@ READ32_MEMBER (i6300esb_lpc_device::rst_cnt2_r)
WRITE32_MEMBER(i6300esb_lpc_device::rst_cnt2_w)
{
COMBINE_DATA(&rst_cnt2);
- logerror("%s: rst_cnt2 = %08x\n", tag(), rst_cnt2);
+ logerror("%s: rst_cnt2 = %08x\n", tag().c_str(), rst_cnt2);
}
READ8_MEMBER (i6300esb_lpc_device::apm_cnt_r)
@@ -337,7 +337,7 @@ READ8_MEMBER (i6300esb_lpc_device::apm_cnt_r)
WRITE8_MEMBER (i6300esb_lpc_device::apm_cnt_w)
{
apm_cnt = data;
- logerror("%s: apm_cnt = %02x\n", tag(), apm_cnt);
+ logerror("%s: apm_cnt = %02x\n", tag().c_str(), apm_cnt);
}
READ8_MEMBER (i6300esb_lpc_device::apm_sts_r)
@@ -348,7 +348,7 @@ READ8_MEMBER (i6300esb_lpc_device::apm_sts_r)
WRITE8_MEMBER (i6300esb_lpc_device::apm_sts_w)
{
apm_sts = data;
- logerror("%s: apm_sts = %02x\n", tag(), apm_sts);
+ logerror("%s: apm_sts = %02x\n", tag().c_str(), apm_sts);
}
READ32_MEMBER (i6300esb_lpc_device::gpi_rout_r)
@@ -359,7 +359,7 @@ READ32_MEMBER (i6300esb_lpc_device::gpi_rout_r)
WRITE32_MEMBER(i6300esb_lpc_device::gpi_rout_w)
{
COMBINE_DATA(&gpi_rout);
- logerror("%s: gpi_rout = %08x\n", tag(), gpi_rout);
+ logerror("%s: gpi_rout = %08x\n", tag().c_str(), gpi_rout);
}
READ8_MEMBER (i6300esb_lpc_device::mon_fwd_en_r)
@@ -370,7 +370,7 @@ READ8_MEMBER (i6300esb_lpc_device::mon_fwd_en_r)
WRITE8_MEMBER (i6300esb_lpc_device::mon_fwd_en_w)
{
mon_fwd_en = data;
- logerror("%s: mon_fwd_en = %02x\n", tag(), mon_fwd_en);
+ logerror("%s: mon_fwd_en = %02x\n", tag().c_str(), mon_fwd_en);
}
READ16_MEMBER (i6300esb_lpc_device::mon_trp_rng_r)
@@ -381,7 +381,7 @@ READ16_MEMBER (i6300esb_lpc_device::mon_trp_rng_r)
WRITE16_MEMBER(i6300esb_lpc_device::mon_trp_rng_w)
{
COMBINE_DATA(&mon_trp_rng[offset]);
- logerror("%s: mon_trp_rng[%d] = %04x\n", tag(), 4+offset, mon_trp_rng[offset]);
+ logerror("%s: mon_trp_rng[%d] = %04x\n", tag().c_str(), 4+offset, mon_trp_rng[offset]);
}
READ16_MEMBER (i6300esb_lpc_device::mon_trp_msk_r)
@@ -392,7 +392,7 @@ READ16_MEMBER (i6300esb_lpc_device::mon_trp_msk_r)
WRITE16_MEMBER(i6300esb_lpc_device::mon_trp_msk_w)
{
COMBINE_DATA(&mon_trp_msk);
- logerror("%s: mon_trp_msk = %04x\n", tag(), mon_trp_msk);
+ logerror("%s: mon_trp_msk = %04x\n", tag().c_str(), mon_trp_msk);
}
READ32_MEMBER (i6300esb_lpc_device::gen_cntl_r)
@@ -403,7 +403,7 @@ READ32_MEMBER (i6300esb_lpc_device::gen_cntl_r)
WRITE32_MEMBER(i6300esb_lpc_device::gen_cntl_w)
{
COMBINE_DATA(&gen_cntl);
- logerror("%s: gen_cntl = %08x\n", tag(), gen_cntl);
+ logerror("%s: gen_cntl = %08x\n", tag().c_str(), gen_cntl);
}
READ8_MEMBER (i6300esb_lpc_device::gen_sta_r)
@@ -414,7 +414,7 @@ READ8_MEMBER (i6300esb_lpc_device::gen_sta_r)
WRITE8_MEMBER (i6300esb_lpc_device::gen_sta_w)
{
gen_sta = data;
- logerror("%s: gen_sta = %02x\n", tag(), gen_sta);
+ logerror("%s: gen_sta = %02x\n", tag().c_str(), gen_sta);
}
READ8_MEMBER (i6300esb_lpc_device::back_cntl_r)
@@ -425,7 +425,7 @@ READ8_MEMBER (i6300esb_lpc_device::back_cntl_r)
WRITE8_MEMBER (i6300esb_lpc_device::back_cntl_w)
{
back_cntl = data;
- logerror("%s: back_cntl = %02x\n", tag(), back_cntl);
+ logerror("%s: back_cntl = %02x\n", tag().c_str(), back_cntl);
remap_cb();
}
@@ -437,7 +437,7 @@ READ8_MEMBER (i6300esb_lpc_device::rtc_conf_r)
WRITE8_MEMBER (i6300esb_lpc_device::rtc_conf_w)
{
rtc_conf = data;
- logerror("%s: rtc_conf = %02x\n", tag(), rtc_conf);
+ logerror("%s: rtc_conf = %02x\n", tag().c_str(), rtc_conf);
remap_cb();
}
@@ -449,7 +449,7 @@ READ8_MEMBER (i6300esb_lpc_device::lpc_if_com_range_r)
WRITE8_MEMBER (i6300esb_lpc_device::lpc_if_com_range_w)
{
lpc_if_com_range = data;
- logerror("%s: lpc_if_com_range = %02x\n", tag(), lpc_if_com_range);
+ logerror("%s: lpc_if_com_range = %02x\n", tag().c_str(), lpc_if_com_range);
remap_cb();
}
@@ -461,7 +461,7 @@ READ8_MEMBER (i6300esb_lpc_device::lpc_if_fdd_lpt_range_r)
WRITE8_MEMBER (i6300esb_lpc_device::lpc_if_fdd_lpt_range_w)
{
COMBINE_DATA(&lpc_if_fdd_lpt_range);
- logerror("%s: lpc_if_fdd_lpt_range = %02x\n", tag(), lpc_if_fdd_lpt_range);
+ logerror("%s: lpc_if_fdd_lpt_range = %02x\n", tag().c_str(), lpc_if_fdd_lpt_range);
remap_cb();
}
@@ -473,7 +473,7 @@ READ8_MEMBER (i6300esb_lpc_device::lpc_if_sound_range_r)
WRITE8_MEMBER (i6300esb_lpc_device::lpc_if_sound_range_w)
{
COMBINE_DATA(&lpc_if_sound_range);
- logerror("%s: lpc_if_sound_range = %02x\n", tag(), lpc_if_sound_range);
+ logerror("%s: lpc_if_sound_range = %02x\n", tag().c_str(), lpc_if_sound_range);
remap_cb();
}
@@ -485,7 +485,7 @@ READ8_MEMBER (i6300esb_lpc_device::fwh_dec_en1_r)
WRITE8_MEMBER (i6300esb_lpc_device::fwh_dec_en1_w)
{
fwh_dec_en1 = data | 0x80;
- logerror("%s: fwh_dec_en1 = %02x\n", tag(), fwh_dec_en1);
+ logerror("%s: fwh_dec_en1 = %02x\n", tag().c_str(), fwh_dec_en1);
remap_cb();
}
@@ -497,7 +497,7 @@ READ16_MEMBER (i6300esb_lpc_device::gen1_dec_r)
WRITE16_MEMBER(i6300esb_lpc_device::gen1_dec_w)
{
COMBINE_DATA(&gen1_dec);
- logerror("%s: gen1_dec = %04x\n", tag(), gen1_dec);
+ logerror("%s: gen1_dec = %04x\n", tag().c_str(), gen1_dec);
remap_cb();
}
@@ -509,7 +509,7 @@ READ16_MEMBER (i6300esb_lpc_device::lpc_en_r)
WRITE16_MEMBER(i6300esb_lpc_device::lpc_en_w)
{
COMBINE_DATA(&lpc_en);
- logerror("%s: lpc_en = %04x\n", tag(), lpc_en);
+ logerror("%s: lpc_en = %04x\n", tag().c_str(), lpc_en);
remap_cb();
}
@@ -521,7 +521,7 @@ READ32_MEMBER (i6300esb_lpc_device::fwh_sel1_r)
WRITE32_MEMBER(i6300esb_lpc_device::fwh_sel1_w)
{
COMBINE_DATA(&fwh_sel1);
- logerror("%s: fwh_sel1 = %08x\n", tag(), fwh_sel1);
+ logerror("%s: fwh_sel1 = %08x\n", tag().c_str(), fwh_sel1);
remap_cb();
}
@@ -533,7 +533,7 @@ READ16_MEMBER (i6300esb_lpc_device::gen2_dec_r)
WRITE16_MEMBER(i6300esb_lpc_device::gen2_dec_w)
{
COMBINE_DATA(&gen2_dec);
- logerror("%s: gen2_dec = %04x\n", tag(), gen2_dec);
+ logerror("%s: gen2_dec = %04x\n", tag().c_str(), gen2_dec);
remap_cb();
}
@@ -545,7 +545,7 @@ READ16_MEMBER (i6300esb_lpc_device::fwh_sel2_r)
WRITE16_MEMBER(i6300esb_lpc_device::fwh_sel2_w)
{
COMBINE_DATA(&fwh_sel2);
- logerror("%s: fwh_sel2 = %04x\n", tag(), fwh_sel2);
+ logerror("%s: fwh_sel2 = %04x\n", tag().c_str(), fwh_sel2);
remap_cb();
}
@@ -557,7 +557,7 @@ READ8_MEMBER (i6300esb_lpc_device::fwh_dec_en2_r)
WRITE8_MEMBER (i6300esb_lpc_device::fwh_dec_en2_w)
{
fwh_dec_en2 = data;
- logerror("%s: fwh_dec_en2 = %02x\n", tag(), fwh_dec_en2);
+ logerror("%s: fwh_dec_en2 = %02x\n", tag().c_str(), fwh_dec_en2);
remap_cb();
}
@@ -569,7 +569,7 @@ READ16_MEMBER (i6300esb_lpc_device::func_dis_r)
WRITE16_MEMBER(i6300esb_lpc_device::func_dis_w)
{
COMBINE_DATA(&func_dis);
- logerror("%s: func_dis = %04x\n", tag(), func_dis);
+ logerror("%s: func_dis = %04x\n", tag().c_str(), func_dis);
}
READ32_MEMBER (i6300esb_lpc_device::etr1_r)
@@ -580,7 +580,7 @@ READ32_MEMBER (i6300esb_lpc_device::etr1_r)
WRITE32_MEMBER(i6300esb_lpc_device::etr1_w)
{
COMBINE_DATA(&etr1);
- logerror("%s: etr1 = %08x\n", tag(), etr1);
+ logerror("%s: etr1 = %08x\n", tag().c_str(), etr1);
}
READ32_MEMBER (i6300esb_lpc_device::mfid_r)
@@ -590,13 +590,13 @@ READ32_MEMBER (i6300esb_lpc_device::mfid_r)
READ32_MEMBER (i6300esb_lpc_device::unk_fc_r)
{
- logerror("%s: read undocumented config reg fc\n", tag());
+ logerror("%s: read undocumented config reg fc\n", tag().c_str());
return 0;
}
WRITE32_MEMBER(i6300esb_lpc_device::unk_fc_w)
{
- logerror("%s: write undocumented config reg fc (%08x)\n", tag(), data);
+ logerror("%s: write undocumented config reg fc (%08x)\n", tag().c_str(), data);
}
@@ -616,7 +616,7 @@ WRITE8_MEMBER (i6300esb_lpc_device::siu_config_port_w)
case 1:
siu_config_state = data == 0x86 ? 2 : data == 0x80 ? 1 : 0;
if(siu_config_state == 2)
- logerror("%s: siu configuration active\n", tag());
+ logerror("%s: siu configuration active\n", tag().c_str());
break;
case 2:
siu_config_state = data == 0x68 ? 3 : 2;
@@ -624,24 +624,24 @@ WRITE8_MEMBER (i6300esb_lpc_device::siu_config_port_w)
case 3:
siu_config_state = data == 0x08 ? 0 : data == 0x68 ? 3 : 2;
if(!siu_config_state)
- logerror("%s: siu configuration disabled\n", tag());
+ logerror("%s: siu configuration disabled\n", tag().c_str());
break;
}
}
READ8_MEMBER (i6300esb_lpc_device::siu_data_port_r)
{
- logerror("%s: siu config read port %02x\n", tag(), siu_config_port);
+ logerror("%s: siu config read port %02x\n", tag().c_str(), siu_config_port);
return 0xff;
}
WRITE8_MEMBER (i6300esb_lpc_device::siu_data_port_w)
{
if(siu_config_state < 2) {
- logerror("%s: siu config write port with config disabled (port=%02x, data=%02x)\n", tag(), siu_config_port, data);
+ logerror("%s: siu config write port with config disabled (port=%02x, data=%02x)\n", tag().c_str(), siu_config_port, data);
return;
}
- logerror("%s: siu config write port %02x, %02x\n", tag(), siu_config_port, data);
+ logerror("%s: siu config write port %02x, %02x\n", tag().c_str(), siu_config_port, data);
}
READ8_MEMBER (i6300esb_lpc_device::nmi_sc_r)
@@ -653,7 +653,7 @@ READ8_MEMBER (i6300esb_lpc_device::nmi_sc_r)
WRITE8_MEMBER (i6300esb_lpc_device::nmi_sc_w)
{
nmi_sc = data;
- logerror("%s: nmi_sc = %02x\n", tag(), nmi_sc);
+ logerror("%s: nmi_sc = %02x\n", tag().c_str(), nmi_sc);
}
@@ -710,44 +710,44 @@ void i6300esb_lpc_device::map_extra(UINT64 memory_window_start, UINT64 memory_wi
if(acpi_cntl & 0x10)
acpi->map_device(memory_window_start, memory_window_end, 0, memory_space, io_window_start, io_window_end, pmbase, io_space);
if(gpio_cntl & 0x10)
- logerror("%s: Warning: gpio range enabled at %04x-%04x\n", tag(), gpio_base, gpio_base+63);
+ logerror("%s: Warning: gpio range enabled at %04x-%04x\n", tag().c_str(), gpio_base, gpio_base+63);
UINT32 hpet = 0xfed00000 + ((gen_cntl & 0x00018000) >> 3);
- logerror("%s: Warning: hpet at %08x-%08x\n", tag(), hpet, hpet+0x3ff);
+ logerror("%s: Warning: hpet at %08x-%08x\n", tag().c_str(), hpet, hpet+0x3ff);
if(lpc_en & 0x1000)
- logerror("%s: Warning: superio at 2e-2f\n", tag());
+ logerror("%s: Warning: superio at 2e-2f\n", tag().c_str());
if(lpc_en & 0x0800)
- logerror("%s: Warning: mcu at 62/66\n", tag());
+ logerror("%s: Warning: mcu at 62/66\n", tag().c_str());
if(lpc_en & 0x0400)
- logerror("%s: Warning: mcu at 60/64\n", tag());
+ logerror("%s: Warning: mcu at 60/64\n", tag().c_str());
if(lpc_en & 0x0200)
- logerror("%s: Warning: gameport at 208-20f\n", tag());
+ logerror("%s: Warning: gameport at 208-20f\n", tag().c_str());
if(lpc_en & 0x0100)
- logerror("%s: Warning: gameport at 200-207\n", tag());
+ logerror("%s: Warning: gameport at 200-207\n", tag().c_str());
if(lpc_en & 0x0008) {
UINT16 fdc = lpc_if_fdd_lpt_range & 0x10 ? 0x370 : 0x3f0;
- logerror("%s: Warning: floppy at %04x-%04x\n", tag(), fdc, fdc+7);
+ logerror("%s: Warning: floppy at %04x-%04x\n", tag().c_str(), fdc, fdc+7);
}
if(lpc_en & 0x0004) {
static const UINT16 lpt_pos[4] = { 0x378, 0x278, 0x3bc, 0x000 };
UINT16 lpt = lpt_pos[lpc_if_fdd_lpt_range & 3];
if(lpt)
- logerror("%s: Warning: lpt at %04x-%04x %04x-%04x\n", tag(), lpt, lpt+7, lpt+0x400, lpt+0x407);
+ logerror("%s: Warning: lpt at %04x-%04x %04x-%04x\n", tag().c_str(), lpt, lpt+7, lpt+0x400, lpt+0x407);
}
static const UINT16 com_pos[8] = { 0x3f8, 0x2f8, 0x220, 0x228, 0x238, 0x2e8, 0x338, 0x3e8 };
if(lpc_en & 0x0002) {
UINT16 comb = com_pos[(lpc_if_com_range >> 4) & 7];
- logerror("%s: Warning: comb at %04x-%04x\n", tag(), comb, comb+7);
+ logerror("%s: Warning: comb at %04x-%04x\n", tag().c_str(), comb, comb+7);
}
if(lpc_en & 0x0001) {
UINT16 coma = com_pos[lpc_if_com_range & 7];
- logerror("%s: Warning: coma at %04x-%04x\n", tag(), coma, coma+7);
+ logerror("%s: Warning: coma at %04x-%04x\n", tag().c_str(), coma, coma+7);
}
rtc->map_device(memory_window_start, memory_window_end, 0, memory_space, io_window_start, io_window_end, 0, io_space);
diff --git a/src/devices/machine/i6300esb.h b/src/devices/machine/i6300esb.h
index 325e768dbba..e82a16bbfc7 100644
--- a/src/devices/machine/i6300esb.h
+++ b/src/devices/machine/i6300esb.h
@@ -18,7 +18,7 @@
class i6300esb_lpc_device : public pci_device {
public:
- i6300esb_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i6300esb_lpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void reset_all_mappings() override;
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
@@ -144,7 +144,7 @@ private:
class i6300esb_watchdog_device : public pci_device {
public:
- i6300esb_watchdog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i6300esb_watchdog_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/i80130.cpp b/src/devices/machine/i80130.cpp
index fb419a06090..186551710fb 100644
--- a/src/devices/machine/i80130.cpp
+++ b/src/devices/machine/i80130.cpp
@@ -130,7 +130,7 @@ machine_config_constructor i80130_device::device_mconfig_additions() const
// i80130_device - constructor
//-------------------------------------------------
-i80130_device::i80130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i80130_device::i80130_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I80130, "I80130", tag, owner, clock, "i80130", __FILE__),
m_pic(*this, "pic"),
m_pit(*this, "pit"),
diff --git a/src/devices/machine/i80130.h b/src/devices/machine/i80130.h
index 1625fd8fc45..0002e8e3201 100644
--- a/src/devices/machine/i80130.h
+++ b/src/devices/machine/i80130.h
@@ -51,7 +51,7 @@ class i80130_device : public device_t
{
public:
// construction/destruction
- i80130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i80130_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_ack_wr_callback(device_t &device, _Object object) { return downcast<i80130_device &>(device).m_write_ack.set_callback(object); }
diff --git a/src/devices/machine/i8155.cpp b/src/devices/machine/i8155.cpp
index b3d4098398a..1b0edf51f93 100644
--- a/src/devices/machine/i8155.cpp
+++ b/src/devices/machine/i8155.cpp
@@ -117,7 +117,7 @@ inline void i8155_device::timer_output()
{
m_out_to_cb(m_to);
- if (LOG) logerror("8155 '%s' Timer Output: %u\n", tag(), m_to);
+ if (LOG) logerror("8155 '%s' Timer Output: %u\n", tag().c_str(), m_to);
}
inline void i8155_device::pulse_timer_output()
@@ -170,7 +170,7 @@ inline UINT8 i8155_device::read_port(int port)
default:
// strobed mode not implemented yet
- logerror("8155 '%s' Unsupported Port C mode!\n", tag());
+ logerror("8155 '%s' Unsupported Port C mode!\n", tag().c_str());
break;
}
@@ -202,7 +202,7 @@ inline void i8155_device::write_port(int port, UINT8 data)
// i8155_device - constructor
//-------------------------------------------------
-i8155_device::i8155_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8155_device::i8155_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8155, "8155 RIOT", tag, owner, clock, "i8155", __FILE__),
device_memory_interface(mconfig, *this),
m_in_pa_cb(*this),
@@ -292,7 +292,7 @@ void i8155_device::device_timer(emu_timer &timer, device_timer_id id, int param,
if (m_counter == 0)
{
- if (LOG) logerror("8155 '%s' Timer Count Reached\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Count Reached\n", tag().c_str());
switch (m_command & COMMAND_TM_MASK)
{
@@ -300,7 +300,7 @@ void i8155_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// stop timer
m_timer->enable(0);
- if (LOG) logerror("8155 '%s' Timer Stopped\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Stopped\n", tag().c_str());
break;
}
@@ -399,28 +399,28 @@ void i8155_device::register_w(int offset, UINT8 data)
case REGISTER_COMMAND:
m_command = data;
- if (LOG) logerror("8155 '%s' Port A Mode: %s\n", tag(), (data & COMMAND_PA) ? "output" : "input");
- if (LOG) logerror("8155 '%s' Port B Mode: %s\n", tag(), (data & COMMAND_PB) ? "output" : "input");
+ if (LOG) logerror("8155 '%s' Port A Mode: %s\n", tag().c_str(), (data & COMMAND_PA) ? "output" : "input");
+ if (LOG) logerror("8155 '%s' Port B Mode: %s\n", tag().c_str(), (data & COMMAND_PB) ? "output" : "input");
- if (LOG) logerror("8155 '%s' Port A Interrupt: %s\n", tag(), (data & COMMAND_IEA) ? "enabled" : "disabled");
- if (LOG) logerror("8155 '%s' Port B Interrupt: %s\n", tag(), (data & COMMAND_IEB) ? "enabled" : "disabled");
+ if (LOG) logerror("8155 '%s' Port A Interrupt: %s\n", tag().c_str(), (data & COMMAND_IEA) ? "enabled" : "disabled");
+ if (LOG) logerror("8155 '%s' Port B Interrupt: %s\n", tag().c_str(), (data & COMMAND_IEB) ? "enabled" : "disabled");
switch (data & COMMAND_PC_MASK)
{
case COMMAND_PC_ALT_1:
- if (LOG) logerror("8155 '%s' Port C Mode: Alt 1\n", tag());
+ if (LOG) logerror("8155 '%s' Port C Mode: Alt 1\n", tag().c_str());
break;
case COMMAND_PC_ALT_2:
- if (LOG) logerror("8155 '%s' Port C Mode: Alt 2\n", tag());
+ if (LOG) logerror("8155 '%s' Port C Mode: Alt 2\n", tag().c_str());
break;
case COMMAND_PC_ALT_3:
- if (LOG) logerror("8155 '%s' Port C Mode: Alt 3\n", tag());
+ if (LOG) logerror("8155 '%s' Port C Mode: Alt 3\n", tag().c_str());
break;
case COMMAND_PC_ALT_4:
- if (LOG) logerror("8155 '%s' Port C Mode: Alt 4\n", tag());
+ if (LOG) logerror("8155 '%s' Port C Mode: Alt 4\n", tag().c_str());
break;
}
@@ -432,7 +432,7 @@ void i8155_device::register_w(int offset, UINT8 data)
case COMMAND_TM_STOP:
// NOP if timer has not started, stop counting if the timer is running
- if (LOG) logerror("8155 '%s' Timer Command: Stop\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Command: Stop\n", tag().c_str());
m_to = 1;
timer_output();
m_timer->enable(0);
@@ -440,11 +440,11 @@ void i8155_device::register_w(int offset, UINT8 data)
case COMMAND_TM_STOP_AFTER_TC:
// stop immediately after present TC is reached (NOP if timer has not started)
- if (LOG) logerror("8155 '%s' Timer Command: Stop after TC\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Command: Stop after TC\n", tag().c_str());
break;
case COMMAND_TM_START:
- if (LOG) logerror("8155 '%s' Timer Command: Start\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Command: Start\n", tag().c_str());
if (m_timer->enabled())
{
@@ -474,33 +474,33 @@ void i8155_device::register_w(int offset, UINT8 data)
case REGISTER_TIMER_LOW:
m_count_length = (m_count_length & 0xff00) | data;
- if (LOG) logerror("8155 '%s' Count Length Low: %04x\n", tag(), m_count_length);
+ if (LOG) logerror("8155 '%s' Count Length Low: %04x\n", tag().c_str(), m_count_length);
break;
case REGISTER_TIMER_HIGH:
m_count_length = (data << 8) | (m_count_length & 0xff);
- if (LOG) logerror("8155 '%s' Count Length High: %04x\n", tag(), m_count_length);
+ if (LOG) logerror("8155 '%s' Count Length High: %04x\n", tag().c_str(), m_count_length);
switch (data & TIMER_MODE_MASK)
{
case TIMER_MODE_LOW:
// puts out LOW during second half of count
- if (LOG) logerror("8155 '%s' Timer Mode: LOW\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Mode: LOW\n", tag().c_str());
break;
case TIMER_MODE_SQUARE_WAVE:
// square wave, i.e. the period of the square wave equals the count length programmed with automatic reload at terminal count
- if (LOG) logerror("8155 '%s' Timer Mode: Square wave\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Mode: Square wave\n", tag().c_str());
break;
case TIMER_MODE_SINGLE_PULSE:
// single pulse upon TC being reached
- if (LOG) logerror("8155 '%s' Timer Mode: Single pulse\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Mode: Single pulse\n", tag().c_str());
break;
case TIMER_MODE_AUTOMATIC_RELOAD:
// automatic reload, i.e. single pulse every time TC is reached
- if (LOG) logerror("8155 '%s' Timer Mode: Automatic reload\n", tag());
+ if (LOG) logerror("8155 '%s' Timer Mode: Automatic reload\n", tag().c_str());
break;
}
break;
diff --git a/src/devices/machine/i8155.h b/src/devices/machine/i8155.h
index 085ffe15196..aaab2e0d067 100644
--- a/src/devices/machine/i8155.h
+++ b/src/devices/machine/i8155.h
@@ -75,7 +75,7 @@ class i8155_device : public device_t,
{
public:
// construction/destruction
- i8155_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8155_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_in_pa_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<i8155_device &>(device).m_in_pb_cb.set_callback(object); }
diff --git a/src/devices/machine/i8212.cpp b/src/devices/machine/i8212.cpp
index 0ece5f05c1c..14c1f28483d 100644
--- a/src/devices/machine/i8212.cpp
+++ b/src/devices/machine/i8212.cpp
@@ -30,7 +30,7 @@ const device_type I8212 = &device_creator<i8212_device>;
// i8212_device - constructor
//-------------------------------------------------
-i8212_device::i8212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+i8212_device::i8212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, I8212, "I8212", tag, owner, clock, "i8212", __FILE__),
m_write_irq(*this),
m_read_di(*this),
@@ -84,7 +84,7 @@ READ8_MEMBER( i8212_device::read )
// clear interrupt line
m_write_irq(CLEAR_LINE);
- if (LOG) logerror("I8212 '%s' INT: %u\n", tag(), CLEAR_LINE);
+ if (LOG) logerror("I8212 '%s' INT: %u\n", tag().c_str(), CLEAR_LINE);
return m_data;
}
@@ -110,7 +110,7 @@ WRITE8_MEMBER( i8212_device::write )
WRITE_LINE_MEMBER( i8212_device::md_w )
{
- if (LOG) logerror("I8212 '%s' Mode: %s\n", tag(), state ? "output" : "input");
+ if (LOG) logerror("I8212 '%s' Mode: %s\n", tag().c_str(), state ? "output" : "input");
m_md = state;
}
@@ -122,7 +122,7 @@ WRITE_LINE_MEMBER( i8212_device::md_w )
WRITE_LINE_MEMBER( i8212_device::stb_w )
{
- if (LOG) logerror("I8212 '%s' STB: %u\n", tag(), state);
+ if (LOG) logerror("I8212 '%s' STB: %u\n", tag().c_str(), state);
if (m_md == I8212_MODE_INPUT)
{
@@ -134,7 +134,7 @@ WRITE_LINE_MEMBER( i8212_device::stb_w )
// assert interrupt line
m_write_irq(ASSERT_LINE);
- if (LOG) logerror("I8212 '%s' INT: %u\n", tag(), ASSERT_LINE);
+ if (LOG) logerror("I8212 '%s' INT: %u\n", tag().c_str(), ASSERT_LINE);
}
}
diff --git a/src/devices/machine/i8212.h b/src/devices/machine/i8212.h
index ea62ce9eefb..110c6adfd40 100644
--- a/src/devices/machine/i8212.h
+++ b/src/devices/machine/i8212.h
@@ -67,7 +67,7 @@ class i8212_device : public device_t
{
public:
// construction/destruction
- i8212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i8212_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_di_rd_callback(device_t &device, _Object object) { return downcast<i8212_device &>(device).m_read_di.set_callback(object); }
diff --git a/src/devices/machine/i8214.cpp b/src/devices/machine/i8214.cpp
index 9a7cf9ecd1c..a786728e2f4 100644
--- a/src/devices/machine/i8214.cpp
+++ b/src/devices/machine/i8214.cpp
@@ -33,7 +33,7 @@ const device_type I8214 = &device_creator<i8214_device>;
inline void i8214_device::trigger_interrupt(int level)
{
- if (LOG) logerror("I8214 '%s' Interrupt Level %u\n", tag(), level);
+ if (LOG) logerror("I8214 '%s' Interrupt Level %u\n", tag().c_str(), level);
m_a = level;
@@ -88,7 +88,7 @@ inline void i8214_device::check_interrupt()
// i8214_device - constructor
//-------------------------------------------------
-i8214_device::i8214_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+i8214_device::i8214_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, I8214, "I8214", tag, owner, clock, "i8214", __FILE__),
m_write_irq(*this),
m_write_enlg(*this)
@@ -127,7 +127,7 @@ UINT8 i8214_device::a_r()
{
UINT8 a = m_a & 0x07;
- if (LOG) logerror("I8214 '%s' A: %01x\n", tag(), a);
+ if (LOG) logerror("I8214 '%s' A: %01x\n", tag().c_str(), a);
return a;
}
@@ -141,7 +141,7 @@ void i8214_device::b_w(UINT8 data)
{
m_b = data & 0x07;
- if (LOG) logerror("I8214 '%s' B: %01x\n", tag(), m_b);
+ if (LOG) logerror("I8214 '%s' B: %01x\n", tag().c_str(), m_b);
// enable interrupts
m_int_dis = 0;
@@ -159,7 +159,7 @@ void i8214_device::b_w(UINT8 data)
void i8214_device::r_w(UINT8 data)
{
- if (LOG) logerror("I8214 '%s' R: %02x\n", tag(), data);
+ if (LOG) logerror("I8214 '%s' R: %02x\n", tag().c_str(), data);
m_r = data;
@@ -173,7 +173,7 @@ void i8214_device::r_w(UINT8 data)
WRITE_LINE_MEMBER( i8214_device::sgs_w )
{
- if (LOG) logerror("I8214 '%s' SGS: %u\n", tag(), state);
+ if (LOG) logerror("I8214 '%s' SGS: %u\n", tag().c_str(), state);
m_sgs = state;
@@ -187,7 +187,7 @@ WRITE_LINE_MEMBER( i8214_device::sgs_w )
WRITE_LINE_MEMBER( i8214_device::etlg_w )
{
- if (LOG) logerror("I8214 '%s' ETLG: %u\n", tag(), state);
+ if (LOG) logerror("I8214 '%s' ETLG: %u\n", tag().c_str(), state);
m_etlg = state;
}
@@ -199,7 +199,7 @@ WRITE_LINE_MEMBER( i8214_device::etlg_w )
WRITE_LINE_MEMBER( i8214_device::inte_w )
{
- if (LOG) logerror("I8214 '%s' INTE: %u\n", tag(), state);
+ if (LOG) logerror("I8214 '%s' INTE: %u\n", tag().c_str(), state);
m_inte = state;
}
diff --git a/src/devices/machine/i8214.h b/src/devices/machine/i8214.h
index 8a9c631bc76..d54726b83c9 100644
--- a/src/devices/machine/i8214.h
+++ b/src/devices/machine/i8214.h
@@ -52,7 +52,7 @@ class i8214_device : public device_t
{
public:
// construction/destruction
- i8214_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8214_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i8214_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_enlg_wr_callback(device_t &device, _Object object) { return downcast<i8214_device &>(device).m_write_enlg.set_callback(object); }
diff --git a/src/devices/machine/i8243.cpp b/src/devices/machine/i8243.cpp
index f63159b5739..72288c4d673 100644
--- a/src/devices/machine/i8243.cpp
+++ b/src/devices/machine/i8243.cpp
@@ -22,7 +22,7 @@ const device_type I8243 = &device_creator<i8243_device>;
// i8243_device - constructor
//-------------------------------------------------
-i8243_device::i8243_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8243_device::i8243_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8243, "8243 I/O Expander", tag, owner, clock, "i8243", __FILE__), m_p2out(0), m_p2(0), m_opcode(0), m_prog(0),
m_readhandler(*this),
m_writehandler(*this)
diff --git a/src/devices/machine/i8243.h b/src/devices/machine/i8243.h
index 5157056491d..169564f1d27 100644
--- a/src/devices/machine/i8243.h
+++ b/src/devices/machine/i8243.h
@@ -41,7 +41,7 @@ class i8243_device : public device_t
{
public:
// construction/destruction
- i8243_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8243_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_read_handler(device_t &device, _Object object) { return downcast<i8243_device &>(device).m_readhandler.set_callback(object); }
diff --git a/src/devices/machine/i8251.cpp b/src/devices/machine/i8251.cpp
index 8baf4bc57ec..f43c5fb2cab 100644
--- a/src/devices/machine/i8251.cpp
+++ b/src/devices/machine/i8251.cpp
@@ -37,7 +37,7 @@ const device_type V53_SCU = &device_creator<v53_scu_device>;
// i8251_device - constructor
//-------------------------------------------------
-i8251_device::i8251_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+i8251_device::i8251_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_serial_interface(mconfig, *this),
m_txd_handler(*this),
@@ -55,7 +55,7 @@ i8251_device::i8251_device(const machine_config &mconfig, device_type type, cons
{
}
-i8251_device::i8251_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8251_device::i8251_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8251, "8251 USART", tag, owner, clock, "i8251", __FILE__),
device_serial_interface(mconfig, *this),
m_txd_handler(*this),
@@ -73,7 +73,7 @@ i8251_device::i8251_device(const machine_config &mconfig, const char *tag, devic
{
}
-v53_scu_device::v53_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+v53_scu_device::v53_scu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: i8251_device(mconfig, V53_SCU, "V53 SCU", tag, owner, clock, "v53_scu")
{
}
diff --git a/src/devices/machine/i8251.h b/src/devices/machine/i8251.h
index 7a2f7ec55fd..c1f650a9db6 100644
--- a/src/devices/machine/i8251.h
+++ b/src/devices/machine/i8251.h
@@ -42,8 +42,8 @@ class i8251_device : public device_t,
{
public:
// construction/destruction
- i8251_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
- i8251_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8251_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
+ i8251_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast<i8251_device &>(device).m_txd_handler.set_callback(object); }
@@ -146,7 +146,7 @@ class v53_scu_device : public i8251_device
{
public:
// construction/destruction
- v53_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ v53_scu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/machine/i82541.cpp b/src/devices/machine/i82541.cpp
index 8e5a1467183..eb114c170db 100644
--- a/src/devices/machine/i82541.cpp
+++ b/src/devices/machine/i82541.cpp
@@ -13,7 +13,7 @@ ADDRESS_MAP_END
DEVICE_ADDRESS_MAP_START(registers_io_map, 32, i82541_device)
ADDRESS_MAP_END
-i82541_device::i82541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i82541_device::i82541_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I82541, "I82541 ethernet controller", tag, owner, clock, "i82541", __FILE__)
{
}
diff --git a/src/devices/machine/i82541.h b/src/devices/machine/i82541.h
index 475a94dc2be..02bc66fc459 100644
--- a/src/devices/machine/i82541.h
+++ b/src/devices/machine/i82541.h
@@ -12,7 +12,7 @@
class i82541_device : public pci_device {
public:
- i82541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82541_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/i8255.cpp b/src/devices/machine/i8255.cpp
index 7e6a769f904..df807a54a98 100644
--- a/src/devices/machine/i8255.cpp
+++ b/src/devices/machine/i8255.cpp
@@ -104,7 +104,7 @@ inline void i8255_device::check_interrupt(int port)
inline void i8255_device::set_ibf(int port, int state)
{
- if (LOG) logerror("I8255 '%s' Port %c IBF: %u\n", tag(), 'A' + port, state);
+ if (LOG) logerror("I8255 '%s' Port %c IBF: %u\n", tag().c_str(), 'A' + port, state);
m_ibf[port] = state;
@@ -118,7 +118,7 @@ inline void i8255_device::set_ibf(int port, int state)
inline void i8255_device::set_obf(int port, int state)
{
- if (LOG) logerror("I8255 '%s' Port %c OBF: %u\n", tag(), 'A' + port, state);
+ if (LOG) logerror("I8255 '%s' Port %c OBF: %u\n", tag().c_str(), 'A' + port, state);
m_obf[port] = state;
@@ -132,7 +132,7 @@ inline void i8255_device::set_obf(int port, int state)
inline void i8255_device::set_inte(int port, int state)
{
- if (LOG) logerror("I8255 '%s' Port %c INTE: %u\n", tag(), 'A' + port, state);
+ if (LOG) logerror("I8255 '%s' Port %c INTE: %u\n", tag().c_str(), 'A' + port, state);
m_inte[port] = state;
@@ -146,7 +146,7 @@ inline void i8255_device::set_inte(int port, int state)
inline void i8255_device::set_inte1(int state)
{
- if (LOG) logerror("I8255 '%s' Port A INTE1: %u\n", tag(), state);
+ if (LOG) logerror("I8255 '%s' Port A INTE1: %u\n", tag().c_str(), state);
m_inte1 = state;
@@ -160,7 +160,7 @@ inline void i8255_device::set_inte1(int state)
inline void i8255_device::set_inte2(int state)
{
- if (LOG) logerror("I8255 '%s' Port A INTE2: %u\n", tag(), state);
+ if (LOG) logerror("I8255 '%s' Port A INTE2: %u\n", tag().c_str(), state);
m_inte2 = state;
@@ -174,7 +174,7 @@ inline void i8255_device::set_inte2(int state)
inline void i8255_device::set_intr(int port, int state)
{
- if (LOG) logerror("I8255 '%s' Port %c INTR: %u\n", tag(), 'A' + port, state);
+ if (LOG) logerror("I8255 '%s' Port %c INTR: %u\n", tag().c_str(), 'A' + port, state);
m_intr[port] = state;
@@ -257,7 +257,7 @@ inline int i8255_device::port_c_upper_mode()
// i8255_device - constructor
//-------------------------------------------------
-i8255_device::i8255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8255_device::i8255_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8255, "8255 PPI", tag, owner, clock, "i8255", __FILE__),
m_in_pa_cb(*this),
m_in_pb_cb(*this),
@@ -660,12 +660,12 @@ void i8255_device::set_mode(UINT8 data)
if (LOG)
{
- logerror("I8255 '%s' Group A Mode: %u\n", tag(), group_mode(GROUP_A));
- logerror("I8255 '%s' Port A Mode: %s\n", tag(), (port_mode(PORT_A) == MODE_OUTPUT) ? "output" : "input");
- logerror("I8255 '%s' Port C Upper Mode: %s\n", tag(), (port_c_upper_mode() == MODE_OUTPUT) ? "output" : "input");
- logerror("I8255 '%s' Group B Mode: %u\n", tag(), group_mode(GROUP_B));
- logerror("I8255 '%s' Port B Mode: %s\n", tag(), (port_mode(PORT_B) == MODE_OUTPUT) ? "output" : "input");
- logerror("I8255 '%s' Port C Lower Mode: %s\n", tag(), (port_c_lower_mode() == MODE_OUTPUT) ? "output" : "input");
+ logerror("I8255 '%s' Group A Mode: %u\n", tag().c_str(), group_mode(GROUP_A));
+ logerror("I8255 '%s' Port A Mode: %s\n", tag().c_str(), (port_mode(PORT_A) == MODE_OUTPUT) ? "output" : "input");
+ logerror("I8255 '%s' Port C Upper Mode: %s\n", tag().c_str(), (port_c_upper_mode() == MODE_OUTPUT) ? "output" : "input");
+ logerror("I8255 '%s' Group B Mode: %u\n", tag().c_str(), group_mode(GROUP_B));
+ logerror("I8255 '%s' Port B Mode: %s\n", tag().c_str(), (port_mode(PORT_B) == MODE_OUTPUT) ? "output" : "input");
+ logerror("I8255 '%s' Port C Lower Mode: %s\n", tag().c_str(), (port_c_lower_mode() == MODE_OUTPUT) ? "output" : "input");
}
// group B
@@ -777,7 +777,7 @@ READ8_MEMBER( i8255_device::read )
case MODE_1: data = read_mode1(PORT_A); break;
case MODE_2: data = read_mode2(); break;
}
- if (LOG) logerror("I8255 '%s' Port A Read: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Port A Read: %02x\n", tag().c_str(), data);
break;
case PORT_B:
@@ -786,17 +786,17 @@ READ8_MEMBER( i8255_device::read )
case MODE_0: data = read_mode0(PORT_B); break;
case MODE_1: data = read_mode1(PORT_B); break;
}
- if (LOG) logerror("I8255 '%s' Port B Read: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Port B Read: %02x\n", tag().c_str(), data);
break;
case PORT_C:
data = read_pc();
- if (LOG) logerror("I8255 '%s' Port C Read: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Port C Read: %02x\n", tag().c_str(), data);
break;
case CONTROL:
data = m_control;
- if (LOG) logerror("I8255 '%s' Mode Control Word Read: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Mode Control Word Read: %02x\n", tag().c_str(), data);
break;
}
@@ -813,7 +813,7 @@ WRITE8_MEMBER( i8255_device::write )
switch (offset & 0x03)
{
case PORT_A:
- if (LOG) logerror("I8255 '%s' Port A Write: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Port A Write: %02x\n", tag().c_str(), data);
switch (group_mode(GROUP_A))
{
@@ -824,7 +824,7 @@ WRITE8_MEMBER( i8255_device::write )
break;
case PORT_B:
- if (LOG) logerror("I8255 '%s' Port B Write: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Port B Write: %02x\n", tag().c_str(), data);
switch (group_mode(GROUP_B))
{
@@ -834,7 +834,7 @@ WRITE8_MEMBER( i8255_device::write )
break;
case PORT_C:
- if (LOG) logerror("I8255 '%s' Port C Write: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Port C Write: %02x\n", tag().c_str(), data);
m_output[PORT_C] = data;
output_pc();
@@ -843,7 +843,7 @@ WRITE8_MEMBER( i8255_device::write )
case CONTROL:
if (data & CONTROL_MODE_SET)
{
- if (LOG) logerror("I8255 '%s' Mode Control Word: %02x\n", tag(), data);
+ if (LOG) logerror("I8255 '%s' Mode Control Word: %02x\n", tag().c_str(), data);
set_mode(data);
}
@@ -852,7 +852,7 @@ WRITE8_MEMBER( i8255_device::write )
int bit = (data >> 1) & 0x07;
int state = BIT(data, 0);
- if (LOG) logerror("I8255 '%s' %s Port C Bit %u\n", tag(), state ? "Set" : "Reset", bit);
+ if (LOG) logerror("I8255 '%s' %s Port C Bit %u\n", tag().c_str(), state ? "Set" : "Reset", bit);
set_pc_bit(bit, state);
}
@@ -928,7 +928,7 @@ WRITE_LINE_MEMBER( i8255_device::pc2_w )
// port B acknowledge
if (!m_obf[PORT_B] && !state)
{
- if (LOG) logerror("I8255 '%s' Port B Acknowledge\n", tag());
+ if (LOG) logerror("I8255 '%s' Port B Acknowledge\n", tag().c_str());
// clear output buffer flag
set_obf(PORT_B, 1);
@@ -939,7 +939,7 @@ WRITE_LINE_MEMBER( i8255_device::pc2_w )
// port B strobe
if (!m_ibf[PORT_B] && !state)
{
- if (LOG) logerror("I8255 '%s' Port B Strobe\n", tag());
+ if (LOG) logerror("I8255 '%s' Port B Strobe\n", tag().c_str());
// read port into latch
m_input[PORT_B] = m_in_pb_cb(0);
@@ -963,7 +963,7 @@ WRITE_LINE_MEMBER( i8255_device::pc4_w )
// port A strobe
if (!m_ibf[PORT_A] && !state)
{
- if (LOG) logerror("I8255 '%s' Port A Strobe\n", tag());
+ if (LOG) logerror("I8255 '%s' Port A Strobe\n", tag().c_str());
// read port into latch
m_input[PORT_A] = m_in_pa_cb(0);
@@ -986,7 +986,7 @@ WRITE_LINE_MEMBER( i8255_device::pc6_w )
// port A acknowledge
if (!m_obf[PORT_A] && !state)
{
- if (LOG) logerror("I8255 '%s' Port A Acknowledge\n", tag());
+ if (LOG) logerror("I8255 '%s' Port A Acknowledge\n", tag().c_str());
// clear output buffer flag
set_obf(PORT_A, 1);
diff --git a/src/devices/machine/i8255.h b/src/devices/machine/i8255.h
index 1fa41e727a5..3ea41d61cc0 100644
--- a/src/devices/machine/i8255.h
+++ b/src/devices/machine/i8255.h
@@ -68,7 +68,7 @@ class i8255_device : public device_t
{
public:
// construction/destruction
- i8255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8255_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_in_pa_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_in_pb_cb.set_callback(object); }
diff --git a/src/devices/machine/i8257.cpp b/src/devices/machine/i8257.cpp
index a54d21697cc..1a8ab36ad85 100644
--- a/src/devices/machine/i8257.cpp
+++ b/src/devices/machine/i8257.cpp
@@ -68,7 +68,7 @@ enum
inline void i8257_device::dma_request(int channel, int state)
{
- if (LOG) logerror("I8257 '%s' Channel %u DMA Request: %u\n", tag(), channel, state);
+ if (LOG) logerror("I8257 '%s' Channel %u DMA Request: %u\n", tag().c_str(), channel, state);
if (state)
{
@@ -183,7 +183,7 @@ inline void i8257_device::dma_write()
case MODE_TRANSFER_VERIFY: {
UINT8 v1 = m_in_memr_cb(offset);
if(0 && m_temp != v1)
- logerror("%s: verify error %02x vs. %02x\n", tag(), m_temp, v1);
+ logerror("%s: verify error %02x vs. %02x\n", tag().c_str(), m_temp, v1);
break;
}
@@ -257,7 +257,7 @@ inline void i8257_device::advance()
// i8257_device - constructor
//-------------------------------------------------
-i8257_device::i8257_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8257_device::i8257_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8257, "Intel 8257", tag, owner, clock, "i8257", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
@@ -597,7 +597,7 @@ WRITE8_MEMBER( i8257_device::write )
{
m_transfer_mode = data;
- if (LOG) logerror("I8257 '%s' Command Register: %02x\n", tag(), m_transfer_mode);
+ if (LOG) logerror("I8257 '%s' Command Register: %02x\n", tag().c_str(), m_transfer_mode);
}
trigger(1);
}
@@ -609,7 +609,7 @@ WRITE8_MEMBER( i8257_device::write )
WRITE_LINE_MEMBER( i8257_device::hlda_w )
{
- if (LOG) logerror("I8257 '%s' Hold Acknowledge: %u\n", tag(), state);
+ if (LOG) logerror("I8257 '%s' Hold Acknowledge: %u\n", tag().c_str(), state);
m_hack = state;
trigger(1);
@@ -622,7 +622,7 @@ WRITE_LINE_MEMBER( i8257_device::hlda_w )
WRITE_LINE_MEMBER( i8257_device::ready_w )
{
- if (LOG) logerror("I8257 '%s' Ready: %u\n", tag(), state);
+ if (LOG) logerror("I8257 '%s' Ready: %u\n", tag().c_str(), state);
m_ready = state;
}
diff --git a/src/devices/machine/i8257.h b/src/devices/machine/i8257.h
index ad02ece924e..1d313d935d2 100644
--- a/src/devices/machine/i8257.h
+++ b/src/devices/machine/i8257.h
@@ -101,7 +101,7 @@ class i8257_device : public device_t,
{
public:
// construction/destruction
- i8257_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8257_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/i8271.cpp b/src/devices/machine/i8271.cpp
index cd8c0faf5bf..71753101b7c 100644
--- a/src/devices/machine/i8271.cpp
+++ b/src/devices/machine/i8271.cpp
@@ -5,7 +5,7 @@
const device_type I8271 = &device_creator<i8271_device>;
-i8271_device::i8271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8271_device::i8271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8271, "Intel 8271", tag, owner, clock, "i8271", __FILE__), ready_connected(false), mode(0), main_phase(0),
intrq_cb(*this),
drq_cb(*this),
@@ -763,7 +763,7 @@ void i8271_device::start_command(int cmd)
}
case C_SPECIFY:
logerror("%s: command specify %02x %02x %02x %02x\n",
- tag(), command[1],
+ tag().c_str(), command[1],
command[2], command[3], command[4]);
switch(command[1]) {
case 0x0d:
@@ -885,7 +885,7 @@ void i8271_device::start_command(int cmd)
void i8271_device::command_end(floppy_info &fi, bool data_completion)
{
- logerror("%s: command done (%s) - %02x\n", tag(), data_completion ? "data" : "seek", rr);
+ logerror("%s: command done (%s) - %02x\n", tag().c_str(), data_completion ? "data" : "seek", rr);
fi.main_state = fi.sub_state = IDLE;
main_phase = PHASE_RESULT;
set_irq(true);
@@ -893,7 +893,7 @@ void i8271_device::command_end(floppy_info &fi, bool data_completion)
void i8271_device::recalibrate_start(floppy_info &fi)
{
- logerror("%s: command recalibrate\n", tag());
+ logerror("%s: command recalibrate\n", tag().c_str());
fi.main_state = RECALIBRATE;
fi.sub_state = SEEK_WAIT_STEP_TIME_DONE;
fi.dir = 1;
@@ -903,7 +903,7 @@ void i8271_device::recalibrate_start(floppy_info &fi)
void i8271_device::seek_start(floppy_info &fi)
{
- logerror("%s: command seek %d\n", tag(), command[1]);
+ logerror("%s: command seek %d\n", tag().c_str(), command[1]);
fi.main_state = SEEK;
fi.sub_state = SEEK_WAIT_STEP_TIME_DONE;
fi.dir = fi.pcn > command[1] ? 1 : 0;
@@ -984,7 +984,7 @@ void i8271_device::read_data_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command read%s data%s cmd=%02x crn=(%d, %d, %d) len=%02x rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x04 ? " deleted" : "",
command[0] & 0x01 ? " multi" : "",
command[0],
@@ -1013,7 +1013,7 @@ void i8271_device::scan_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command scan%s data%s cmd=%02x crn=(%d, %d, %d) len=%02x rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x04 ? " deleted" : "",
command[0] & 0x01 ? " multi" : "",
command[0],
@@ -1044,7 +1044,7 @@ void i8271_device::verify_data_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command verify%s data%s cmd=%02x crn=(%d, %d, %d) len=%02x rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x04 ? " deleted" : "",
command[0] & 0x01 ? " multi" : "",
command[0],
@@ -1129,7 +1129,7 @@ void i8271_device::read_data_continue(floppy_info &fi)
return;
}
logerror("%s: reading sector %02x %02x %02x %02x\n",
- tag(),
+ tag().c_str(),
cur_live.idbuf[0],
cur_live.idbuf[1],
cur_live.idbuf[2],
@@ -1183,7 +1183,7 @@ void i8271_device::write_data_start(floppy_info &fi)
fi.main_state = WRITE_DATA;
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command write%s data%s cmd=%02x crn=(%d, %d, %d) len=%02x rate=%d\n",
- tag(),
+ tag().c_str(),
command[0] & 0x04 ? " deleted" : "",
command[0] & 0x01 ? " multi" : "",
command[0],
@@ -1314,7 +1314,7 @@ void i8271_device::format_track_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command format track c=%02x n=%02x sc=%02x gap3=%02x gap5=%02x gap1=%02x\n",
- tag(),
+ tag().c_str(),
command[1], command[3] >> 5, command[3] & 0x1f, command[2], command[4], command[5]);
rr = ERR_NONE;
@@ -1381,7 +1381,7 @@ void i8271_device::format_track_continue(floppy_info &fi)
return;
case WAIT_INDEX_DONE:
- logerror("%s: index found, writing track\n", tag());
+ logerror("%s: index found, writing track\n", tag().c_str());
fi.sub_state = TRACK_DONE;
cur_live.pll.start_writing(machine().time());
set_drq(true);
@@ -1405,7 +1405,7 @@ void i8271_device::read_id_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command read id, rate=%d\n",
- tag(),
+ tag().c_str(),
cur_rate);
rr = ERR_NONE;
@@ -1688,7 +1688,7 @@ void i8271_device::live_write_fm(UINT8 fm)
bool i8271_device::sector_matches() const
{
if(0)
- logerror("%s: matching %02x %02x %02x - %02x %02x %02x\n", tag(),
+ logerror("%s: matching %02x %02x %02x - %02x %02x %02x\n", tag().c_str(),
cur_live.idbuf[0], cur_live.idbuf[2], cur_live.idbuf[3],
command[1], command[2], command[3] >> 5);
return
diff --git a/src/devices/machine/i8271.h b/src/devices/machine/i8271.h
index e4409bed389..eff03849a42 100644
--- a/src/devices/machine/i8271.h
+++ b/src/devices/machine/i8271.h
@@ -26,7 +26,7 @@
class i8271_device : public device_t
{
public:
- i8271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~i8271_device() {}
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<i8271_device &>(device).intrq_cb.set_callback(object); }
diff --git a/src/devices/machine/i8279.cpp b/src/devices/machine/i8279.cpp
index 725d1aa4827..99b4e7388a0 100644
--- a/src/devices/machine/i8279.cpp
+++ b/src/devices/machine/i8279.cpp
@@ -89,7 +89,7 @@ const device_type I8279 = &device_creator<i8279_device>;
// i8279_device - constructor
//-------------------------------------------------
-i8279_device::i8279_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8279_device::i8279_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8279, "8279 KDC", tag, owner, clock, "i8279", __FILE__),
m_out_irq_cb(*this),
m_out_sl_cb(*this),
@@ -440,7 +440,7 @@ WRITE8_MEMBER( i8279_device::cmd_w )
switch (cmd)
{
case 0:
- if (LOG) logerror("I8279 '%s' kb mode %x, display mode %x\n", tag(), data & 7, (data>>3) & 3);
+ if (LOG) logerror("I8279 '%s' kb mode %x, display mode %x\n", tag().c_str(), data & 7, (data>>3) & 3);
break;
case 1:
if (data > 1)
@@ -455,7 +455,7 @@ WRITE8_MEMBER( i8279_device::cmd_w )
{
m_autoinc = BIT(data, 4);
m_s_ram_ptr = data & 7;
- if (LOG) logerror("I8279 '%s' selct sensor row %x, AI %d\n", tag(), m_s_ram_ptr, m_autoinc);
+ if (LOG) logerror("I8279 '%s' selct sensor row %x, AI %d\n", tag().c_str(), m_s_ram_ptr, m_autoinc);
}
break;
case 3:
@@ -468,7 +468,7 @@ WRITE8_MEMBER( i8279_device::cmd_w )
m_autoinc = BIT(data, 4);
break;
case 6:
- if (LOG) logerror("I8279 '%s' clear cmd %x\n", tag(), data);
+ if (LOG) logerror("I8279 '%s' clear cmd %x\n", tag().c_str(), data);
clear_display();
break;
}
diff --git a/src/devices/machine/i8279.h b/src/devices/machine/i8279.h
index 3da46da3121..930a68bf953 100644
--- a/src/devices/machine/i8279.h
+++ b/src/devices/machine/i8279.h
@@ -74,7 +74,7 @@ class i8279_device : public device_t
{
public:
// construction/destruction
- i8279_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8279_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_sl_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_out_sl_cb.set_callback(object); }
diff --git a/src/devices/machine/i82875p.cpp b/src/devices/machine/i82875p.cpp
index 58f8b3264c9..0cace54a7db 100644
--- a/src/devices/machine/i82875p.cpp
+++ b/src/devices/machine/i82875p.cpp
@@ -41,12 +41,12 @@ DEVICE_ADDRESS_MAP_START(config_map, 32, i82875p_host_device)
AM_INHERIT_FROM(pci_host_device::config_map)
ADDRESS_MAP_END
-i82875p_host_device::i82875p_host_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i82875p_host_device::i82875p_host_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_host_device(mconfig, I82875P_HOST, "I82875P Northbridge", tag, owner, clock, "i82875p_host", __FILE__)
{
}
-void i82875p_host_device::set_cpu_tag(const char *_cpu_tag)
+void i82875p_host_device::set_cpu_tag(std::string _cpu_tag)
{
cpu_tag = _cpu_tag;
}
@@ -90,7 +90,7 @@ READ8_MEMBER( i82875p_host_device::agpm_r)
WRITE8_MEMBER( i82875p_host_device::agpm_w)
{
agpm = data;
- logerror("%s: agpm = %02x\n", tag(), agpm);
+ logerror("%s: agpm = %02x\n", tag().c_str(), agpm);
}
READ8_MEMBER( i82875p_host_device::gc_r)
@@ -126,7 +126,7 @@ READ8_MEMBER( i82875p_host_device::fpllcont_r)
WRITE8_MEMBER( i82875p_host_device::fpllcont_w)
{
fpllcont = data;
- logerror("%s: fpllcont = %02x\n", tag(), data);
+ logerror("%s: fpllcont = %02x\n", tag().c_str(), data);
}
READ8_MEMBER( i82875p_host_device::pam_r)
@@ -137,7 +137,7 @@ READ8_MEMBER( i82875p_host_device::pam_r)
WRITE8_MEMBER( i82875p_host_device::pam_w)
{
pam[offset] = data;
- logerror("%s: pam[%d] = %02x\n", tag(), offset, data);
+ logerror("%s: pam[%d] = %02x\n", tag().c_str(), offset, data);
remap_cb();
}
@@ -150,7 +150,7 @@ WRITE8_MEMBER( i82875p_host_device::smram_w)
{
if(!(smram & 0x10))
smram = (data & 0xfe) | 0x02;
- logerror("%s: smram = %02x\n", tag(), smram);
+ logerror("%s: smram = %02x\n", tag().c_str(), smram);
remap_cb();
}
@@ -163,7 +163,7 @@ WRITE8_MEMBER( i82875p_host_device::esmramc_w)
{
if(!(smram & 0x10))
esmramc = (data & 0x87) | 0x38;
- logerror("%s: esmramc = %02x\n", tag(), smram);
+ logerror("%s: esmramc = %02x\n", tag().c_str(), smram);
remap_cb();
}
@@ -190,7 +190,7 @@ READ32_MEMBER( i82875p_host_device::agpctrl_r)
WRITE32_MEMBER(i82875p_host_device::agpctrl_w)
{
COMBINE_DATA(&agpctrl);
- logerror("%s: agpctrl = %08x\n", tag(), agpctrl);
+ logerror("%s: agpctrl = %08x\n", tag().c_str(), agpctrl);
}
READ8_MEMBER( i82875p_host_device::apsize_r)
@@ -201,7 +201,7 @@ READ8_MEMBER( i82875p_host_device::apsize_r)
WRITE8_MEMBER( i82875p_host_device::apsize_w)
{
apsize = data;
- logerror("%s: apsize = %02x\n", tag(), apsize);
+ logerror("%s: apsize = %02x\n", tag().c_str(), apsize);
}
READ32_MEMBER( i82875p_host_device::attbase_r)
@@ -212,7 +212,7 @@ READ32_MEMBER( i82875p_host_device::attbase_r)
WRITE32_MEMBER(i82875p_host_device::attbase_w)
{
COMBINE_DATA(&attbase);
- logerror("%s: attbase = %08x\n", tag(), attbase);
+ logerror("%s: attbase = %08x\n", tag().c_str(), attbase);
}
READ8_MEMBER( i82875p_host_device::amtt_r)
@@ -244,7 +244,7 @@ WRITE16_MEMBER(i82875p_host_device::toud_w)
{
COMBINE_DATA(&toud);
toud &= ~7;
- logerror("%s: toud = %08x\n", tag(), toud << 16);
+ logerror("%s: toud = %08x\n", tag().c_str(), toud << 16);
remap_cb();
}
@@ -426,7 +426,7 @@ void i82875p_host_device::map_extra(UINT64 memory_window_start, UINT64 memory_wi
}
-i82875p_agp_device::i82875p_agp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i82875p_agp_device::i82875p_agp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: agp_bridge_device(mconfig, I82875P_AGP, "I82875P AGP Bridge", tag, owner, clock, "i82875p_agp", __FILE__)
{
}
@@ -449,7 +449,7 @@ DEVICE_ADDRESS_MAP_START(overflow_map, 32, i82875p_overflow_device)
ADDRESS_MAP_END
-i82875p_overflow_device::i82875p_overflow_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i82875p_overflow_device::i82875p_overflow_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I82875P_OVERFLOW, "I82875P Configuration Overflow", tag, owner, clock, "i82875p_overflow", __FILE__)
{
}
@@ -478,7 +478,7 @@ READ8_MEMBER (i82875p_overflow_device::dram_row_boundary_r)
WRITE8_MEMBER (i82875p_overflow_device::dram_row_boundary_w)
{
dram_row_boundary[offset] = data;
- logerror("%s: dram_row_boundary_w %d, %02x\n", tag(), offset, data);
+ logerror("%s: dram_row_boundary_w %d, %02x\n", tag().c_str(), offset, data);
}
READ8_MEMBER (i82875p_overflow_device::dram_row_attribute_r)
@@ -489,7 +489,7 @@ READ8_MEMBER (i82875p_overflow_device::dram_row_attribute_r)
WRITE8_MEMBER (i82875p_overflow_device::dram_row_attribute_w)
{
dram_row_attribute[offset] = data;
- logerror("%s: dram_row_attribute_w %d, %02x\n", tag(), offset, data);
+ logerror("%s: dram_row_attribute_w %d, %02x\n", tag().c_str(), offset, data);
}
READ32_MEMBER (i82875p_overflow_device::dram_timing_r)
@@ -500,7 +500,7 @@ READ32_MEMBER (i82875p_overflow_device::dram_timing_r)
WRITE32_MEMBER(i82875p_overflow_device::dram_timing_w)
{
COMBINE_DATA(&dram_timing);
- logerror("%s: dram_timing_w %08x\n", tag(), dram_timing);
+ logerror("%s: dram_timing_w %08x\n", tag().c_str(), dram_timing);
}
READ32_MEMBER (i82875p_overflow_device::dram_controller_mode_r)
@@ -511,5 +511,5 @@ READ32_MEMBER (i82875p_overflow_device::dram_controller_mode_r)
WRITE32_MEMBER(i82875p_overflow_device::dram_controller_mode_w)
{
COMBINE_DATA(&dram_controller_mode);
- logerror("%s: dram_controller_mode_w %08x\n", tag(), dram_controller_mode);
+ logerror("%s: dram_controller_mode_w %08x\n", tag().c_str(), dram_controller_mode);
}
diff --git a/src/devices/machine/i82875p.h b/src/devices/machine/i82875p.h
index 4f7723e64a7..7b437f53d6e 100644
--- a/src/devices/machine/i82875p.h
+++ b/src/devices/machine/i82875p.h
@@ -20,9 +20,9 @@
class i82875p_host_device : public pci_host_device {
public:
- i82875p_host_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82875p_host_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- void set_cpu_tag(const char *tag);
+ void set_cpu_tag(std::string tag);
void set_ram_size(int ram_size);
virtual void reset_all_mappings() override;
@@ -85,7 +85,7 @@ protected:
private:
DECLARE_ADDRESS_MAP(agp_translation_map, 32);
- const char *cpu_tag;
+ std::string cpu_tag;
int ram_size;
cpu_device *cpu;
std::vector<UINT32> ram;
@@ -98,7 +98,7 @@ private:
class i82875p_agp_device : public agp_bridge_device {
public:
- i82875p_agp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82875p_agp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -107,7 +107,7 @@ protected:
class i82875p_overflow_device : public pci_device {
public:
- i82875p_overflow_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82875p_overflow_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER (dram_row_boundary_r);
diff --git a/src/devices/machine/i8355.cpp b/src/devices/machine/i8355.cpp
index cf53a098a19..00b25ef09c5 100644
--- a/src/devices/machine/i8355.cpp
+++ b/src/devices/machine/i8355.cpp
@@ -92,7 +92,7 @@ inline void i8355_device::write_port(int port, UINT8 data)
// i8355_device - constructor
//-------------------------------------------------
-i8355_device::i8355_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i8355_device::i8355_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8355, "Intel 8355", tag, owner, clock, "i8355", __FILE__),
device_memory_interface(mconfig, *this),
m_in_pa_cb(*this),
@@ -184,14 +184,14 @@ WRITE8_MEMBER( i8355_device::io_w )
{
case REGISTER_PORT_A:
case REGISTER_PORT_B:
- if (LOG) logerror("I8355 '%s' Port %c Write %02x\n", tag(), 'A' + port, data);
+ if (LOG) logerror("I8355 '%s' Port %c Write %02x\n", tag().c_str(), 'A' + port, data);
write_port(port, data);
break;
case REGISTER_PORT_A_DDR:
case REGISTER_PORT_B_DDR:
- if (LOG) logerror("I8355 '%s' Port %c DDR: %02x\n", tag(), 'A' + port, data);
+ if (LOG) logerror("I8355 '%s' Port %c DDR: %02x\n", tag().c_str(), 'A' + port, data);
m_ddr[port] = data;
write_port(port, data);
diff --git a/src/devices/machine/i8355.h b/src/devices/machine/i8355.h
index 7337fa0193d..442275c0e31 100644
--- a/src/devices/machine/i8355.h
+++ b/src/devices/machine/i8355.h
@@ -73,7 +73,7 @@ class i8355_device : public device_t,
{
public:
// construction/destruction
- i8355_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i8355_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<i8355_device &>(device).m_in_pa_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<i8355_device &>(device).m_out_pa_cb.set_callback(object); }
diff --git a/src/devices/machine/idectrl.cpp b/src/devices/machine/idectrl.cpp
index 5be4dcd3d5a..4539c62b0d9 100644
--- a/src/devices/machine/idectrl.cpp
+++ b/src/devices/machine/idectrl.cpp
@@ -26,12 +26,12 @@
const device_type IDE_CONTROLLER = &device_creator<ide_controller_device>;
-ide_controller_device::ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ide_controller_device::ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
ata_interface_device(mconfig, IDE_CONTROLLER, "IDE Controller", tag, owner, clock, "ide_controller", __FILE__)
{
}
-ide_controller_device::ide_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ide_controller_device::ide_controller_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
ata_interface_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -89,12 +89,12 @@ WRITE16_MEMBER( ide_controller_device::write_cs1 )
const device_type IDE_CONTROLLER_32 = &device_creator<ide_controller_32_device>;
-ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
ide_controller_device(mconfig, IDE_CONTROLLER, "IDE Controller (32 bit)", tag, owner, clock, "ide_controller32", __FILE__)
{
}
-ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
ide_controller_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -168,7 +168,7 @@ WRITE32_MEMBER(ide_controller_32_device::write_cs1)
const device_type BUS_MASTER_IDE_CONTROLLER = &device_creator<bus_master_ide_controller_device>;
-bus_master_ide_controller_device::bus_master_ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bus_master_ide_controller_device::bus_master_ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
ide_controller_32_device(mconfig, BUS_MASTER_IDE_CONTROLLER, "Bus Master IDE Controller", tag, owner, clock, "bus_master_ide_controller", __FILE__),
m_dma_address(0),
m_dma_bytes_left(0),
@@ -191,10 +191,10 @@ void bus_master_ide_controller_device::device_start()
{
device_t *bmtarget = machine().device(m_bmcpu);
if (bmtarget == nullptr)
- throw emu_fatalerror("IDE controller '%s' bus master target '%s' doesn't exist!", tag(), m_bmcpu);
+ throw emu_fatalerror("IDE controller '%s' bus master target '%s' doesn't exist!", tag().c_str(), m_bmcpu);
device_memory_interface *memory;
if (!bmtarget->interface(memory))
- throw emu_fatalerror("IDE controller '%s' bus master target '%s' has no memory!", tag(), m_bmcpu);
+ throw emu_fatalerror("IDE controller '%s' bus master target '%s' has no memory!", tag().c_str(), m_bmcpu);
m_dma_space = &memory->space(m_bmspace);
m_dma_address_xor = (m_dma_space->endianness() == ENDIANNESS_LITTLE) ? 0 : 3;
}
diff --git a/src/devices/machine/idectrl.h b/src/devices/machine/idectrl.h
index 1d5a184b809..e250f1e3071 100644
--- a/src/devices/machine/idectrl.h
+++ b/src/devices/machine/idectrl.h
@@ -30,8 +30,8 @@
class ide_controller_device : public ata_interface_device
{
public:
- ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ide_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ide_controller_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual DECLARE_READ16_MEMBER(read_cs0) override;
virtual DECLARE_READ16_MEMBER(read_cs1) override;
@@ -53,8 +53,8 @@ extern const device_type IDE_CONTROLLER;
class ide_controller_32_device : public ide_controller_device
{
public:
- ide_controller_32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ide_controller_32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual DECLARE_READ32_MEMBER(read_cs0);
virtual DECLARE_READ32_MEMBER(read_cs1);
@@ -85,7 +85,7 @@ extern const device_type IDE_CONTROLLER_32;
class bus_master_ide_controller_device : public ide_controller_32_device
{
public:
- bus_master_ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bus_master_ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_bus_master_space(device_t &device, const char *bmcpu, UINT32 bmspace) {bus_master_ide_controller_device &ide = downcast<bus_master_ide_controller_device &>(device); ide.m_bmcpu = bmcpu; ide.m_bmspace = bmspace; }
DECLARE_READ32_MEMBER( bmdma_r );
diff --git a/src/devices/machine/idehd.cpp b/src/devices/machine/idehd.cpp
index c563ff3c6e6..95e6f75dab0 100644
--- a/src/devices/machine/idehd.cpp
+++ b/src/devices/machine/idehd.cpp
@@ -21,7 +21,7 @@
#define TIME_FULL_STROKE_SEEK (attotime::from_usec(13000))
#define TIME_AVERAGE_ROTATIONAL_LATENCY (attotime::from_usec(1300))
-ata_mass_storage_device::ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
+ata_mass_storage_device::ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
: ata_hle_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_can_identify_device(0),
m_num_cylinders(0),
@@ -748,13 +748,13 @@ const device_type IDE_HARDDISK = &device_creator<ide_hdd_device>;
// ide_hdd_device - constructor
//-------------------------------------------------
-ide_hdd_device::ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ide_hdd_device::ide_hdd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ata_mass_storage_device(mconfig, IDE_HARDDISK, "IDE Hard Disk", tag, owner, clock, "hdd", __FILE__),
m_image(*this, "image")
{
}
-ide_hdd_device::ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ide_hdd_device::ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: ata_mass_storage_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_image(*this, "image")
{
diff --git a/src/devices/machine/idehd.h b/src/devices/machine/idehd.h
index 8acc9e14474..b05895d50d4 100644
--- a/src/devices/machine/idehd.h
+++ b/src/devices/machine/idehd.h
@@ -20,7 +20,7 @@
class ata_mass_storage_device : public ata_hle_device
{
public:
- ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
UINT16 *identify_device_buffer() { return m_identify_buffer; }
@@ -87,8 +87,8 @@ class ide_hdd_device : public ata_mass_storage_device
{
public:
// construction/destruction
- ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ide_hdd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
diff --git a/src/devices/machine/im6402.cpp b/src/devices/machine/im6402.cpp
index f713a048517..82c9bfe794d 100644
--- a/src/devices/machine/im6402.cpp
+++ b/src/devices/machine/im6402.cpp
@@ -75,7 +75,7 @@ inline void im6402_device::set_tre(int state)
// im6402_device - constructor
//-------------------------------------------------
-im6402_device::im6402_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+im6402_device::im6402_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, IM6402, "Intersil IM6402", tag, owner, clock, "im6402", __FILE__),
device_serial_interface(mconfig, *this),
m_write_tro(*this),
@@ -184,7 +184,7 @@ void im6402_device::tra_complete()
{
if (!m_tbre)
{
- if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag(), m_tbr);
+ if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag().c_str(), m_tbr);
transmit_register_setup(m_tbr);
@@ -212,7 +212,7 @@ void im6402_device::rcv_complete()
receive_register_extract();
m_rbr = get_received_char();
- if (LOG) logerror("IM6402 '%s' Receive Data %02x\n", tag(), m_rbr);
+ if (LOG) logerror("IM6402 '%s' Receive Data %02x\n", tag().c_str(), m_rbr);
if (m_dr)
{
@@ -229,13 +229,13 @@ void im6402_device::rcv_complete()
WRITE8_MEMBER( im6402_device::write )
{
- if (LOG) logerror("IM6402 '%s' Transmit Buffer Register %02x\n", tag(), data);
+ if (LOG) logerror("IM6402 '%s' Transmit Buffer Register %02x\n", tag().c_str(), data);
m_tbr = data;
if (is_transmit_register_empty())
{
- if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag(), m_tbr);
+ if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag().c_str(), m_tbr);
transmit_register_setup(m_tbr);
@@ -329,7 +329,7 @@ WRITE_LINE_MEMBER( im6402_device::crl_w )
{
if (state)
{
- if (LOG) logerror("IM6402 '%s' Control Register Load\n", tag());
+ if (LOG) logerror("IM6402 '%s' Control Register Load\n", tag().c_str());
int data_bit_count = 5 + ((m_cls2 << 1) | m_cls1);
stop_bits_t stop_bits = (m_sbs ? ((data_bit_count == 5) ? STOP_BITS_1_5 : STOP_BITS_2) : STOP_BITS_1);
@@ -350,7 +350,7 @@ WRITE_LINE_MEMBER( im6402_device::crl_w )
WRITE_LINE_MEMBER( im6402_device::pi_w )
{
- if (LOG) logerror("IM6402 '%s' Parity Inhibit %u\n", tag(), state);
+ if (LOG) logerror("IM6402 '%s' Parity Inhibit %u\n", tag().c_str(), state);
m_pi = state;
}
@@ -362,7 +362,7 @@ WRITE_LINE_MEMBER( im6402_device::pi_w )
WRITE_LINE_MEMBER( im6402_device::sbs_w )
{
- if (LOG) logerror("IM6402 '%s' Stop Bit Select %u\n", tag(), state);
+ if (LOG) logerror("IM6402 '%s' Stop Bit Select %u\n", tag().c_str(), state);
m_sbs = state;
}
@@ -374,7 +374,7 @@ WRITE_LINE_MEMBER( im6402_device::sbs_w )
WRITE_LINE_MEMBER( im6402_device::cls1_w )
{
- if (LOG) logerror("IM6402 '%s' Character Length Select 1 %u\n", tag(), state);
+ if (LOG) logerror("IM6402 '%s' Character Length Select 1 %u\n", tag().c_str(), state);
m_cls1 = state;
}
@@ -386,7 +386,7 @@ WRITE_LINE_MEMBER( im6402_device::cls1_w )
WRITE_LINE_MEMBER( im6402_device::cls2_w )
{
- if (LOG) logerror("IM6402 '%s' Character Length Select 2 %u\n", tag(), state);
+ if (LOG) logerror("IM6402 '%s' Character Length Select 2 %u\n", tag().c_str(), state);
m_cls2 = state;
}
@@ -398,7 +398,7 @@ WRITE_LINE_MEMBER( im6402_device::cls2_w )
WRITE_LINE_MEMBER( im6402_device::epe_w )
{
- if (LOG) logerror("IM6402 '%s' Even Parity Enable %u\n", tag(), state);
+ if (LOG) logerror("IM6402 '%s' Even Parity Enable %u\n", tag().c_str(), state);
m_epe = state;
}
diff --git a/src/devices/machine/im6402.h b/src/devices/machine/im6402.h
index 05f0b33861a..f8cdae7946a 100644
--- a/src/devices/machine/im6402.h
+++ b/src/devices/machine/im6402.h
@@ -79,7 +79,7 @@ class im6402_device : public device_t,
{
public:
// construction/destruction
- im6402_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ im6402_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_rrc(device_t &device, int rrc) { downcast<im6402_device &>(device).m_rrc = rrc; }
static void set_trc(device_t &device, int trc) { downcast<im6402_device &>(device).m_trc = trc; }
diff --git a/src/devices/machine/ins8154.cpp b/src/devices/machine/ins8154.cpp
index 7c192ac66e0..f3d273c365c 100644
--- a/src/devices/machine/ins8154.cpp
+++ b/src/devices/machine/ins8154.cpp
@@ -42,7 +42,7 @@ const device_type INS8154 = &device_creator<ins8154_device>;
// ins8154_device - constructor
//-------------------------------------------------
-ins8154_device::ins8154_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ins8154_device::ins8154_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, INS8154, "INS8154 RAM I/O", tag, owner, clock, "ins8154", __FILE__),
m_in_a_cb(*this),
m_out_a_cb(*this),
@@ -100,7 +100,7 @@ READ8_MEMBER(ins8154_device::ins8154_r)
{
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' Read from invalid offset %02x!\n", machine().describe_context(), tag(), offset);
+ logerror("%s: INS8154 '%s' Read from invalid offset %02x!\n", machine().describe_context(), tag().c_str(), offset);
}
return 0xff;
}
@@ -174,7 +174,7 @@ WRITE8_MEMBER(ins8154_device::ins8154_w)
{
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' Write %02x to invalid offset %02x!\n", machine().describe_context(), tag(), data, offset);
+ logerror("%s: INS8154 '%s' Write %02x to invalid offset %02x!\n", machine().describe_context(), tag().c_str(), data, offset);
}
return;
}
@@ -192,7 +192,7 @@ WRITE8_MEMBER(ins8154_device::ins8154_w)
case 0x22:
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' ODRA set to %02x\n", machine().describe_context(), tag(), data);
+ logerror("%s: INS8154 '%s' ODRA set to %02x\n", machine().describe_context(), tag().c_str(), data);
}
m_odra = data;
@@ -201,7 +201,7 @@ WRITE8_MEMBER(ins8154_device::ins8154_w)
case 0x23:
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' ODRB set to %02x\n", machine().describe_context(), tag(), data);
+ logerror("%s: INS8154 '%s' ODRB set to %02x\n", machine().describe_context(), tag().c_str(), data);
}
m_odrb = data;
@@ -210,7 +210,7 @@ WRITE8_MEMBER(ins8154_device::ins8154_w)
case 0x24:
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' MDR set to %02x\n", machine().describe_context(), tag(), data);
+ logerror("%s: INS8154 '%s' MDR set to %02x\n", machine().describe_context(), tag().c_str(), data);
}
m_mdr = data;
diff --git a/src/devices/machine/ins8154.h b/src/devices/machine/ins8154.h
index 6a38a840c89..32f1eb27c52 100644
--- a/src/devices/machine/ins8154.h
+++ b/src/devices/machine/ins8154.h
@@ -68,7 +68,7 @@ class ins8154_device : public device_t
{
public:
// construction/destruction
- ins8154_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ins8154_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_in_a_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_in_a_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_a_callback(device_t &device, _Object object) { return downcast<ins8154_device &>(device).m_out_a_cb.set_callback(object); }
diff --git a/src/devices/machine/ins8250.cpp b/src/devices/machine/ins8250.cpp
index bbd0fee1584..7d6aa2a84e5 100644
--- a/src/devices/machine/ins8250.cpp
+++ b/src/devices/machine/ins8250.cpp
@@ -91,7 +91,7 @@ const device_type NS16450 = &device_creator<ns16450_device>;
const device_type NS16550 = &device_creator<ns16550_device>;
const device_type PC16552D = &device_creator<pc16552_device>;
-ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_serial_interface(mconfig, *this),
m_out_tx_cb(*this),
@@ -109,25 +109,25 @@ ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_t
m_regs.ier = 0;
}
-ins8250_device::ins8250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ins8250_device::ins8250_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ins8250_uart_device(mconfig, INS8250, "National Semiconductor INS8250", tag, owner, clock, "ins8250")
{
m_device_type = TYPE_INS8250;
}
-ns16450_device::ns16450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ns16450_device::ns16450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ins8250_uart_device(mconfig, NS16450, "National Semiconductor NS16450", tag, owner, clock, "ns16450")
{
m_device_type = TYPE_NS16450;
}
-ns16550_device::ns16550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ns16550_device::ns16550_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: ins8250_uart_device(mconfig, NS16550, "National Semiconductor NS16550", tag, owner, clock, "ns16550")
{
m_device_type = TYPE_NS16550;
}
-pc16552_device::pc16552_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc16552_device::pc16552_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PC16552D, "National Semiconductor PC16552D", tag, owner, clock, "pc16552d", __FILE__)
{
}
diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h
index 547c3dea602..af5c08dba15 100644
--- a/src/devices/machine/ins8250.h
+++ b/src/devices/machine/ins8250.h
@@ -19,7 +19,7 @@ class ins8250_uart_device : public device_t,
public device_serial_interface
{
public:
- ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_tx_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_dtr_cb.set_callback(object); }
@@ -96,19 +96,19 @@ private:
class ins8250_device : public ins8250_uart_device
{
public:
- ins8250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ins8250_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class ns16450_device : public ins8250_uart_device
{
public:
- ns16450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ns16450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class ns16550_device : public ins8250_uart_device
{
public:
- ns16550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ns16550_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
virtual void device_reset() override;
@@ -131,7 +131,7 @@ private:
class pc16552_device : public device_t
{
public:
- pc16552_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc16552_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(read) { return ((offset & 8) ? m_chan1 : m_chan0)->ins8250_r(space, offset & 7, mem_mask); }
DECLARE_WRITE8_MEMBER(write) { ((offset & 8) ? m_chan1 : m_chan0)->ins8250_w(space, offset & 7, data, mem_mask); }
diff --git a/src/devices/machine/intelfsh.cpp b/src/devices/machine/intelfsh.cpp
index 9fdc04609c1..dab6d007b86 100644
--- a/src/devices/machine/intelfsh.cpp
+++ b/src/devices/machine/intelfsh.cpp
@@ -160,7 +160,7 @@ ADDRESS_MAP_END
// intelfsh_device - constructor
//-------------------------------------------------
-intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -390,94 +390,94 @@ intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type
m_space_config = address_space_config("flash", ENDIANNESS_BIG, m_bits, addrbits, (m_bits == 8) ? 0 : -1, map);
}
-intelfsh8_device::intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+intelfsh8_device::intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: intelfsh_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
-intelfsh16_device::intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+intelfsh16_device::intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: intelfsh_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
-intel_28f016s5_device::intel_28f016s5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intel_28f016s5_device::intel_28f016s5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, INTEL_28F016S5, "Intel 28F016S5 Flash", tag, owner, clock, FLASH_INTEL_28F016S5, "intel_28f016s5", __FILE__) { }
-fujitsu_29f160t_device::fujitsu_29f160t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fujitsu_29f160t_device::fujitsu_29f160t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29F160T, "Fujitsu 29F160 Flash", tag, owner, clock, FLASH_FUJITSU_29F160T, "fujitsu_29f160t", __FILE__) { }
-fujitsu_29f016a_device::fujitsu_29f016a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fujitsu_29f016a_device::fujitsu_29f016a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29F016A, "Fujitsu 29F016A Flash", tag, owner, clock, FLASH_FUJITSU_29F016A, "fujitsu_29f016a", __FILE__) { }
-fujitsu_29dl16x_device::fujitsu_29dl16x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fujitsu_29dl16x_device::fujitsu_29dl16x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29DL16X, "Fujitsu 29DL16X Flash", tag, owner, clock, FLASH_FUJITSU_29DL16X, "fujitsu_29dl16x", __FILE__) { }
-sharp_lh28f016s_device::sharp_lh28f016s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sharp_lh28f016s_device::sharp_lh28f016s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, SHARP_LH28F016S, "Sharp LH28F016S Flash", tag, owner, clock, FLASH_SHARP_LH28F016S, "sharp_lh28f016s", __FILE__) { }
-atmel_29c010_device::atmel_29c010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+atmel_29c010_device::atmel_29c010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, ATMEL_29C010, "Atmel 29C010 Flash", tag, owner, clock, FLASH_ATMEL_29C010, "atmel_29c010", __FILE__) { }
-amd_29f010_device::amd_29f010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amd_29f010_device::amd_29f010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F010, "AMD 29F010 Flash", tag, owner, clock, FLASH_AMD_29F010, "amd_29f010", __FILE__) { }
-amd_29f040_device::amd_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amd_29f040_device::amd_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F040, "AMD 29F040 Flash", tag, owner, clock, FLASH_AMD_29F040, "amd_29f040", __FILE__) { }
-amd_29f080_device::amd_29f080_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amd_29f080_device::amd_29f080_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F080, "AMD 29F080 Flash", tag, owner, clock, FLASH_AMD_29F080, "amd_29f080", __FILE__) { }
-amd_29f400t_device::amd_29f400t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amd_29f400t_device::amd_29f400t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F400T, "AMD 29F400 Flash", tag, owner, clock, FLASH_AMD_29F400T, "amd_29f400t", __FILE__) { }
-amd_29f800t_device::amd_29f800t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amd_29f800t_device::amd_29f800t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F800T, "AMD 29F800 Flash", tag, owner, clock, FLASH_AMD_29F800T, "amd_29f800t", __FILE__) { }
-amd_29lv200t_device::amd_29lv200t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amd_29lv200t_device::amd_29lv200t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29LV200T, "AMD 29LV200T Flash", tag, owner, clock, FLASH_AMD_29LV200T, "amd_29lv200t", __FILE__) { }
-intel_e28f008sa_device::intel_e28f008sa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intel_e28f008sa_device::intel_e28f008sa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, INTEL_E28F008SA, "Intel E28F008SA Flash", tag, owner, clock, FLASH_INTEL_E28F008SA, "intel_e28f008sa", __FILE__) { }
-macronix_29l001mc_device::macronix_29l001mc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+macronix_29l001mc_device::macronix_29l001mc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, MACRONIX_29L001MC, "Macronix 29L001MC Flash", tag, owner, clock, FLASH_MACRONIX_29L001MC, "macronix_29l001mc", __FILE__) { }
-macronix_29lv160tmc_device::macronix_29lv160tmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+macronix_29lv160tmc_device::macronix_29lv160tmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, MACRONIX_29LV160TMC, "Macronix 29LV160TMC Flash", tag, owner, clock, FLASH_MACRONIX_29LV160TMC, "macronix_29lv160tmc", __FILE__) { }
-panasonic_mn63f805mnp_device::panasonic_mn63f805mnp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+panasonic_mn63f805mnp_device::panasonic_mn63f805mnp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, PANASONIC_MN63F805MNP, "Panasonic MN63F805MNP Flash", tag, owner, clock, FLASH_PANASONIC_MN63F805MNP, "panasonic_mn63f805mnp", __FILE__) { }
-sanyo_le26fv10n1ts_device::sanyo_le26fv10n1ts_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sanyo_le26fv10n1ts_device::sanyo_le26fv10n1ts_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, SANYO_LE26FV10N1TS, "Sanyo LE26FV10N1TS Flash", tag, owner, clock, FLASH_SANYO_LE26FV10N1TS, "sanyo_le26fv10n1ts", __FILE__) { }
-sst_28sf040_device::sst_28sf040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sst_28sf040_device::sst_28sf040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, SST_28SF040, "SST 28SF040 Flash", tag, owner, clock, FLASH_SST_28SF040, "sst_28sf040", __FILE__) { }
-sst_39vf020_device::sst_39vf020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sst_39vf020_device::sst_39vf020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, SST_39VF020, "SST 39VF020 Flash", tag, owner, clock, FLASH_SST_39VF020, "sst_39vf020", __FILE__) { }
-sharp_lh28f400_device::sharp_lh28f400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sharp_lh28f400_device::sharp_lh28f400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, SHARP_LH28F400, "Sharp LH28F400 Flash", tag, owner, clock, FLASH_SHARP_LH28F400, "sharp_lh28f400", __FILE__) { }
-intel_te28f160_device::intel_te28f160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intel_te28f160_device::intel_te28f160_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, INTEL_TE28F160, "Intel TE28F160 Flash", tag, owner, clock, FLASH_INTEL_TE28F160, "intel_te28f160", __FILE__) { }
-intel_e28f400b_device::intel_e28f400b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intel_e28f400b_device::intel_e28f400b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, INTEL_E28F400B, "Intel E28F400B Flash", tag, owner, clock, FLASH_INTEL_E28F400B, "intel_e28f400b", __FILE__) { }
-sharp_unk128mbit_device::sharp_unk128mbit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sharp_unk128mbit_device::sharp_unk128mbit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, SHARP_UNK128MBIT, "Sharp Unknown 128Mbit Flash", tag, owner, clock, FLASH_SHARP_UNK128MBIT, "sharp_unk128mbit", __FILE__) { }
-intel_28f320j3d_device::intel_28f320j3d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intel_28f320j3d_device::intel_28f320j3d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, INTEL_28F320J3D, "Intel 28F320J3D Flash", tag, owner, clock, FLASH_INTEL_28F320J3D, "intel_28f320j3d", __FILE__) { }
-intel_28f320j5_device::intel_28f320j5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intel_28f320j5_device::intel_28f320j5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, INTEL_28F320J5, "Intel 28F320J3D_a Flash", tag, owner, clock, FLASH_INTEL_28F320J5, "intel_28f320j5", __FILE__) { }
-sst_39vf400a_device::sst_39vf400a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sst_39vf400a_device::sst_39vf400a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, SST_39VF400A, "SST 39VF400A Flash", tag, owner, clock, FLASH_SST_39VF400A, "sst_39vf400a", __FILE__) { }
-tms_29f040_device::tms_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tms_29f040_device::tms_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, TMS_29F040, "Texas Instruments 29F040 Flash", tag, owner, clock, FLASH_TMS_29F040, "tms_29f040", __FILE__) { }
//-------------------------------------------------
diff --git a/src/devices/machine/intelfsh.h b/src/devices/machine/intelfsh.h
index c52856e0cef..6eba1d73023 100644
--- a/src/devices/machine/intelfsh.h
+++ b/src/devices/machine/intelfsh.h
@@ -143,7 +143,7 @@ public:
protected:
// construction/destruction
- intelfsh_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ intelfsh_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -192,7 +192,7 @@ class intelfsh8_device : public intelfsh_device
{
protected:
// construction/destruction
- intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
public:
// public interface
@@ -212,7 +212,7 @@ class intelfsh16_device : public intelfsh_device
{
protected:
// construction/destruction
- intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
public:
// public interface
@@ -232,164 +232,164 @@ public:
class intel_28f016s5_device : public intelfsh8_device
{
public:
- intel_28f016s5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intel_28f016s5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fujitsu_29f160t_device : public intelfsh8_device
{
public:
- fujitsu_29f160t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fujitsu_29f160t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fujitsu_29f016a_device : public intelfsh8_device
{
public:
- fujitsu_29f016a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fujitsu_29f016a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class fujitsu_29dl16x_device : public intelfsh8_device
{
public:
- fujitsu_29dl16x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fujitsu_29dl16x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class atmel_29c010_device : public intelfsh8_device
{
public:
- atmel_29c010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ atmel_29c010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amd_29f010_device : public intelfsh8_device
{
public:
- amd_29f010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amd_29f010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amd_29f040_device : public intelfsh8_device
{
public:
- amd_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amd_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amd_29f080_device : public intelfsh8_device
{
public:
- amd_29f080_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amd_29f080_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amd_29f400t_device : public intelfsh8_device
{
public:
- amd_29f400t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amd_29f400t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amd_29f800t_device : public intelfsh8_device
{
public:
- amd_29f800t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amd_29f800t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class amd_29lv200t_device : public intelfsh8_device
{
public:
- amd_29lv200t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amd_29lv200t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sharp_lh28f016s_device : public intelfsh8_device
{
public:
- sharp_lh28f016s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sharp_lh28f016s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class intel_e28f008sa_device : public intelfsh8_device
{
public:
- intel_e28f008sa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intel_e28f008sa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class macronix_29l001mc_device : public intelfsh8_device
{
public:
- macronix_29l001mc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ macronix_29l001mc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class macronix_29lv160tmc_device : public intelfsh8_device
{
public:
- macronix_29lv160tmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ macronix_29lv160tmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class panasonic_mn63f805mnp_device : public intelfsh8_device
{
public:
- panasonic_mn63f805mnp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ panasonic_mn63f805mnp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sanyo_le26fv10n1ts_device : public intelfsh8_device
{
public:
- sanyo_le26fv10n1ts_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sanyo_le26fv10n1ts_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sst_28sf040_device : public intelfsh8_device
{
public:
- sst_28sf040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sst_28sf040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sst_39vf020_device : public intelfsh8_device
{
public:
- sst_39vf020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sst_39vf020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class tms_29f040_device : public intelfsh8_device
{
public:
- tms_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
// 16-bit variants
class sharp_lh28f400_device : public intelfsh16_device
{
public:
- sharp_lh28f400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sharp_lh28f400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class intel_te28f160_device : public intelfsh16_device
{
public:
- intel_te28f160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intel_te28f160_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class intel_e28f400b_device : public intelfsh16_device
{
public:
- intel_e28f400b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intel_e28f400b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sharp_unk128mbit_device : public intelfsh16_device
{
public:
- sharp_unk128mbit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sharp_unk128mbit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class intel_28f320j3d_device : public intelfsh16_device
{
public:
- intel_28f320j3d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intel_28f320j3d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class intel_28f320j5_device : public intelfsh16_device
{
public:
- intel_28f320j5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intel_28f320j5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
class sst_39vf400a_device : public intelfsh16_device
{
public:
- sst_39vf400a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sst_39vf400a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/machine/jvsdev.cpp b/src/devices/machine/jvsdev.cpp
index c70f8a9fce6..e5884362f62 100644
--- a/src/devices/machine/jvsdev.cpp
+++ b/src/devices/machine/jvsdev.cpp
@@ -9,7 +9,7 @@ void jvs_device::static_set_jvs_host_tag(device_t &device, const char *jvs_host_
jvsdev.jvs_host_tag = jvs_host_tag;
}
-jvs_device::jvs_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+jvs_device::jvs_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source), jvs_outputs(0), jvs_address(0), jvs_reset_counter(0)
{
jvs_host_tag = nullptr;
@@ -195,7 +195,7 @@ void jvs_device::device_start()
{
jvs_host *host = machine().device<jvs_host>(jvs_host_tag);
if(!host)
- fatalerror("JVS device %s could not find JVS host %s\n", tag(), jvs_host_tag);
+ fatalerror("JVS device %s could not find JVS host %s\n", tag().c_str(), jvs_host_tag);
host->add_device(this);
save_item(NAME(jvs_address));
diff --git a/src/devices/machine/jvsdev.h b/src/devices/machine/jvsdev.h
index 22a95e2b1a7..70ab6e65345 100644
--- a/src/devices/machine/jvsdev.h
+++ b/src/devices/machine/jvsdev.h
@@ -13,7 +13,7 @@ class jvs_host;
class jvs_device : public device_t
{
public:
- jvs_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ jvs_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static void static_set_jvs_host_tag(device_t &device, const char *jvs_host_tag);
void chain(jvs_device *dev);
diff --git a/src/devices/machine/jvshost.cpp b/src/devices/machine/jvshost.cpp
index bca7f7c618c..6acb113bf5d 100644
--- a/src/devices/machine/jvshost.cpp
+++ b/src/devices/machine/jvshost.cpp
@@ -28,7 +28,7 @@ void jvs_host::device_reset()
memset(recv_buffer, 0, sizeof(recv_buffer));
}
-jvs_host::jvs_host(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+jvs_host::jvs_host(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source), send_size(0), recv_size(0), recv_is_encoded(false)
{
first_device = nullptr;
diff --git a/src/devices/machine/jvshost.h b/src/devices/machine/jvshost.h
index a52c2d0fdf0..4f66e46dccc 100644
--- a/src/devices/machine/jvshost.h
+++ b/src/devices/machine/jvshost.h
@@ -9,7 +9,7 @@ class jvs_device;
class jvs_host : public device_t {
public:
- jvs_host(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ jvs_host(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void add_device(jvs_device *dev);
diff --git a/src/devices/machine/k033906.cpp b/src/devices/machine/k033906.cpp
index bd32fef29f1..8ea467cb4df 100644
--- a/src/devices/machine/k033906.cpp
+++ b/src/devices/machine/k033906.cpp
@@ -22,8 +22,8 @@ const device_type K033906 = &device_creator<k033906_device>;
// k033906_device - constructor
//-------------------------------------------------
-k033906_device::k033906_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, K033906, "K033906 PCI bridge", tag, owner, clock, "k033906", __FILE__), m_reg_set(0), m_voodoo_tag(nullptr), m_voodoo(nullptr)
+k033906_device::k033906_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ : device_t(mconfig, K033906, "K033906 PCI bridge", tag, owner, clock, "k033906", __FILE__), m_reg_set(0), m_voodoo(nullptr)
{
}
diff --git a/src/devices/machine/k033906.h b/src/devices/machine/k033906.h
index aa2c685df99..a2a51370045 100644
--- a/src/devices/machine/k033906.h
+++ b/src/devices/machine/k033906.h
@@ -33,9 +33,9 @@ class k033906_device : public device_t
{
public:
// construction/destruction
- k033906_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k033906_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- static void set_voodoo_tag(device_t &device, const char *tag) { downcast<k033906_device &>(device).m_voodoo_tag = tag; }
+ static void set_voodoo_tag(device_t &device, std::string tag) { downcast<k033906_device &>(device).m_voodoo_tag = tag; }
DECLARE_READ32_MEMBER( read );
DECLARE_WRITE32_MEMBER( write );
@@ -57,7 +57,7 @@ private:
int m_reg_set; // 1 = access reg / 0 = access ram
- const char *m_voodoo_tag;
+ std::string m_voodoo_tag;
device_t *m_voodoo;
UINT32 m_reg[256];
diff --git a/src/devices/machine/k053252.cpp b/src/devices/machine/k053252.cpp
index 45020926ace..0ac6da4c957 100644
--- a/src/devices/machine/k053252.cpp
+++ b/src/devices/machine/k053252.cpp
@@ -65,7 +65,7 @@ TODO:
const device_type K053252 = &device_creator<k053252_device>;
-k053252_device::k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+k053252_device::k053252_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K053252, "K053252 Timing/Interrupt", tag, owner, clock, "k053252", __FILE__),
device_video_interface(mconfig, *this),
m_int1_en_cb(*this),
@@ -76,7 +76,6 @@ k053252_device::k053252_device(const machine_config &mconfig, const char *tag, d
m_offsx(0),
m_offsy(0),
// ugly, needed to work with the rungun etc. video demux board
- m_slave_screen_tag(nullptr),
m_slave_screen(nullptr)
{
}
@@ -104,7 +103,7 @@ void k053252_device::device_start()
save_item(NAME(m_vsw));
save_item(NAME(m_hsw));
- if (m_slave_screen_tag != nullptr)
+ if (!m_slave_screen_tag.empty())
{
// find the screen device if explicitly configured
m_slave_screen = device().siblingdevice<screen_device>(m_slave_screen_tag);
@@ -259,7 +258,7 @@ WRITE8_MEMBER( k053252_device::write )
}
-void k053252_device::static_set_slave_screen(device_t &device, const char *tag)
+void k053252_device::static_set_slave_screen(device_t &device, std::string tag)
{
k053252_device &dev = downcast<k053252_device &>(device);
dev.m_slave_screen_tag = tag;
diff --git a/src/devices/machine/k053252.h b/src/devices/machine/k053252.h
index a00743789ad..82056202bf6 100644
--- a/src/devices/machine/k053252.h
+++ b/src/devices/machine/k053252.h
@@ -34,7 +34,7 @@ class k053252_device : public device_t,
public device_video_interface
{
public:
- k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k053252_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~k053252_device() {}
template<class _Object> static devcb_base &set_int1_en_callback(device_t &device, _Object object) { return downcast<k053252_device &>(device).m_int1_en_cb.set_callback(object); }
@@ -50,7 +50,7 @@ public:
void res_change();
- static void static_set_slave_screen(device_t &device, const char *tag);
+ static void static_set_slave_screen(device_t &device, std::string tag);
protected:
@@ -75,7 +75,7 @@ protected:
int m_offsx;
int m_offsy;
- const char * m_slave_screen_tag;
+ std::string m_slave_screen_tag;
screen_device * m_slave_screen;
};
diff --git a/src/devices/machine/k056230.cpp b/src/devices/machine/k056230.cpp
index 8d750b66a8a..46e63a89124 100644
--- a/src/devices/machine/k056230.cpp
+++ b/src/devices/machine/k056230.cpp
@@ -21,7 +21,7 @@ const device_type K056230 = &device_creator<k056230_device>;
// k056230_device - constructor
//-------------------------------------------------
-k056230_device::k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+k056230_device::k056230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K056230, "K056230 LANC", tag, owner, clock, "k056230", __FILE__),
m_is_thunderh(0),
m_cpu(*this)
diff --git a/src/devices/machine/k056230.h b/src/devices/machine/k056230.h
index 5695261f4c2..04629bce16d 100644
--- a/src/devices/machine/k056230.h
+++ b/src/devices/machine/k056230.h
@@ -36,9 +36,9 @@ class k056230_device : public device_t
{
public:
// construction/destruction
- k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ k056230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- static void set_cpu_tag(device_t &device, const char *tag) { downcast<k056230_device &>(device).m_cpu.set_tag(tag); }
+ static void set_cpu_tag(device_t &device, std::string tag) { downcast<k056230_device &>(device).m_cpu.set_tag(tag); }
static void set_thunderh_hack(device_t &device, int thunderh) { downcast<k056230_device &>(device).m_is_thunderh = thunderh; }
DECLARE_READ32_MEMBER(lanc_ram_r);
diff --git a/src/devices/machine/kb3600.cpp b/src/devices/machine/kb3600.cpp
index ca5fb5e7e76..77a9900ca1d 100644
--- a/src/devices/machine/kb3600.cpp
+++ b/src/devices/machine/kb3600.cpp
@@ -42,7 +42,7 @@ const device_type AY3600 = &device_creator<ay3600_device>;
// ay3600_device - constructor
//-------------------------------------------------
-ay3600_device::ay3600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ay3600_device::ay3600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AY3600, "AY-5-3600", tag, owner, clock, "ay3600", __FILE__),
m_read_x0(*this),
m_read_x1(*this),
diff --git a/src/devices/machine/kb3600.h b/src/devices/machine/kb3600.h
index 1d0529e7a0c..02110a6c57f 100644
--- a/src/devices/machine/kb3600.h
+++ b/src/devices/machine/kb3600.h
@@ -101,7 +101,7 @@ class ay3600_device : public device_t
{
public:
// construction/destruction
- ay3600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ay3600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// public interface
UINT16 b_r();
diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp
index d801bbf7dcf..a7ef77d4dd7 100644
--- a/src/devices/machine/keyboard.cpp
+++ b/src/devices/machine/keyboard.cpp
@@ -31,7 +31,7 @@ WRITE8_MEMBER( xxx_state::kbd_put )
***************************************************************************/
-generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_io_kbd0(*this, "TERM_LINE0"),
m_io_kbd1(*this, "TERM_LINE1"),
@@ -51,7 +51,7 @@ generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig,
{
}
-generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GENERIC_KEYBOARD, "Generic Keyboard", tag, owner, clock, "generic_keyboard", __FILE__),
m_io_kbd0(*this, "TERM_LINE0"),
m_io_kbd1(*this, "TERM_LINE1"),
diff --git a/src/devices/machine/keyboard.h b/src/devices/machine/keyboard.h
index 79a91f923c9..b75f342b3ac 100644
--- a/src/devices/machine/keyboard.h
+++ b/src/devices/machine/keyboard.h
@@ -21,8 +21,8 @@ INPUT_PORTS_EXTERN( generic_keyboard );
class generic_keyboard_device : public device_t
{
public:
- generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- generic_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ generic_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_keyboard_device &>(device).m_keyboard_cb.set_callback(object); }
diff --git a/src/devices/machine/kr2376.cpp b/src/devices/machine/kr2376.cpp
index 169a8b5f60d..73e4eeba091 100644
--- a/src/devices/machine/kr2376.cpp
+++ b/src/devices/machine/kr2376.cpp
@@ -66,7 +66,7 @@ static const UINT8 KR2376_KEY_CODES[3][8][11] =
const device_type KR2376 = &device_creator<kr2376_device>;
-kr2376_device::kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kr2376_device::kr2376_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KR2376, "SMC KR2376", tag, owner, clock, "kr2376", __FILE__),
m_write_strobe(*this)
{
diff --git a/src/devices/machine/kr2376.h b/src/devices/machine/kr2376.h
index 080bfec4b90..346c2676136 100644
--- a/src/devices/machine/kr2376.h
+++ b/src/devices/machine/kr2376.h
@@ -54,7 +54,7 @@ enum kr2376_output_pin_t
class kr2376_device : public device_t
{
public:
- kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kr2376_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~kr2376_device() {}
template<class _Object> static devcb_base &set_strobe_wr_callback(device_t &device, _Object object) { return downcast<kr2376_device &>(device).m_write_strobe.set_callback(object); }
diff --git a/src/devices/machine/laserdsc.cpp b/src/devices/machine/laserdsc.cpp
index 50e6dc09836..ffffc5c6cad 100644
--- a/src/devices/machine/laserdsc.cpp
+++ b/src/devices/machine/laserdsc.cpp
@@ -57,7 +57,7 @@ const UINT32 VIRTUAL_LEAD_OUT_TRACKS = LEAD_OUT_MIN_SIZE_IN_UM * 1000 / NOMINAL_
// laserdisc_device - constructor
//-------------------------------------------------
-laserdisc_device::laserdisc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+laserdisc_device::laserdisc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -296,7 +296,7 @@ void laserdisc_device::static_set_overlay_scale(device_t &device, float scalex,
// configuration
//-------------------------------------------------
-void laserdisc_device::static_set_overlay_palette(device_t &device, const char *tag)
+void laserdisc_device::static_set_overlay_palette(device_t &device, std::string tag)
{
downcast<laserdisc_device &>(device).m_overlay_palette.set_tag(tag);
}
@@ -737,7 +737,7 @@ void laserdisc_device::init_disc()
if (!m_getdisc_callback.isnull())
m_disc = m_getdisc_callback(*this);
else
- m_disc = machine().rom_load().get_disk_handle(tag());
+ m_disc = machine().rom_load().get_disk_handle(tag().c_str());
// set default parameters
m_width = 720;
@@ -1156,7 +1156,7 @@ void laserdisc_device::config_load(config_type cfg_type, xml_data_node *parentno
for (xml_data_node *ldnode = xml_get_sibling(parentnode->child, "device"); ldnode != nullptr; ldnode = xml_get_sibling(ldnode->next, "device"))
{
const char *devtag = xml_get_attribute_string(ldnode, "tag", "");
- if (strcmp(devtag, tag()) == 0)
+ if (strcmp(devtag, tag().c_str()) == 0)
{
// handle the overlay node
xml_data_node *overnode = xml_get_sibling(ldnode->child, "overlay");
@@ -1189,7 +1189,7 @@ void laserdisc_device::config_save(config_type cfg_type, xml_data_node *parentno
if (ldnode != nullptr)
{
// output the basics
- xml_set_attribute(ldnode, "tag", tag());
+ xml_set_attribute(ldnode, "tag", tag().c_str());
// add an overlay node
xml_data_node *overnode = xml_add_child(ldnode, "overlay", nullptr);
diff --git a/src/devices/machine/laserdsc.h b/src/devices/machine/laserdsc.h
index c550a9f61aa..ec615e512b3 100644
--- a/src/devices/machine/laserdsc.h
+++ b/src/devices/machine/laserdsc.h
@@ -138,7 +138,7 @@ class laserdisc_device : public device_t,
{
protected:
// construction/destruction
- laserdisc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ laserdisc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~laserdisc_device();
public:
@@ -169,7 +169,7 @@ public:
static void static_set_overlay_clip(device_t &device, INT32 minx, INT32 maxx, INT32 miny, INT32 maxy);
static void static_set_overlay_position(device_t &device, float posx, float posy);
static void static_set_overlay_scale(device_t &device, float scalex, float scaley);
- static void static_set_overlay_palette(device_t &device, const char *tag);
+ static void static_set_overlay_palette(device_t &device, std::string tag);
protected:
// timer IDs
diff --git a/src/devices/machine/latch.cpp b/src/devices/machine/latch.cpp
index 55aaf7dfeba..8f70ff582ab 100644
--- a/src/devices/machine/latch.cpp
+++ b/src/devices/machine/latch.cpp
@@ -5,7 +5,7 @@
const device_type OUTPUT_LATCH = &device_creator<output_latch_device>;
-output_latch_device::output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+output_latch_device::output_latch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, OUTPUT_LATCH, "Output Latch", tag, owner, clock, "output_latch", __FILE__),
m_resolved(false),
m_bit0(-1),
diff --git a/src/devices/machine/latch.h b/src/devices/machine/latch.h
index 66e08614b66..15e34737eb5 100644
--- a/src/devices/machine/latch.h
+++ b/src/devices/machine/latch.h
@@ -30,7 +30,7 @@
class output_latch_device : public device_t
{
public:
- output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ output_latch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_bit0_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit0_handler.set_callback(object); }
template<class _Object> static devcb_base &set_bit1_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit1_handler.set_callback(object); }
diff --git a/src/devices/machine/latch8.cpp b/src/devices/machine/latch8.cpp
index 9213f8e50c6..b454de88535 100644
--- a/src/devices/machine/latch8.cpp
+++ b/src/devices/machine/latch8.cpp
@@ -145,7 +145,7 @@ WRITE8_MEMBER( latch8_device::bit7_w ) { bitx_w(7, offset, data); }
const device_type LATCH8 = &device_creator<latch8_device>;
-latch8_device::latch8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+latch8_device::latch8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LATCH8, "8 bit latch", tag, owner, clock, "latch8", __FILE__),
m_value(0),
m_has_write(0),
@@ -181,14 +181,14 @@ latch8_device::latch8_device(const machine_config &mconfig, const char *tag, dev
void latch8_device::device_validity_check(validity_checker &valid) const
{
- if (!m_read_0.isnull() && !m_write_0.isnull()) osd_printf_error("Device %s: Bit 0 already has a handler.\n", tag());
- if (!m_read_1.isnull() && !m_write_1.isnull()) osd_printf_error("Device %s: Bit 1 already has a handler.\n", tag());
- if (!m_read_2.isnull() && !m_write_2.isnull()) osd_printf_error("Device %s: Bit 2 already has a handler.\n", tag());
- if (!m_read_3.isnull() && !m_write_3.isnull()) osd_printf_error("Device %s: Bit 3 already has a handler.\n", tag());
- if (!m_read_4.isnull() && !m_write_4.isnull()) osd_printf_error("Device %s: Bit 4 already has a handler.\n", tag());
- if (!m_read_5.isnull() && !m_write_5.isnull()) osd_printf_error("Device %s: Bit 5 already has a handler.\n", tag());
- if (!m_read_6.isnull() && !m_write_6.isnull()) osd_printf_error("Device %s: Bit 6 already has a handler.\n", tag());
- if (!m_read_7.isnull() && !m_write_7.isnull()) osd_printf_error("Device %s: Bit 7 already has a handler.\n", tag());
+ if (!m_read_0.isnull() && !m_write_0.isnull()) osd_printf_error("Device %s: Bit 0 already has a handler.\n", tag().c_str());
+ if (!m_read_1.isnull() && !m_write_1.isnull()) osd_printf_error("Device %s: Bit 1 already has a handler.\n", tag().c_str());
+ if (!m_read_2.isnull() && !m_write_2.isnull()) osd_printf_error("Device %s: Bit 2 already has a handler.\n", tag().c_str());
+ if (!m_read_3.isnull() && !m_write_3.isnull()) osd_printf_error("Device %s: Bit 3 already has a handler.\n", tag().c_str());
+ if (!m_read_4.isnull() && !m_write_4.isnull()) osd_printf_error("Device %s: Bit 4 already has a handler.\n", tag().c_str());
+ if (!m_read_5.isnull() && !m_write_5.isnull()) osd_printf_error("Device %s: Bit 5 already has a handler.\n", tag().c_str());
+ if (!m_read_6.isnull() && !m_write_6.isnull()) osd_printf_error("Device %s: Bit 6 already has a handler.\n", tag().c_str());
+ if (!m_read_7.isnull() && !m_write_7.isnull()) osd_printf_error("Device %s: Bit 7 already has a handler.\n", tag().c_str());
}
//-------------------------------------------------
// device_start - device-specific startup
diff --git a/src/devices/machine/latch8.h b/src/devices/machine/latch8.h
index dce9ea6f87a..3d2844df7fd 100644
--- a/src/devices/machine/latch8.h
+++ b/src/devices/machine/latch8.h
@@ -27,7 +27,7 @@
class latch8_device : public device_t
{
public:
- latch8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ latch8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
/* write & read full byte */
diff --git a/src/devices/machine/lc89510.cpp b/src/devices/machine/lc89510.cpp
index 9ad9f4cb37a..97adba322c4 100644
--- a/src/devices/machine/lc89510.cpp
+++ b/src/devices/machine/lc89510.cpp
@@ -11,7 +11,7 @@
const device_type LC89510 = &device_creator<lc89510_device>;
-lc89510_device::lc89510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lc89510_device::lc89510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LC89510, "lc89510_device", tag, owner, clock, "lc89510", __FILE__)
{
}
diff --git a/src/devices/machine/lc89510.h b/src/devices/machine/lc89510.h
index 0d7ebedcf71..b3c9472d13c 100644
--- a/src/devices/machine/lc89510.h
+++ b/src/devices/machine/lc89510.h
@@ -6,7 +6,7 @@
class lc89510_device : public device_t
{
public:
- lc89510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lc89510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp
index 17b02edf276..4382adb58af 100644
--- a/src/devices/machine/ldpr8210.cpp
+++ b/src/devices/machine/ldpr8210.cpp
@@ -179,7 +179,7 @@ ROM_END
// pioneer_pr8210_device - constructor
//-------------------------------------------------
-pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PIONEER_PR8210, "Pioneer PR-8210", tag, owner, clock, "pr8210", __FILE__),
m_control(0),
m_lastcommand(0),
@@ -195,7 +195,7 @@ pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, cons
{
}
-pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: laserdisc_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_control(0),
m_lastcommand(0),
@@ -889,7 +889,7 @@ ROM_END
// simutrek_special_device - constructor
//-------------------------------------------------
-simutrek_special_device::simutrek_special_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+simutrek_special_device::simutrek_special_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: pioneer_pr8210_device(mconfig, SIMUTREK_SPECIAL, "Simutrek Modified PR-8210", tag, owner, clock, "simutrek", __FILE__),
m_i8748_cpu(*this, "simutrek"),
m_audio_squelch(0),
diff --git a/src/devices/machine/ldpr8210.h b/src/devices/machine/ldpr8210.h
index 7418df3336d..c149620a87e 100644
--- a/src/devices/machine/ldpr8210.h
+++ b/src/devices/machine/ldpr8210.h
@@ -64,8 +64,8 @@ class pioneer_pr8210_device : public laserdisc_device
{
public:
// construction/destruction
- pioneer_pr8210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pioneer_pr8210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// input and output
void control_w(UINT8 data);
@@ -139,7 +139,7 @@ class simutrek_special_device : public pioneer_pr8210_device
{
public:
// construction/destruction
- simutrek_special_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ simutrek_special_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// input and output
void data_w(UINT8 data);
diff --git a/src/devices/machine/ldstub.h b/src/devices/machine/ldstub.h
index ee49e382583..6641b52b28e 100644
--- a/src/devices/machine/ldstub.h
+++ b/src/devices/machine/ldstub.h
@@ -49,7 +49,7 @@ class sony_ldp1450_device : public laserdisc_device
{
public:
// construction/destruction
- sony_ldp1450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ sony_ldp1450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, SONY_LDP1450, "Sony LDP-1450", tag, owner, clock, "ldp1450", __FILE__) { }
// input/output
@@ -71,7 +71,7 @@ class pioneer_pr7820_device : public laserdisc_device
{
public:
// construction/destruction
- pioneer_pr7820_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ pioneer_pr7820_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PIONEER_PR7820, "Pioneer PR-7820", tag, owner, clock, "pr7820", __FILE__) { }
// input/output
@@ -95,7 +95,7 @@ class phillips_22vp932_device : public laserdisc_device
{
public:
// construction/destruction
- phillips_22vp932_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ phillips_22vp932_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PHILLIPS_22VP932, "Phillips 22VP932", tag, owner, clock, "22vp932", __FILE__) { }
// input/output
diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp
index 1e6224adc0d..bda17600155 100644
--- a/src/devices/machine/ldv1000.cpp
+++ b/src/devices/machine/ldv1000.cpp
@@ -121,7 +121,7 @@ ROM_END
// pioneer_ldv1000_device - constructor
//-------------------------------------------------
-pioneer_ldv1000_device::pioneer_ldv1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pioneer_ldv1000_device::pioneer_ldv1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PIONEER_LDV1000, "Pioneer LD-V1000", tag, owner, clock, "ldv1000", __FILE__),
m_z80_cpu(*this, "ldv1000"),
m_z80_ctc(*this, "ldvctc"),
diff --git a/src/devices/machine/ldv1000.h b/src/devices/machine/ldv1000.h
index c2f9ead67a6..b42f829160b 100644
--- a/src/devices/machine/ldv1000.h
+++ b/src/devices/machine/ldv1000.h
@@ -47,7 +47,7 @@ class pioneer_ldv1000_device : public laserdisc_device
{
public:
// construction/destruction
- pioneer_ldv1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pioneer_ldv1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// input and output
void data_w(UINT8 data);
diff --git a/src/devices/machine/ldvp931.cpp b/src/devices/machine/ldvp931.cpp
index 716728b638b..26470147197 100644
--- a/src/devices/machine/ldvp931.cpp
+++ b/src/devices/machine/ldvp931.cpp
@@ -86,7 +86,7 @@ ROM_END
// phillips_22vp931_device - constructor
//-------------------------------------------------
-phillips_22vp931_device::phillips_22vp931_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+phillips_22vp931_device::phillips_22vp931_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PHILLIPS_22VP931, "Phillips 22VP931", tag, owner, clock, "22vp931", __FILE__),
m_i8049_cpu(*this, "vp931"),
m_tracktimer(nullptr),
diff --git a/src/devices/machine/ldvp931.h b/src/devices/machine/ldvp931.h
index 8acd7ebf6bd..fc662f475a6 100644
--- a/src/devices/machine/ldvp931.h
+++ b/src/devices/machine/ldvp931.h
@@ -48,7 +48,7 @@ public:
typedef delegate<void (phillips_22vp931_device &, int)> data_ready_delegate;
// construction/destruction
- phillips_22vp931_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ phillips_22vp931_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// input and output
void data_w(UINT8 data) { synchronize(TID_DEFERRED_DATA, data); }
diff --git a/src/devices/machine/legscsi.cpp b/src/devices/machine/legscsi.cpp
index 23cc5902a29..0727a0ebb21 100644
--- a/src/devices/machine/legscsi.cpp
+++ b/src/devices/machine/legscsi.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "legscsi.h"
-legacy_scsi_host_adapter::legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+legacy_scsi_host_adapter::legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_selected(0),
m_scsi_port(*this)
@@ -48,7 +48,7 @@ void legacy_scsi_host_adapter::send_command(UINT8 *data, int bytes)
}
else
{
- logerror("%s: send_command unknown SCSI id %d\n", tag(), m_selected);
+ logerror("%s: send_command unknown SCSI id %d\n", tag().c_str(), m_selected);
}
}
@@ -63,7 +63,7 @@ int legacy_scsi_host_adapter::get_length(void)
}
else
{
- logerror("%s: get_length unknown SCSI id %d\n", tag(), m_selected);
+ logerror("%s: get_length unknown SCSI id %d\n", tag().c_str(), m_selected);
return 0;
}
}
@@ -79,7 +79,7 @@ int legacy_scsi_host_adapter::get_phase(void)
}
else
{
- logerror("%s: get_phase unknown SCSI id %d\n", tag(), m_selected);
+ logerror("%s: get_phase unknown SCSI id %d\n", tag().c_str(), m_selected);
return 0;
}
}
@@ -93,7 +93,7 @@ void legacy_scsi_host_adapter::read_data(UINT8 *data, int bytes)
}
else
{
- logerror("%s: read_data unknown SCSI id %d\n", tag(), m_selected);
+ logerror("%s: read_data unknown SCSI id %d\n", tag().c_str(), m_selected);
}
}
@@ -106,7 +106,7 @@ void legacy_scsi_host_adapter::write_data(UINT8 *data, int bytes)
}
else
{
- logerror("%s: write_data unknown SCSI id %d\n", tag(), m_selected);
+ logerror("%s: write_data unknown SCSI id %d\n", tag().c_str(), m_selected);
}
}
@@ -125,7 +125,7 @@ UINT8 legacy_scsi_host_adapter::get_status()
}
else
{
- logerror("%s: get_status unknown SCSI id %d\n", tag(), m_selected);
+ logerror("%s: get_status unknown SCSI id %d\n", tag().c_str(), m_selected);
return 0;
}
}
diff --git a/src/devices/machine/legscsi.h b/src/devices/machine/legscsi.h
index b3d8800972c..32235ee61aa 100644
--- a/src/devices/machine/legscsi.h
+++ b/src/devices/machine/legscsi.h
@@ -13,9 +13,9 @@
class legacy_scsi_host_adapter : public device_t
{
public:
- legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- static void set_scsi_port(device_t &device, const char *tag) { downcast<legacy_scsi_host_adapter &>(device).m_scsi_port.set_tag(tag); }
+ static void set_scsi_port(device_t &device, std::string tag) { downcast<legacy_scsi_host_adapter &>(device).m_scsi_port.set_tag(tag); }
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/lh5810.cpp b/src/devices/machine/lh5810.cpp
index 88b9b8d51c7..8244fd68325 100644
--- a/src/devices/machine/lh5810.cpp
+++ b/src/devices/machine/lh5810.cpp
@@ -27,7 +27,7 @@ const device_type LH5810 = &device_creator<lh5810_device>;
// lh5810_device - constructor
//-------------------------------------------------
-lh5810_device::lh5810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lh5810_device::lh5810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LH5810, "LH5810", tag, owner, clock, "lh5810", __FILE__),
m_porta_r_cb(*this),
m_porta_w_cb(*this),
diff --git a/src/devices/machine/lh5810.h b/src/devices/machine/lh5810.h
index 63bff576958..6a3d8fcbd38 100644
--- a/src/devices/machine/lh5810.h
+++ b/src/devices/machine/lh5810.h
@@ -68,7 +68,7 @@ class lh5810_device : public device_t
{
public:
// construction/destruction
- lh5810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lh5810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_porta_r_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_porta_r_cb.set_callback(object); }
template<class _Object> static devcb_base &set_porta_w_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_porta_w_cb.set_callback(object); }
diff --git a/src/devices/machine/linflash.cpp b/src/devices/machine/linflash.cpp
index efc9583981b..4c8a5df3b14 100644
--- a/src/devices/machine/linflash.cpp
+++ b/src/devices/machine/linflash.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "linflash.h"
-linear_flash_pccard_device::linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source) :
+linear_flash_pccard_device::linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
device_slot_card_interface(mconfig, *this), m_space(nullptr)
@@ -47,7 +47,7 @@ static ADDRESS_MAP_START(linear_flash_pccard_16mb, AS_0, 16, linear_flash_pccard
AM_RANGE(0x00c00000, 0x00ffffff) AM_DEVREADWRITE8("4u", intelfsh8_device, read, write, 0xff00)
ADDRESS_MAP_END
-linear_flash_pccard_16mb_device::linear_flash_pccard_16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+linear_flash_pccard_16mb_device::linear_flash_pccard_16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
linear_flash_pccard_device(mconfig, LINEAR_FLASH_PCCARD_16MB, "Linear Flash PCCARD (16MB)", tag, owner, clock, "linearflash16mb", __FILE__)
{
m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_16mb ) );
@@ -92,7 +92,7 @@ static ADDRESS_MAP_START(linear_flash_pccard_32mb, AS_0, 16, linear_flash_pccard
AM_RANGE(0x01c00000, 0x01ffffff) AM_DEVREADWRITE8("8u", intelfsh8_device, read, write, 0xff00)
ADDRESS_MAP_END
-linear_flash_pccard_32mb_device::linear_flash_pccard_32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+linear_flash_pccard_32mb_device::linear_flash_pccard_32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
linear_flash_pccard_device(mconfig, LINEAR_FLASH_PCCARD_32MB, "Linear Flash PCCARD (32MB)", tag, owner, clock, "linearflash32mb", __FILE__)
{
m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_32mb ) );
@@ -161,7 +161,7 @@ static ADDRESS_MAP_START(linear_flash_pccard_64mb, AS_0, 16, linear_flash_pccard
AM_RANGE(0x03c00000, 0x03ffffff) AM_DEVREADWRITE8("16u", intelfsh8_device, read, write, 0xff00)
ADDRESS_MAP_END
-linear_flash_pccard_64mb_device::linear_flash_pccard_64mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+linear_flash_pccard_64mb_device::linear_flash_pccard_64mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
linear_flash_pccard_device(mconfig, LINEAR_FLASH_PCCARD_64MB, "Linear Flash PCCARD (64MB)", tag, owner, clock, "linearflash64mb", __FILE__)
{
m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_64mb ) );
diff --git a/src/devices/machine/linflash.h b/src/devices/machine/linflash.h
index e6acfcf4ef3..c588d9bca13 100644
--- a/src/devices/machine/linflash.h
+++ b/src/devices/machine/linflash.h
@@ -19,7 +19,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write_memory) override;
protected:
- linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -37,7 +37,7 @@ extern const device_type LINEAR_FLASH_PCCARD_16MB;
class linear_flash_pccard_16mb_device : public linear_flash_pccard_device
{
public:
- linear_flash_pccard_16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ linear_flash_pccard_16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
@@ -50,7 +50,7 @@ extern const device_type LINEAR_FLASH_PCCARD_32MB;
class linear_flash_pccard_32mb_device : public linear_flash_pccard_device
{
public:
- linear_flash_pccard_32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ linear_flash_pccard_32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
@@ -62,7 +62,7 @@ extern const device_type LINEAR_FLASH_PCCARD_64MB;
class linear_flash_pccard_64mb_device : public linear_flash_pccard_device
{
public:
- linear_flash_pccard_64mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ linear_flash_pccard_64mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/machine/lpc-acpi.cpp b/src/devices/machine/lpc-acpi.cpp
index 72d066affaa..b9cd34459ff 100644
--- a/src/devices/machine/lpc-acpi.cpp
+++ b/src/devices/machine/lpc-acpi.cpp
@@ -36,7 +36,7 @@ DEVICE_ADDRESS_MAP_START(map, 32, lpc_acpi_device)
AM_RANGE(0x70, 0x73) AM_READWRITE8 (sw_irq_gen_r, sw_irq_gen_w, 0x000000ff)
ADDRESS_MAP_END
-lpc_acpi_device::lpc_acpi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lpc_acpi_device::lpc_acpi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: lpc_device(mconfig, LPC_ACPI, "LPC ACPI", tag, owner, clock, "lpc_acpi", __FILE__)
{
}
@@ -88,7 +88,7 @@ READ16_MEMBER( lpc_acpi_device::pm1_sts_r)
WRITE16_MEMBER(lpc_acpi_device::pm1_sts_w)
{
pm1_sts &= ~data;
- logerror("%s: pm1_sts = %04x\n", tag(), pm1_sts);
+ logerror("%s: pm1_sts = %04x\n", tag().c_str(), pm1_sts);
}
READ16_MEMBER( lpc_acpi_device::pm1_en_r)
@@ -99,7 +99,7 @@ READ16_MEMBER( lpc_acpi_device::pm1_en_r)
WRITE16_MEMBER(lpc_acpi_device::pm1_en_w)
{
COMBINE_DATA(&pm1_en);
- logerror("%s: pm1_en = %04x\n", tag(), pm1_en);
+ logerror("%s: pm1_en = %04x\n", tag().c_str(), pm1_en);
}
READ32_MEMBER( lpc_acpi_device::pm1_cnt_r)
@@ -110,7 +110,7 @@ READ32_MEMBER( lpc_acpi_device::pm1_cnt_r)
WRITE32_MEMBER(lpc_acpi_device::pm1_cnt_w)
{
COMBINE_DATA(&pm1_cnt);
- logerror("%s: pm1_cnt = %08x\n", tag(), pm1_cnt);
+ logerror("%s: pm1_cnt = %08x\n", tag().c_str(), pm1_cnt);
}
READ32_MEMBER(lpc_acpi_device::pm1_tmr_r)
@@ -126,7 +126,7 @@ READ32_MEMBER( lpc_acpi_device::proc_cnt_r)
WRITE32_MEMBER(lpc_acpi_device::proc_cnt_w)
{
COMBINE_DATA(&proc_cnt);
- logerror("%s: proc_cnt = %08x\n", tag(), proc_cnt);
+ logerror("%s: proc_cnt = %08x\n", tag().c_str(), proc_cnt);
}
READ8_MEMBER( lpc_acpi_device::lv2_r)
@@ -142,7 +142,7 @@ READ32_MEMBER( lpc_acpi_device::gpe0_sts_r)
WRITE32_MEMBER(lpc_acpi_device::gpe0_sts_w)
{
COMBINE_DATA(&gpe0_sts);
- logerror("%s: gpe0_sts = %08x\n", tag(), gpe0_sts);
+ logerror("%s: gpe0_sts = %08x\n", tag().c_str(), gpe0_sts);
}
READ32_MEMBER( lpc_acpi_device::gpe0_en_r)
@@ -153,7 +153,7 @@ READ32_MEMBER( lpc_acpi_device::gpe0_en_r)
WRITE32_MEMBER(lpc_acpi_device::gpe0_en_w)
{
COMBINE_DATA(&gpe0_en);
- logerror("%s: gpe0_en = %08x\n", tag(), gpe0_en);
+ logerror("%s: gpe0_en = %08x\n", tag().c_str(), gpe0_en);
}
READ32_MEMBER( lpc_acpi_device::smi_en_r)
@@ -164,7 +164,7 @@ READ32_MEMBER( lpc_acpi_device::smi_en_r)
WRITE32_MEMBER(lpc_acpi_device::smi_en_w)
{
COMBINE_DATA(&smi_en);
- logerror("%s: smi_en = %08x\n", tag(), smi_en);
+ logerror("%s: smi_en = %08x\n", tag().c_str(), smi_en);
}
READ32_MEMBER( lpc_acpi_device::smi_sts_r)
@@ -175,7 +175,7 @@ READ32_MEMBER( lpc_acpi_device::smi_sts_r)
WRITE32_MEMBER(lpc_acpi_device::smi_sts_w)
{
COMBINE_DATA(&smi_sts);
- logerror("%s: smi_sts = %08x\n", tag(), smi_sts);
+ logerror("%s: smi_sts = %08x\n", tag().c_str(), smi_sts);
}
READ16_MEMBER( lpc_acpi_device::alt_gp_smi_en_r)
@@ -186,7 +186,7 @@ READ16_MEMBER( lpc_acpi_device::alt_gp_smi_en_r)
WRITE16_MEMBER(lpc_acpi_device::alt_gp_smi_en_w)
{
COMBINE_DATA(&alt_gp_smi_en);
- logerror("%s: alt_gp_smi_en = %04x\n", tag(), alt_gp_smi_en);
+ logerror("%s: alt_gp_smi_en = %04x\n", tag().c_str(), alt_gp_smi_en);
}
READ16_MEMBER( lpc_acpi_device::alt_gp_smi_sts_r)
@@ -197,7 +197,7 @@ READ16_MEMBER( lpc_acpi_device::alt_gp_smi_sts_r)
WRITE16_MEMBER(lpc_acpi_device::alt_gp_smi_sts_w)
{
COMBINE_DATA(&alt_gp_smi_sts);
- logerror("%s: alt_gp_smi_sts = %04x\n", tag(), alt_gp_smi_sts);
+ logerror("%s: alt_gp_smi_sts = %04x\n", tag().c_str(), alt_gp_smi_sts);
}
READ16_MEMBER( lpc_acpi_device::devact_sts_r)
@@ -208,7 +208,7 @@ READ16_MEMBER( lpc_acpi_device::devact_sts_r)
WRITE16_MEMBER(lpc_acpi_device::devact_sts_w)
{
COMBINE_DATA(&devact_sts);
- logerror("%s: devact_sts = %04x\n", tag(), devact_sts);
+ logerror("%s: devact_sts = %04x\n", tag().c_str(), devact_sts);
}
READ16_MEMBER( lpc_acpi_device::devtrap_en_r)
@@ -219,18 +219,18 @@ READ16_MEMBER( lpc_acpi_device::devtrap_en_r)
WRITE16_MEMBER(lpc_acpi_device::devtrap_en_w)
{
COMBINE_DATA(&devtrap_en);
- logerror("%s: devtrap_en = %04x\n", tag(), devtrap_en);
+ logerror("%s: devtrap_en = %04x\n", tag().c_str(), devtrap_en);
}
READ16_MEMBER( lpc_acpi_device::bus_addr_track_r)
{
- logerror("%s: read bus_addr_track\n", tag());
+ logerror("%s: read bus_addr_track\n", tag().c_str());
return 0;
}
READ8_MEMBER( lpc_acpi_device::bus_cyc_track_r)
{
- logerror("%s: read bus_cyc_track\n", tag());
+ logerror("%s: read bus_cyc_track\n", tag().c_str());
return 0;
}
@@ -243,7 +243,7 @@ READ8_MEMBER( lpc_acpi_device::tco_rld_r)
WRITE8_MEMBER( lpc_acpi_device::tco_rld_w)
{
tco_rld = data;
- logerror("%s: tco_rld = %02x\n", tag(), tco_rld);
+ logerror("%s: tco_rld = %02x\n", tag().c_str(), tco_rld);
}
READ8_MEMBER( lpc_acpi_device::tco_tmr_r)
@@ -254,7 +254,7 @@ READ8_MEMBER( lpc_acpi_device::tco_tmr_r)
WRITE8_MEMBER( lpc_acpi_device::tco_tmr_w)
{
tco_tmr = data;
- logerror("%s: tco_tmr = %02x\n", tag(), tco_tmr);
+ logerror("%s: tco_tmr = %02x\n", tag().c_str(), tco_tmr);
}
READ8_MEMBER( lpc_acpi_device::tco_dat_in_r)
@@ -265,7 +265,7 @@ READ8_MEMBER( lpc_acpi_device::tco_dat_in_r)
WRITE8_MEMBER( lpc_acpi_device::tco_dat_in_w)
{
tco_dat_in = data;
- logerror("%s: tco_dat_in = %02x\n", tag(), tco_dat_in);
+ logerror("%s: tco_dat_in = %02x\n", tag().c_str(), tco_dat_in);
}
READ8_MEMBER( lpc_acpi_device::tco_dat_out_r)
@@ -276,7 +276,7 @@ READ8_MEMBER( lpc_acpi_device::tco_dat_out_r)
WRITE8_MEMBER( lpc_acpi_device::tco_dat_out_w)
{
tco_dat_out = data;
- logerror("%s: tco_dat_out = %02x\n", tag(), tco_dat_out);
+ logerror("%s: tco_dat_out = %02x\n", tag().c_str(), tco_dat_out);
}
READ16_MEMBER( lpc_acpi_device::tco1_sts_r)
@@ -287,7 +287,7 @@ READ16_MEMBER( lpc_acpi_device::tco1_sts_r)
WRITE16_MEMBER(lpc_acpi_device::tco1_sts_w)
{
COMBINE_DATA(&tco1_sts);
- logerror("%s: tco1_sts = %04x\n", tag(), tco1_sts);
+ logerror("%s: tco1_sts = %04x\n", tag().c_str(), tco1_sts);
}
READ16_MEMBER( lpc_acpi_device::tco2_sts_r)
@@ -298,7 +298,7 @@ READ16_MEMBER( lpc_acpi_device::tco2_sts_r)
WRITE16_MEMBER(lpc_acpi_device::tco2_sts_w)
{
COMBINE_DATA(&tco2_sts);
- logerror("%s: tco2_sts = %04x\n", tag(), tco2_sts);
+ logerror("%s: tco2_sts = %04x\n", tag().c_str(), tco2_sts);
}
READ16_MEMBER( lpc_acpi_device::tco1_cnt_r)
@@ -309,7 +309,7 @@ READ16_MEMBER( lpc_acpi_device::tco1_cnt_r)
WRITE16_MEMBER(lpc_acpi_device::tco1_cnt_w)
{
COMBINE_DATA(&tco1_cnt);
- logerror("%s: tco1_cnt = %04x\n", tag(), tco1_cnt);
+ logerror("%s: tco1_cnt = %04x\n", tag().c_str(), tco1_cnt);
}
READ16_MEMBER( lpc_acpi_device::tco2_cnt_r)
@@ -320,7 +320,7 @@ READ16_MEMBER( lpc_acpi_device::tco2_cnt_r)
WRITE16_MEMBER(lpc_acpi_device::tco2_cnt_w)
{
COMBINE_DATA(&tco2_cnt);
- logerror("%s: tco2_cnt = %04x\n", tag(), tco2_cnt);
+ logerror("%s: tco2_cnt = %04x\n", tag().c_str(), tco2_cnt);
}
READ8_MEMBER( lpc_acpi_device::tco_message1_r)
@@ -331,7 +331,7 @@ READ8_MEMBER( lpc_acpi_device::tco_message1_r)
WRITE8_MEMBER( lpc_acpi_device::tco_message1_w)
{
tco_message1 = data;
- logerror("%s: tco_message1 = %02x\n", tag(), tco_message1);
+ logerror("%s: tco_message1 = %02x\n", tag().c_str(), tco_message1);
}
READ8_MEMBER( lpc_acpi_device::tco_message2_r)
@@ -342,7 +342,7 @@ READ8_MEMBER( lpc_acpi_device::tco_message2_r)
WRITE8_MEMBER( lpc_acpi_device::tco_message2_w)
{
tco_message2 = data;
- logerror("%s: tco_message2 = %02x\n", tag(), tco_message2);
+ logerror("%s: tco_message2 = %02x\n", tag().c_str(), tco_message2);
}
READ8_MEMBER( lpc_acpi_device::tco_wdstatus_r)
@@ -353,7 +353,7 @@ READ8_MEMBER( lpc_acpi_device::tco_wdstatus_r)
WRITE8_MEMBER( lpc_acpi_device::tco_wdstatus_w)
{
tco_wdstatus = data;
- logerror("%s: tco_wdstatus = %02x\n", tag(), tco_wdstatus);
+ logerror("%s: tco_wdstatus = %02x\n", tag().c_str(), tco_wdstatus);
}
READ8_MEMBER( lpc_acpi_device::sw_irq_gen_r)
@@ -364,5 +364,5 @@ READ8_MEMBER( lpc_acpi_device::sw_irq_gen_r)
WRITE8_MEMBER( lpc_acpi_device::sw_irq_gen_w)
{
sw_irq_gen = data;
- logerror("%s: sw_irq_gen = %02x\n", tag(), sw_irq_gen);
+ logerror("%s: sw_irq_gen = %02x\n", tag().c_str(), sw_irq_gen);
}
diff --git a/src/devices/machine/lpc-acpi.h b/src/devices/machine/lpc-acpi.h
index bde29170f04..bf862155e71 100644
--- a/src/devices/machine/lpc-acpi.h
+++ b/src/devices/machine/lpc-acpi.h
@@ -10,7 +10,7 @@
class lpc_acpi_device : public lpc_device {
public:
- lpc_acpi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lpc_acpi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
diff --git a/src/devices/machine/lpc-pit.cpp b/src/devices/machine/lpc-pit.cpp
index 19a07373ec5..2bb71a600ba 100644
--- a/src/devices/machine/lpc-pit.cpp
+++ b/src/devices/machine/lpc-pit.cpp
@@ -11,7 +11,7 @@ DEVICE_ADDRESS_MAP_START(map, 32, lpc_pit_device)
AM_RANGE(0x50, 0x53) AM_WRITE8 ( control_w, 0xff000000)
ADDRESS_MAP_END
-lpc_pit_device::lpc_pit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lpc_pit_device::lpc_pit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: lpc_device(mconfig, LPC_PIT, "LPC PIT", tag, owner, clock, "lpc_pit", __FILE__)
{
}
@@ -32,16 +32,16 @@ void lpc_pit_device::device_reset()
READ8_MEMBER( lpc_pit_device::status_r)
{
- logerror("%s: status_r %d\n", tag(), offset);
+ logerror("%s: status_r %d\n", tag().c_str(), offset);
return 0xff;
}
WRITE8_MEMBER(lpc_pit_device::access_w)
{
- logerror("%s: access_w %d, %02x\n", tag(), offset, data);
+ logerror("%s: access_w %d, %02x\n", tag().c_str(), offset, data);
}
WRITE8_MEMBER(lpc_pit_device::control_w)
{
- logerror("%s: control_w %02x\n", tag(), data);
+ logerror("%s: control_w %02x\n", tag().c_str(), data);
}
diff --git a/src/devices/machine/lpc-pit.h b/src/devices/machine/lpc-pit.h
index a9e96a7b401..5b56388e9fe 100644
--- a/src/devices/machine/lpc-pit.h
+++ b/src/devices/machine/lpc-pit.h
@@ -10,7 +10,7 @@
class lpc_pit_device : public lpc_device {
public:
- lpc_pit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lpc_pit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
diff --git a/src/devices/machine/lpc-rtc.cpp b/src/devices/machine/lpc-rtc.cpp
index 455ab99d2fb..60a8e61c0ce 100644
--- a/src/devices/machine/lpc-rtc.cpp
+++ b/src/devices/machine/lpc-rtc.cpp
@@ -14,7 +14,7 @@ DEVICE_ADDRESS_MAP_START(extmap, 32, lpc_rtc_device)
AM_RANGE(0x70, 0x77) AM_READWRITE8(exttarget_r, exttarget_w, 0xff000000)
ADDRESS_MAP_END
-lpc_rtc_device::lpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+lpc_rtc_device::lpc_rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: lpc_device(mconfig, LPC_RTC, "LPC RTC", tag, owner, clock, "lpc_rtc", __FILE__), cur_index(0), cur_extindex(0)
{
}
@@ -58,7 +58,7 @@ READ8_MEMBER( lpc_rtc_device::target_r)
WRITE8_MEMBER( lpc_rtc_device::target_w)
{
ram[cur_index] = data;
- logerror("%s: ram[%02x] = %02x\n", tag(), cur_index, data);
+ logerror("%s: ram[%02x] = %02x\n", tag().c_str(), cur_index, data);
}
READ8_MEMBER( lpc_rtc_device::extindex_r)
@@ -79,5 +79,5 @@ READ8_MEMBER( lpc_rtc_device::exttarget_r)
WRITE8_MEMBER( lpc_rtc_device::exttarget_w)
{
ram[cur_extindex|128] = data;
- logerror("%s: ram[%02x] = %02x\n", tag(), cur_extindex|128, data);
+ logerror("%s: ram[%02x] = %02x\n", tag().c_str(), cur_extindex|128, data);
}
diff --git a/src/devices/machine/lpc-rtc.h b/src/devices/machine/lpc-rtc.h
index f46a3ca2238..1e8a778354c 100644
--- a/src/devices/machine/lpc-rtc.h
+++ b/src/devices/machine/lpc-rtc.h
@@ -10,7 +10,7 @@
class lpc_rtc_device : public lpc_device {
public:
- lpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ lpc_rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
diff --git a/src/devices/machine/lpc.cpp b/src/devices/machine/lpc.cpp
index afb51435f23..3a77b09abb7 100644
--- a/src/devices/machine/lpc.cpp
+++ b/src/devices/machine/lpc.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Olivier Galibert
#include "lpc.h"
-lpc_device::lpc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+lpc_device::lpc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/devices/machine/lpc.h b/src/devices/machine/lpc.h
index 6ade06d03ff..5b42c66976d 100644
--- a/src/devices/machine/lpc.h
+++ b/src/devices/machine/lpc.h
@@ -7,7 +7,7 @@
class lpc_device : public device_t {
public:
- lpc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ lpc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) = 0;
diff --git a/src/devices/machine/lpci.cpp b/src/devices/machine/lpci.cpp
index d03667d5be8..7608d40645e 100644
--- a/src/devices/machine/lpci.cpp
+++ b/src/devices/machine/lpci.cpp
@@ -89,12 +89,11 @@ const device_type PCI_BUS_LEGACY = &device_creator<pci_bus_legacy_device>;
//-------------------------------------------------
// pci_bus_legacy_device - constructor
//-------------------------------------------------
-pci_bus_legacy_device::pci_bus_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pci_bus_legacy_device::pci_bus_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PCI_BUS_LEGACY, "PCI Bus Legacy", tag, owner, clock, "pci_bus_legacy", __FILE__),
m_father(nullptr)
{
for (int i = 0; i < ARRAY_LENGTH(m_devtag); i++) {
- m_devtag[i]= nullptr;
m_read_callback[i] = nullptr;
m_write_callback[i] = nullptr;
}
@@ -133,7 +132,7 @@ READ32_MEMBER( pci_bus_legacy_device::read )
}
if (LOG_PCI)
- logerror("read('%s'): offset=%d result=0x%08X\n", tag(), offset, result);
+ logerror("read('%s'): offset=%d result=0x%08X\n", tag().c_str(), offset, result);
return result;
}
@@ -165,7 +164,7 @@ WRITE32_MEMBER( pci_bus_legacy_device::write )
offset %= 2;
if (LOG_PCI)
- logerror("write('%s'): offset=%d data=0x%08X\n", tag(), offset, data);
+ logerror("write('%s'): offset=%d data=0x%08X\n", tag().c_str(), offset, data);
switch (offset)
{
@@ -263,7 +262,7 @@ void pci_bus_legacy_device::device_start()
/* find all our devices */
for (int i = 0; i < ARRAY_LENGTH(m_devtag); i++)
- if (m_devtag[i] != nullptr)
+ if (!m_devtag[i].empty())
m_device[i] = machine().device(m_devtag[i]);
if (m_father != nullptr) {
diff --git a/src/devices/machine/lpci.h b/src/devices/machine/lpci.h
index 849f27d206d..86111eba18e 100644
--- a/src/devices/machine/lpci.h
+++ b/src/devices/machine/lpci.h
@@ -24,7 +24,7 @@ class pci_bus_legacy_device : public device_t
{
public:
// construction/destruction
- pci_bus_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pci_bus_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ32_MEMBER( read );
DECLARE_WRITE32_MEMBER( write );
@@ -34,7 +34,7 @@ public:
void set_busnum(int busnum) { m_busnum = busnum; }
void set_father(const char *father) { m_father = father; }
- void set_device(int num, const char *tag, pci_read_func read_func, pci_write_func write_func) {
+ void set_device(int num, std::string tag, pci_read_func read_func, pci_write_func write_func) {
m_devtag[num] = tag; m_read_callback[num] = read_func; m_write_callback[num] = write_func; }
pci_bus_legacy_device *pci_search_bustree(int busnum, int devicenum, pci_bus_legacy_device *pcibus);
@@ -48,7 +48,7 @@ protected:
private:
UINT8 m_busnum;
- const char * m_devtag[32];
+ std::string m_devtag[32];
pci_read_func m_read_callback[32];
pci_write_func m_write_callback[32];
const char * m_father;
diff --git a/src/devices/machine/m6m80011ap.cpp b/src/devices/machine/m6m80011ap.cpp
index a8dea68d6ef..a5ffa050560 100644
--- a/src/devices/machine/m6m80011ap.cpp
+++ b/src/devices/machine/m6m80011ap.cpp
@@ -27,7 +27,7 @@ const device_type M6M80011AP = &device_creator<m6m80011ap_device>;
// m6m80011ap_device - constructor
//-------------------------------------------------
-m6m80011ap_device::m6m80011ap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m6m80011ap_device::m6m80011ap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, M6M80011AP, "M6M80011AP EEPROM", tag, owner, clock, "m6m80011ap", __FILE__),
device_nvram_interface(mconfig, *this), m_latch(0), m_reset_line(0), m_cmd_stream_pos(0), m_current_cmd(0), m_read_latch(0), m_current_addr(0), m_eeprom_we(0), m_eeprom_state()
{
diff --git a/src/devices/machine/m6m80011ap.h b/src/devices/machine/m6m80011ap.h
index dfea6c06c14..b7729799035 100644
--- a/src/devices/machine/m6m80011ap.h
+++ b/src/devices/machine/m6m80011ap.h
@@ -43,7 +43,7 @@ class m6m80011ap_device : public device_t,
{
public:
// construction/destruction
- m6m80011ap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m6m80011ap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_READ_LINE_MEMBER( read_bit );
diff --git a/src/devices/machine/mb14241.cpp b/src/devices/machine/mb14241.cpp
index 44c49fb4e88..8948b28703c 100644
--- a/src/devices/machine/mb14241.cpp
+++ b/src/devices/machine/mb14241.cpp
@@ -17,7 +17,7 @@
const device_type MB14241 = &device_creator<mb14241_device>;
-mb14241_device::mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb14241_device::mb14241_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB14241, "MB14241 Data Shifter", tag, owner, clock, "mb14241", __FILE__), m_shift_data(0), m_shift_count(0)
{
}
diff --git a/src/devices/machine/mb14241.h b/src/devices/machine/mb14241.h
index 01c2d1b0dde..a8849d6127d 100644
--- a/src/devices/machine/mb14241.h
+++ b/src/devices/machine/mb14241.h
@@ -13,7 +13,7 @@
class mb14241_device : public device_t
{
public:
- mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb14241_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER ( shift_count_w );
DECLARE_WRITE8_MEMBER ( shift_data_w );
diff --git a/src/devices/machine/mb3773.cpp b/src/devices/machine/mb3773.cpp
index d749d8abc1a..65fc7a0f615 100644
--- a/src/devices/machine/mb3773.cpp
+++ b/src/devices/machine/mb3773.cpp
@@ -27,7 +27,7 @@ const device_type MB3773 = &device_creator<mb3773_device>;
// mb3773_device - constructor
//-------------------------------------------------
-mb3773_device::mb3773_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+mb3773_device::mb3773_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t(mconfig, MB3773, "MB3773 Power Supply Monitor", tag, owner, clock, "mb3773", __FILE__), m_watchdog_timer(nullptr), m_ck(0)
{
}
diff --git a/src/devices/machine/mb3773.h b/src/devices/machine/mb3773.h
index fa6fdd583fa..2f607bb7044 100644
--- a/src/devices/machine/mb3773.h
+++ b/src/devices/machine/mb3773.h
@@ -29,7 +29,7 @@ class mb3773_device :
{
public:
// construction/destruction
- mb3773_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
+ mb3773_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
// I/O operations
WRITE_LINE_MEMBER( write_line_ck );
diff --git a/src/devices/machine/mb8421.cpp b/src/devices/machine/mb8421.cpp
index 0d3cb819a66..2d4fd1525b7 100644
--- a/src/devices/machine/mb8421.cpp
+++ b/src/devices/machine/mb8421.cpp
@@ -20,7 +20,7 @@ const device_type MB8421 = &device_creator<mb8421_device>;
// mb8421_device - constructor
//-------------------------------------------------
-mb8421_device::mb8421_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb8421_device::mb8421_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB8421, "MB8421 DPSRAM", tag, owner, clock, "mb8421", __FILE__),
m_intl_handler(*this),
m_intr_handler(*this)
diff --git a/src/devices/machine/mb8421.h b/src/devices/machine/mb8421.h
index d1d23ab0691..adefd522f04 100644
--- a/src/devices/machine/mb8421.h
+++ b/src/devices/machine/mb8421.h
@@ -38,7 +38,7 @@
class mb8421_device : public device_t
{
public:
- mb8421_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb8421_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_intl_handler(device_t &device, _Object object) { return downcast<mb8421_device &>(device).m_intl_handler.set_callback(object); }
diff --git a/src/devices/machine/mb87078.cpp b/src/devices/machine/mb87078.cpp
index a94380456f5..c36585fb126 100644
--- a/src/devices/machine/mb87078.cpp
+++ b/src/devices/machine/mb87078.cpp
@@ -104,7 +104,7 @@ static const int mb87078_gain_percent[66] = {
const device_type MB87078 = &device_creator<mb87078_device>;
-mb87078_device::mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb87078_device::mb87078_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB87078, "MB87078 Volume Controller", tag, owner, clock, "mb87078", __FILE__),
m_channel_latch(0),
m_reset_comp(0),
diff --git a/src/devices/machine/mb87078.h b/src/devices/machine/mb87078.h
index 9eeb6c7526f..6e72b5ea05d 100644
--- a/src/devices/machine/mb87078.h
+++ b/src/devices/machine/mb87078.h
@@ -25,7 +25,7 @@
class mb87078_device : public device_t
{
public:
- mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb87078_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mb87078_device() {}
template<class _Object> static devcb_base &set_gain_changed_callback(device_t &device, _Object object) { return downcast<mb87078_device &>(device).m_gain_changed_cb.set_callback(object); }
diff --git a/src/devices/machine/mb8795.cpp b/src/devices/machine/mb8795.cpp
index 7f2c096023c..df6f90625e4 100644
--- a/src/devices/machine/mb8795.cpp
+++ b/src/devices/machine/mb8795.cpp
@@ -18,7 +18,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, mb8795_device)
AM_RANGE(0x8, 0xf) AM_READWRITE(mac_r, mac_w) // Mapping limitation, real is up to 0xd
ADDRESS_MAP_END
-mb8795_device::mb8795_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mb8795_device::mb8795_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MB8795, "Fujitsu MB8795", tag, owner, clock, "mb8795", __FILE__),
device_network_interface(mconfig, *this, 10), txstat(0), txmask(0), rxstat(0), rxmask(0), txmode(0), rxmode(0), txlen(0), rxlen(0), txcount(0), drq_tx(false),
drq_rx(false), irq_tx(false), irq_rx(false), timer_tx(nullptr), timer_rx(nullptr),
@@ -81,7 +81,7 @@ void mb8795_device::recv_cb(UINT8 *buf, int len)
READ8_MEMBER(mb8795_device::txstat_r)
{
- // logerror("%s: txstat_r %02x (%08x)\n", tag(), txstat, space.device().safe_pc());
+ // logerror("%s: txstat_r %02x (%08x)\n", tag().c_str(), txstat, space.device().safe_pc());
return txstat;
}
@@ -89,12 +89,12 @@ WRITE8_MEMBER(mb8795_device::txstat_w)
{
txstat = txstat & (0xf0 | ~data);
check_irq();
- logerror("%s: txstat_w %02x (%08x)\n", tag(), txstat, space.device().safe_pc());
+ logerror("%s: txstat_w %02x (%08x)\n", tag().c_str(), txstat, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::txmask_r)
{
- logerror("%s: txmask_r %02x (%08x)\n", tag(), txmask, space.device().safe_pc());
+ logerror("%s: txmask_r %02x (%08x)\n", tag().c_str(), txmask, space.device().safe_pc());
return txmask;
}
@@ -102,12 +102,12 @@ WRITE8_MEMBER(mb8795_device::txmask_w)
{
txmask = data & 0xaf;
check_irq();
- logerror("%s: txmask_w %02x (%08x)\n", tag(), txmask, space.device().safe_pc());
+ logerror("%s: txmask_w %02x (%08x)\n", tag().c_str(), txmask, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::rxstat_r)
{
- logerror("%s: rxstat_r %02x (%08x)\n", tag(), rxstat, space.device().safe_pc());
+ logerror("%s: rxstat_r %02x (%08x)\n", tag().c_str(), rxstat, space.device().safe_pc());
return rxstat;
}
@@ -115,12 +115,12 @@ WRITE8_MEMBER(mb8795_device::rxstat_w)
{
rxstat = rxstat & (0x70 | ~data);
check_irq();
- logerror("%s: rxstat_w %02x (%08x)\n", tag(), rxstat, space.device().safe_pc());
+ logerror("%s: rxstat_w %02x (%08x)\n", tag().c_str(), rxstat, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::rxmask_r)
{
- logerror("%s: rxmask_r %02x (%08x)\n", tag(), rxmask, space.device().safe_pc());
+ logerror("%s: rxmask_r %02x (%08x)\n", tag().c_str(), rxmask, space.device().safe_pc());
return rxmask;
}
@@ -128,31 +128,31 @@ WRITE8_MEMBER(mb8795_device::rxmask_w)
{
rxmask = data & 0x9f;
check_irq();
- logerror("%s: rxmask_w %02x (%08x)\n", tag(), rxmask, space.device().safe_pc());
+ logerror("%s: rxmask_w %02x (%08x)\n", tag().c_str(), rxmask, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::txmode_r)
{
- logerror("%s: txmode_r %02x (%08x)\n", tag(), txmode, space.device().safe_pc());
+ logerror("%s: txmode_r %02x (%08x)\n", tag().c_str(), txmode, space.device().safe_pc());
return txmode;
}
WRITE8_MEMBER(mb8795_device::txmode_w)
{
txmode = data;
- logerror("%s: txmode_w %02x (%08x)\n", tag(), txmode, space.device().safe_pc());
+ logerror("%s: txmode_w %02x (%08x)\n", tag().c_str(), txmode, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::rxmode_r)
{
- logerror("%s: rxmode_r %02x (%08x)\n", tag(), rxmode, space.device().safe_pc());
+ logerror("%s: rxmode_r %02x (%08x)\n", tag().c_str(), rxmode, space.device().safe_pc());
return rxmode;
}
WRITE8_MEMBER(mb8795_device::rxmode_w)
{
rxmode = data;
- logerror("%s: rxmode_w %02x (%08x)\n", tag(), rxmode, space.device().safe_pc());
+ logerror("%s: rxmode_w %02x (%08x)\n", tag().c_str(), rxmode, space.device().safe_pc());
}
WRITE8_MEMBER(mb8795_device::reset_w)
@@ -163,7 +163,7 @@ WRITE8_MEMBER(mb8795_device::reset_w)
READ8_MEMBER(mb8795_device::tdc_lsb_r)
{
- logerror("%s: tdc_lsb_r %02x (%08x)\n", tag(), txcount & 0xff, space.device().safe_pc());
+ logerror("%s: tdc_lsb_r %02x (%08x)\n", tag().c_str(), txcount & 0xff, space.device().safe_pc());
return txcount;
}
@@ -172,7 +172,7 @@ READ8_MEMBER(mb8795_device::mac_r)
if(offset < 6)
return mac[offset];
if(offset == 7) {
- logerror("%s: tdc_msb_r %02x (%08x)\n", tag(), txcount >> 8, space.device().safe_pc());
+ logerror("%s: tdc_msb_r %02x (%08x)\n", tag().c_str(), txcount >> 8, space.device().safe_pc());
return (txcount >> 8) & 0x3f;
}
return 0;
@@ -204,7 +204,7 @@ void mb8795_device::tx_dma_w(UINT8 data, bool eof)
drq_tx_cb(drq_tx);
if(eof) {
- logerror("%s: send packet, dest=%02x.%02x.%02x.%02x.%02x.%02x len=%04x loopback=%s\n", tag(),
+ logerror("%s: send packet, dest=%02x.%02x.%02x.%02x.%02x.%02x len=%04x loopback=%s\n", tag().c_str(),
txbuf[0], txbuf[1], txbuf[2], txbuf[3], txbuf[4], txbuf[5],
txlen,
txmode & EN_TMD_LB_DISABLE ? "off" : "on");
@@ -263,7 +263,7 @@ void mb8795_device::receive()
keep = true;
break;
}
- logerror("%s: received packet for %02x.%02x.%02x.%02x.%02x.%02x len=%04x, mode=%d -> %s\n", tag(),
+ logerror("%s: received packet for %02x.%02x.%02x.%02x.%02x.%02x len=%04x, mode=%d -> %s\n", tag().c_str(),
rxbuf[0], rxbuf[1], rxbuf[2], rxbuf[3], rxbuf[4], rxbuf[5],
rxlen, rxmode & 3, keep ? "kept" : "dropped");
if(!keep)
diff --git a/src/devices/machine/mb8795.h b/src/devices/machine/mb8795.h
index 4811d38c04d..b1f8b754e80 100644
--- a/src/devices/machine/mb8795.h
+++ b/src/devices/machine/mb8795.h
@@ -24,7 +24,7 @@ class mb8795_device : public device_t,
public device_network_interface
{
public:
- mb8795_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb8795_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_tx_irq_wr_callback(device_t &device, _Object object) { return downcast<mb8795_device &>(device).irq_tx_cb.set_callback(object); }
template<class _Object> static devcb_base &set_rx_irq_wr_callback(device_t &device, _Object object) { return downcast<mb8795_device &>(device).irq_rx_cb.set_callback(object); }
diff --git a/src/devices/machine/mb89352.cpp b/src/devices/machine/mb89352.cpp
index 1b0894c2007..9335204e3ca 100644
--- a/src/devices/machine/mb89352.cpp
+++ b/src/devices/machine/mb89352.cpp
@@ -115,7 +115,7 @@ const device_type MB89352A = &device_creator<mb89352_device>;
* Device
*/
-mb89352_device::mb89352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mb89352_device::mb89352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
legacy_scsi_host_adapter(mconfig, MB89352A, "MB89352A", tag, owner, clock, "mb89352", __FILE__),
m_irq_cb(*this),
m_drq_cb(*this)
diff --git a/src/devices/machine/mb89352.h b/src/devices/machine/mb89352.h
index faae5c4ab3f..15a808f3b84 100644
--- a/src/devices/machine/mb89352.h
+++ b/src/devices/machine/mb89352.h
@@ -60,7 +60,7 @@ class mb89352_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- mb89352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb89352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<mb89352_device &>(device).m_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast<mb89352_device &>(device).m_drq_cb.set_callback(object); }
diff --git a/src/devices/machine/mb89363b.cpp b/src/devices/machine/mb89363b.cpp
index 2e4f210a865..975378a11db 100644
--- a/src/devices/machine/mb89363b.cpp
+++ b/src/devices/machine/mb89363b.cpp
@@ -84,7 +84,7 @@
extern const device_type MB89363B = &device_creator<mb89363b_device>;
-mb89363b_device::mb89363b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mb89363b_device::mb89363b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB89363B, "MB89363 I/O", tag, owner, clock, "mb89363b", __FILE__),
m_i8255_a(*this, "i8255_a"),
m_i8255_b(*this, "i8255_b"),
diff --git a/src/devices/machine/mb89363b.h b/src/devices/machine/mb89363b.h
index 85b1913e6d1..bf03320df25 100644
--- a/src/devices/machine/mb89363b.h
+++ b/src/devices/machine/mb89363b.h
@@ -66,7 +66,7 @@ class mb89363b_device : public device_t
{
public:
// construction/destruction
- mb89363b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb89363b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/devices/machine/mb89371.cpp b/src/devices/machine/mb89371.cpp
index 1188f295725..fd29deb94a1 100644
--- a/src/devices/machine/mb89371.cpp
+++ b/src/devices/machine/mb89371.cpp
@@ -12,7 +12,7 @@
const device_type MB89371 = &device_creator<mb89371_device>;
-mb89371_device::mb89371_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
+mb89371_device::mb89371_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
: device_t(mconfig, MB89371, "MB89371 Dual Serial UART", tag, owner, clock, "mb89371", __FILE__)
{
}
diff --git a/src/devices/machine/mb89371.h b/src/devices/machine/mb89371.h
index f7d5c1a2bad..5862c202f6b 100644
--- a/src/devices/machine/mb89371.h
+++ b/src/devices/machine/mb89371.h
@@ -17,7 +17,7 @@ class mb89371_device : public device_t
{
public:
// construction/destruction
- mb89371_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mb89371_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( read );
diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp
index 9166e189952..dccbf078ef4 100644
--- a/src/devices/machine/mc146818.cpp
+++ b/src/devices/machine/mc146818.cpp
@@ -30,7 +30,7 @@ const device_type MC146818 = &device_creator<mc146818_device>;
// mc146818_device - constructor
//-------------------------------------------------
-mc146818_device::mc146818_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc146818_device::mc146818_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC146818, "MC146818 RTC", tag, owner, clock, "mc146818", __FILE__),
device_nvram_interface(mconfig, *this),
m_index(0),
@@ -45,7 +45,7 @@ mc146818_device::mc146818_device(const machine_config &mconfig, const char *tag,
{
}
-mc146818_device::mc146818_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mc146818_device::mc146818_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nvram_interface(mconfig, *this),
m_index(0),
diff --git a/src/devices/machine/mc146818.h b/src/devices/machine/mc146818.h
index c1c30eae17e..c45b05ea42e 100644
--- a/src/devices/machine/mc146818.h
+++ b/src/devices/machine/mc146818.h
@@ -57,8 +57,8 @@ class mc146818_device : public device_t,
{
public:
// construction/destruction
- mc146818_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mc146818_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mc146818_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc146818_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// callbacks
template<class _irq> void set_irq_callback(_irq irq) { m_write_irq.set_callback(irq); }
diff --git a/src/devices/machine/mc2661.cpp b/src/devices/machine/mc2661.cpp
index f93dc1b5ab1..27d2536a5f0 100644
--- a/src/devices/machine/mc2661.cpp
+++ b/src/devices/machine/mc2661.cpp
@@ -94,7 +94,7 @@ enum
// mc2661_device - constructor
//-------------------------------------------------
-mc2661_device::mc2661_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mc2661_device::mc2661_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MC2661, "MC2661", tag, owner, clock, "mc2661", __FILE__),
device_serial_interface(mconfig, *this),
m_write_txd(*this),
@@ -264,7 +264,7 @@ WRITE8_MEMBER( mc2661_device::write )
switch (offset & 0x03)
{
case REGISTER_HOLDING:
- if (LOG) logerror("MC2661 '%s' Transmit Holding Register: %02x\n", tag(), data);
+ if (LOG) logerror("MC2661 '%s' Transmit Holding Register: %02x\n", tag().c_str(), data);
m_thr = data;
if(COMMAND_TXEN)
@@ -283,7 +283,7 @@ WRITE8_MEMBER( mc2661_device::write )
break;
case REGISTER_SYNC:
- if (LOG) logerror("MC2661 '%s' Sync Register %u: %02x\n", tag(), m_sync_index + 1, data);
+ if (LOG) logerror("MC2661 '%s' Sync Register %u: %02x\n", tag().c_str(), m_sync_index + 1, data);
m_sync[m_sync_index] = data;
@@ -292,7 +292,7 @@ WRITE8_MEMBER( mc2661_device::write )
break;
case REGISTER_MODE:
- if (LOG) logerror("MC2661 '%s' Mode Register %u: %02x\n", tag(), m_mode_index + 1, data);
+ if (LOG) logerror("MC2661 '%s' Mode Register %u: %02x\n", tag().c_str(), m_mode_index + 1, data);
m_mr[m_mode_index] = data;
@@ -383,7 +383,7 @@ WRITE8_MEMBER( mc2661_device::write )
break;
case REGISTER_COMMAND:
- if (LOG) logerror("MC2661 '%s' Command Register: %02x\n", tag(), data);
+ if (LOG) logerror("MC2661 '%s' Command Register: %02x\n", tag().c_str(), data);
m_cr = data & 0xef;
@@ -431,7 +431,7 @@ WRITE8_MEMBER( mc2661_device::write )
WRITE_LINE_MEMBER( mc2661_device::dsr_w )
{
- if (LOG) logerror("MC2661 '%s' Data Set Ready: %u\n", tag(), state);
+ if (LOG) logerror("MC2661 '%s' Data Set Ready: %u\n", tag().c_str(), state);
if (state)
{
@@ -450,7 +450,7 @@ WRITE_LINE_MEMBER( mc2661_device::dsr_w )
WRITE_LINE_MEMBER( mc2661_device::dcd_w )
{
- if (LOG) logerror("MC2661 '%s' Data Carrier Detect: %u\n", tag(), state);
+ if (LOG) logerror("MC2661 '%s' Data Carrier Detect: %u\n", tag().c_str(), state);
if (state)
{
@@ -469,7 +469,7 @@ WRITE_LINE_MEMBER( mc2661_device::dcd_w )
WRITE_LINE_MEMBER( mc2661_device::cts_w )
{
- if (LOG) logerror("MC2661 '%s' Clear to Send: %u\n", tag(), state);
+ if (LOG) logerror("MC2661 '%s' Clear to Send: %u\n", tag().c_str(), state);
}
diff --git a/src/devices/machine/mc2661.h b/src/devices/machine/mc2661.h
index a18aa0141f1..bcbe2157e1e 100644
--- a/src/devices/machine/mc2661.h
+++ b/src/devices/machine/mc2661.h
@@ -79,7 +79,7 @@ class mc2661_device : public device_t,
{
public:
// construction/destruction
- mc2661_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc2661_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void static_set_rxc(device_t &device, int clock) { downcast<mc2661_device &>(device).m_rxc = clock; }
static void static_set_txc(device_t &device, int clock) { downcast<mc2661_device &>(device).m_txc = clock; }
diff --git a/src/devices/machine/mc68328.cpp b/src/devices/machine/mc68328.cpp
index deb73d0eaa4..ffe47f686ac 100644
--- a/src/devices/machine/mc68328.cpp
+++ b/src/devices/machine/mc68328.cpp
@@ -31,7 +31,7 @@ static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, co
const device_type MC68328 = &device_creator<mc68328_device>;
-mc68328_device::mc68328_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc68328_device::mc68328_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC68328, "MC68328 (DragonBall) Integrated Processor", tag, owner, clock, "mc68328", __FILE__), m_rtc(nullptr), m_pwm(nullptr),
m_out_port_a_cb(*this),
m_out_port_b_cb(*this),
diff --git a/src/devices/machine/mc68328.h b/src/devices/machine/mc68328.h
index c01e2ab471b..c11aeae5b22 100644
--- a/src/devices/machine/mc68328.h
+++ b/src/devices/machine/mc68328.h
@@ -606,10 +606,10 @@ struct mc68328_regs_t
class mc68328_device : public device_t
{
public:
- mc68328_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc68328_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mc68328_device() {}
- static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<mc68328_device &>(device).m_cpu.set_tag(tag); }
+ static void static_set_cpu_tag(device_t &device, std::string tag) { downcast<mc68328_device &>(device).m_cpu.set_tag(tag); }
template<class _Object> static devcb_base &set_out_port_a_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_a_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_port_b_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_b_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_port_c_callback(device_t &device, _Object object) { return downcast<mc68328_device &>(device).m_out_port_c_cb.set_callback(object); }
diff --git a/src/devices/machine/mc6843.cpp b/src/devices/machine/mc6843.cpp
index 04a7b6a0906..3d68988d15f 100644
--- a/src/devices/machine/mc6843.cpp
+++ b/src/devices/machine/mc6843.cpp
@@ -74,7 +74,7 @@ static const char *const mc6843_cmd[16] =
const device_type MC6843 = &device_creator<mc6843_device>;
-mc6843_device::mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6843_device::mc6843_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC6843, "MC6843 floppy controller", tag, owner, clock, "mc6843", __FILE__),
m_write_irq(*this),
m_CTAR(0),
diff --git a/src/devices/machine/mc6843.h b/src/devices/machine/mc6843.h
index 9dea3271e0d..d9eb57cddfd 100644
--- a/src/devices/machine/mc6843.h
+++ b/src/devices/machine/mc6843.h
@@ -19,7 +19,7 @@
class mc6843_device : public device_t
{
public:
- mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6843_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mc6843_device() {}
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mc6843_device &>(device).m_write_irq.set_callback(object); }
diff --git a/src/devices/machine/mc6846.cpp b/src/devices/machine/mc6846.cpp
index 18b9f723bfb..c213dc04669 100644
--- a/src/devices/machine/mc6846.cpp
+++ b/src/devices/machine/mc6846.cpp
@@ -45,7 +45,7 @@
const device_type MC6846 = &device_creator<mc6846_device>;
-mc6846_device::mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6846_device::mc6846_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC6846, "MC6846 Programmable Timer", tag, owner, clock, "mc6846", __FILE__),
m_out_port_cb(*this),
m_out_cp1_cb(*this),
diff --git a/src/devices/machine/mc6846.h b/src/devices/machine/mc6846.h
index bb198ee64d7..7444980bed3 100644
--- a/src/devices/machine/mc6846.h
+++ b/src/devices/machine/mc6846.h
@@ -34,7 +34,7 @@
class mc6846_device : public device_t
{
public:
- mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6846_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mc6846_device() {}
template<class _Object> static devcb_base &set_out_port_callback(device_t &device, _Object object) { return downcast<mc6846_device &>(device).m_out_port_cb.set_callback(object); }
diff --git a/src/devices/machine/mc6852.cpp b/src/devices/machine/mc6852.cpp
index b0cf1ff9ca9..6d323b35d52 100644
--- a/src/devices/machine/mc6852.cpp
+++ b/src/devices/machine/mc6852.cpp
@@ -93,7 +93,7 @@ const device_type MC6852 = &device_creator<mc6852_device>;
// mc6852_device - constructor
//-------------------------------------------------
-mc6852_device::mc6852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mc6852_device::mc6852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MC6852, "MC6852", tag, owner, clock, "mc6852", __FILE__),
device_serial_interface(mconfig, *this),
m_write_tx_data(*this),
@@ -270,7 +270,7 @@ WRITE8_MEMBER( mc6852_device::write )
Register is set to ones.
*/
- if (LOG) logerror("MC6852 '%s' Receiver Reset\n", tag());
+ if (LOG) logerror("MC6852 '%s' Receiver Reset\n", tag().c_str());
m_status &= ~(S_RX_OVRN | S_PE | S_DCD | S_RDA);
m_rsr = 0xff;
@@ -286,15 +286,15 @@ WRITE8_MEMBER( mc6852_device::write )
and inhibits the TDRA status bit (in the one-sync-character
and two-sync-character modes).*/
- if (LOG) logerror("MC6852 '%s' Transmitter Reset\n", tag());
+ if (LOG) logerror("MC6852 '%s' Transmitter Reset\n", tag().c_str());
m_status &= ~(S_TUF | S_CTS | S_TDRA);
}
if (LOG)
{
- if (data & C1_STRIP_SYNC) logerror("MC6852 '%s' Strip Synchronization Characters\n", tag());
- if (data & C1_CLEAR_SYNC) logerror("MC6852 '%s' Clear Synchronization\n", tag());
+ if (data & C1_STRIP_SYNC) logerror("MC6852 '%s' Strip Synchronization Characters\n", tag().c_str());
+ if (data & C1_CLEAR_SYNC) logerror("MC6852 '%s' Clear Synchronization\n", tag().c_str());
}
m_cr[0] = data;
diff --git a/src/devices/machine/mc6852.h b/src/devices/machine/mc6852.h
index 68cd76f6126..6d18bdd68d2 100644
--- a/src/devices/machine/mc6852.h
+++ b/src/devices/machine/mc6852.h
@@ -66,7 +66,7 @@ class mc6852_device : public device_t,
{
public:
// construction/destruction
- mc6852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
static void set_rx_clock(device_t &device, int clock) { downcast<mc6852_device &>(device).m_rx_clock = clock; }
static void set_tx_clock(device_t &device, int clock) { downcast<mc6852_device &>(device).m_tx_clock = clock; }
diff --git a/src/devices/machine/mc6854.cpp b/src/devices/machine/mc6854.cpp
index 3461d58dde5..d14a5e666c8 100644
--- a/src/devices/machine/mc6854.cpp
+++ b/src/devices/machine/mc6854.cpp
@@ -167,7 +167,7 @@ static const int word_length[4] = { 5, 6, 7, 8 };
const device_type MC6854 = &device_creator<mc6854_device>;
-mc6854_device::mc6854_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc6854_device::mc6854_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC6854, "MC6854 ADLC", tag, owner, clock, "mc6854", __FILE__),
m_out_irq_cb(*this),
m_out_txd_cb(*this),
diff --git a/src/devices/machine/mc6854.h b/src/devices/machine/mc6854.h
index 9c665d0429b..64f083addc5 100644
--- a/src/devices/machine/mc6854.h
+++ b/src/devices/machine/mc6854.h
@@ -41,7 +41,7 @@ typedef device_delegate<void (UINT8 *data, int length)> mc6854_out_frame_delegat
class mc6854_device : public device_t
{
public:
- mc6854_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc6854_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mc6854_device() {}
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_irq_cb.set_callback(object); }
diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp
index 00b38347285..eee90e35867 100644
--- a/src/devices/machine/mc68681.cpp
+++ b/src/devices/machine/mc68681.cpp
@@ -64,7 +64,7 @@ MACHINE_CONFIG_END
// LIVE DEVICE
//**************************************************************************
-mc68681_device::mc68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc68681_device::mc68681_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC68681, "MC68681 DUART", tag, owner, clock, "mc68681", __FILE__),
m_chanA(*this, CHANA_TAG),
m_chanB(*this, CHANB_TAG),
@@ -294,7 +294,7 @@ READ8_MEMBER( mc68681_device::read )
offset &= 0xf;
- LOG(( "Reading 68681 (%s) reg %x (%s) ", tag(), offset, duart68681_reg_read_names[offset] ));
+ LOG(( "Reading 68681 (%s) reg %x (%s) ", tag().c_str(), offset, duart68681_reg_read_names[offset] ));
switch (offset)
{
@@ -395,7 +395,7 @@ READ8_MEMBER( mc68681_device::read )
WRITE8_MEMBER( mc68681_device::write )
{
offset &= 0x0f;
- LOG(( "Writing 68681 (%s) reg %x (%s) with %04x\n", tag(), offset, duart68681_reg_write_names[offset], data ));
+ LOG(( "Writing 68681 (%s) reg %x (%s) with %04x\n", tag().c_str(), offset, duart68681_reg_write_names[offset], data ));
switch(offset)
{
case 0x00: /* MRA */
@@ -468,7 +468,7 @@ WRITE8_MEMBER( mc68681_device::write )
case 0x0d: /* OPCR */
if ((data != 0x00) && ((data & 0xc) != 0x4))
- logerror( "68681 (%s): Unhandled OPCR value: %02x\n", tag(), data);
+ logerror( "68681 (%s): Unhandled OPCR value: %02x\n", tag().c_str(), data);
OPCR = data;
break;
@@ -644,7 +644,7 @@ void mc68681_device::set_ISR_bits(int mask)
// DUART channel class stuff
-mc68681_channel::mc68681_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc68681_channel::mc68681_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC68681_CHANNEL, "MC68681 DUART CHANNEL", tag, owner, clock, "mc68681_channel", __FILE__),
device_serial_interface(mconfig, *this),
MR1(0),
@@ -702,7 +702,7 @@ void mc68681_channel::rcv_complete()
{
receive_register_extract();
-// printf("%s ch %d rcv complete\n", tag(), m_ch);
+// printf("%s ch %d rcv complete\n", tag().c_str(), m_ch);
if ( rx_enabled )
{
@@ -724,7 +724,7 @@ void mc68681_channel::rcv_complete()
void mc68681_channel::tra_complete()
{
-// printf("%s ch %d Tx complete\n", tag(), m_ch);
+// printf("%s ch %d Tx complete\n", tag().c_str(), m_ch);
tx_ready = 1;
SR |= STATUS_TRANSMITTER_READY;
@@ -761,7 +761,7 @@ void mc68681_channel::tra_callback()
if ((MR2&0xC0) != 0x80)
{
int bit = transmit_register_get_data_bit();
-// printf("%s ch %d transmit %d\n", tag(), m_ch, bit);
+// printf("%s ch %d transmit %d\n", tag().c_str(), m_ch, bit);
if (m_ch == 0)
{
m_uart->write_a_tx(bit);
@@ -948,7 +948,7 @@ void mc68681_channel::write_chan_reg(int reg, UINT8 data)
CSR = data;
tx_baud_rate = m_uart->calc_baud(m_ch, data & 0xf);
rx_baud_rate = m_uart->calc_baud(m_ch, (data>>4) & 0xf);
-// printf("%s ch %d CSR %02x Tx baud %d Rx baud %d\n", tag(), m_ch, data, tx_baud_rate, rx_baud_rate);
+// printf("%s ch %d CSR %02x Tx baud %d Rx baud %d\n", tag().c_str(), m_ch, data, tx_baud_rate, rx_baud_rate);
set_rcv_rate(rx_baud_rate);
set_tra_rate(tx_baud_rate);
break;
@@ -1033,7 +1033,7 @@ void mc68681_channel::recalc_framing()
break;
}
-// printf("%s ch %d MR1 %02x MR2 %02x => %d bits / char, %d stop bits, parity %d\n", tag(), m_ch, MR1, MR2, (MR1 & 3)+5, stopbits, parity);
+// printf("%s ch %d MR1 %02x MR2 %02x => %d bits / char, %d stop bits, parity %d\n", tag().c_str(), m_ch, MR1, MR2, (MR1 & 3)+5, stopbits, parity);
set_data_frame(1, (MR1 & 3)+5, parity, stopbits);
}
@@ -1125,7 +1125,7 @@ void mc68681_channel::write_TX(UINT8 data)
printf("Write %02x to TX when TX not ready!\n", data);
}*/
-// printf("%s ch %d Tx %02x\n", tag(), m_ch, data);
+// printf("%s ch %d Tx %02x\n", tag().c_str(), m_ch, data);
tx_ready = 0;
SR &= ~STATUS_TRANSMITTER_READY;
diff --git a/src/devices/machine/mc68681.h b/src/devices/machine/mc68681.h
index abae110dbac..2d55d4a8585 100644
--- a/src/devices/machine/mc68681.h
+++ b/src/devices/machine/mc68681.h
@@ -38,7 +38,7 @@ class mc68681_device;
class mc68681_channel : public device_t, public device_serial_interface
{
public:
- mc68681_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc68681_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -99,7 +99,7 @@ class mc68681_device : public device_t
friend class mc68681_channel;
public:
- mc68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc68681_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
required_device<mc68681_channel> m_chanA;
required_device<mc68681_channel> m_chanB;
diff --git a/src/devices/machine/mc68901.cpp b/src/devices/machine/mc68901.cpp
index 4d35d2a2c44..975bd26dfb2 100644
--- a/src/devices/machine/mc68901.cpp
+++ b/src/devices/machine/mc68901.cpp
@@ -294,11 +294,11 @@ inline void mc68901_device::gpio_input(int bit, int state)
{
if (state == BIT(m_aer, bit))
{
- if (LOG) logerror("MC68901 '%s' Edge Transition Detected on GPIO%u\n", tag(), bit);
+ if (LOG) logerror("MC68901 '%s' Edge Transition Detected on GPIO%u\n", tag().c_str(), bit);
if (m_ier & INT_MASK_GPIO[bit]) // AND interrupt enabled bit is set...
{
- if (LOG) logerror("MC68901 '%s' Interrupt Pending for GPIO%u\n", tag(), bit);
+ if (LOG) logerror("MC68901 '%s' Interrupt Pending for GPIO%u\n", tag().c_str(), bit);
take_interrupt(INT_MASK_GPIO[bit]); // set interrupt pending bit
}
@@ -332,7 +332,7 @@ void mc68901_device::gpio_output()
// mc68901_device - constructor
//-------------------------------------------------
-mc68901_device::mc68901_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mc68901_device::mc68901_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC68901, "MC68901 MFP", tag, owner, clock, "mc68901", __FILE__),
device_serial_interface(mconfig, *this),
m_timer_clock(0),
@@ -596,84 +596,84 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch (offset)
{
case REGISTER_GPIP:
- if (LOG) logerror("MC68901 '%s' General Purpose I/O : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' General Purpose I/O : %x\n", tag().c_str(), data);
m_gpip = data;
gpio_output();
break;
case REGISTER_AER:
- if (LOG) logerror("MC68901 '%s' Active Edge Register : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Active Edge Register : %x\n", tag().c_str(), data);
m_aer = data;
break;
case REGISTER_DDR:
- if (LOG) logerror("MC68901 '%s' Data Direction Register : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Data Direction Register : %x\n", tag().c_str(), data);
m_ddr = data;
gpio_output();
break;
case REGISTER_IERA:
- if (LOG) logerror("MC68901 '%s' Interrupt Enable Register A : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Enable Register A : %x\n", tag().c_str(), data);
m_ier = (data << 8) | (m_ier & 0xff);
m_ipr &= m_ier;
check_interrupts();
break;
case REGISTER_IERB:
- if (LOG) logerror("MC68901 '%s' Interrupt Enable Register B : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Enable Register B : %x\n", tag().c_str(), data);
m_ier = (m_ier & 0xff00) | data;
m_ipr &= m_ier;
check_interrupts();
break;
case REGISTER_IPRA:
- if (LOG) logerror("MC68901 '%s' Interrupt Pending Register A : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Pending Register A : %x\n", tag().c_str(), data);
m_ipr &= (data << 8) | (m_ipr & 0xff);
check_interrupts();
break;
case REGISTER_IPRB:
- if (LOG) logerror("MC68901 '%s' Interrupt Pending Register B : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Pending Register B : %x\n", tag().c_str(), data);
m_ipr &= (m_ipr & 0xff00) | data;
check_interrupts();
break;
case REGISTER_ISRA:
- if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register A : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register A : %x\n", tag().c_str(), data);
m_isr &= (data << 8) | (m_isr & 0xff);
break;
case REGISTER_ISRB:
- if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register B : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register B : %x\n", tag().c_str(), data);
m_isr &= (m_isr & 0xff00) | data;
break;
case REGISTER_IMRA:
- if (LOG) logerror("MC68901 '%s' Interrupt Mask Register A : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Mask Register A : %x\n", tag().c_str(), data);
m_imr = (data << 8) | (m_imr & 0xff);
m_isr &= m_imr;
check_interrupts();
break;
case REGISTER_IMRB:
- if (LOG) logerror("MC68901 '%s' Interrupt Mask Register B : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Mask Register B : %x\n", tag().c_str(), data);
m_imr = (m_imr & 0xff00) | data;
m_isr &= m_imr;
check_interrupts();
break;
case REGISTER_VR:
- if (LOG) logerror("MC68901 '%s' Interrupt Vector : %x\n", tag(), data & 0xf0);
+ if (LOG) logerror("MC68901 '%s' Interrupt Vector : %x\n", tag().c_str(), data & 0xf0);
m_vr = data & 0xf8;
if (m_vr & VR_S)
{
- if (LOG) logerror("MC68901 '%s' Software End-Of-Interrupt Mode\n", tag());
+ if (LOG) logerror("MC68901 '%s' Software End-Of-Interrupt Mode\n", tag().c_str());
}
else
{
- if (LOG) logerror("MC68901 '%s' Automatic End-Of-Interrupt Mode\n", tag());
+ if (LOG) logerror("MC68901 '%s' Automatic End-Of-Interrupt Mode\n", tag().c_str());
m_isr = 0;
}
@@ -685,7 +685,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch (m_tacr & 0x0f)
{
case TCR_TIMER_STOPPED:
- if (LOG) logerror("MC68901 '%s' Timer A Stopped\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer A Stopped\n", tag().c_str());
m_timer[TIMER_A]->enable(false);
break;
@@ -698,13 +698,13 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_DELAY_200:
{
int divisor = PRESCALER[m_tacr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer A Delay Mode : %u Prescale\n", tag(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer A Delay Mode : %u Prescale\n", tag().c_str(), divisor);
m_timer[TIMER_A]->adjust(attotime::from_hz(m_timer_clock / divisor), 0, attotime::from_hz(m_timer_clock / divisor));
}
break;
case TCR_TIMER_EVENT:
- if (LOG) logerror("MC68901 '%s' Timer A Event Count Mode\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer A Event Count Mode\n", tag().c_str());
m_timer[TIMER_A]->enable(false);
break;
@@ -717,7 +717,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_PULSE_200:
{
int divisor = PRESCALER[m_tacr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer A Pulse Width Mode : %u Prescale\n", tag(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer A Pulse Width Mode : %u Prescale\n", tag().c_str(), divisor);
m_timer[TIMER_A]->adjust(attotime::never, 0, attotime::from_hz(m_timer_clock / divisor));
m_timer[TIMER_A]->enable(false);
}
@@ -726,7 +726,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
if (m_tacr & TCR_TIMER_RESET)
{
- if (LOG) logerror("MC68901 '%s' Timer A Reset\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer A Reset\n", tag().c_str());
m_to[TIMER_A] = 0;
@@ -740,7 +740,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch (m_tbcr & 0x0f)
{
case TCR_TIMER_STOPPED:
- if (LOG) logerror("MC68901 '%s' Timer B Stopped\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer B Stopped\n", tag().c_str());
m_timer[TIMER_B]->enable(false);
break;
@@ -753,13 +753,13 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_DELAY_200:
{
int divisor = PRESCALER[m_tbcr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer B Delay Mode : %u Prescale\n", tag(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer B Delay Mode : %u Prescale\n", tag().c_str(), divisor);
m_timer[TIMER_B]->adjust(attotime::from_hz(m_timer_clock / divisor), 0, attotime::from_hz(m_timer_clock / divisor));
}
break;
case TCR_TIMER_EVENT:
- if (LOG) logerror("MC68901 '%s' Timer B Event Count Mode\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer B Event Count Mode\n", tag().c_str());
m_timer[TIMER_B]->enable(false);
break;
@@ -772,7 +772,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_PULSE_200:
{
int divisor = PRESCALER[m_tbcr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer B Pulse Width Mode : %u Prescale\n", tag(), DIVISOR);
+ if (LOG) logerror("MC68901 '%s' Timer B Pulse Width Mode : %u Prescale\n", tag().c_str(), DIVISOR);
m_timer[TIMER_B]->adjust(attotime::never, 0, attotime::from_hz(m_timer_clock / divisor));
m_timer[TIMER_B]->enable(false);
}
@@ -781,7 +781,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
if (m_tacr & TCR_TIMER_RESET)
{
- if (LOG) logerror("MC68901 '%s' Timer B Reset\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer B Reset\n", tag().c_str());
m_to[TIMER_B] = 0;
@@ -795,7 +795,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch (m_tcdcr & 0x07)
{
case TCR_TIMER_STOPPED:
- if (LOG) logerror("MC68901 '%s' Timer D Stopped\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer D Stopped\n", tag().c_str());
m_timer[TIMER_D]->enable(false);
break;
@@ -808,7 +808,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_DELAY_200:
{
int divisor = PRESCALER[m_tcdcr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer D Delay Mode : %u Prescale\n", tag(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer D Delay Mode : %u Prescale\n", tag().c_str(), divisor);
m_timer[TIMER_D]->adjust(attotime::from_hz(m_timer_clock / divisor), 0, attotime::from_hz(m_timer_clock / divisor));
}
break;
@@ -817,7 +817,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch ((m_tcdcr >> 4) & 0x07)
{
case TCR_TIMER_STOPPED:
- if (LOG) logerror("MC68901 '%s' Timer C Stopped\n", tag());
+ if (LOG) logerror("MC68901 '%s' Timer C Stopped\n", tag().c_str());
m_timer[TIMER_C]->enable(false);
break;
@@ -830,7 +830,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_DELAY_200:
{
int divisor = PRESCALER[(m_tcdcr >> 4) & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer C Delay Mode : %u Prescale\n", tag(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer C Delay Mode : %u Prescale\n", tag().c_str(), divisor);
m_timer[TIMER_C]->adjust(attotime::from_hz(m_timer_clock / divisor), 0, attotime::from_hz(m_timer_clock / divisor));
}
break;
@@ -838,7 +838,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_TADR:
- if (LOG) logerror("MC68901 '%s' Timer A Data Register : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Timer A Data Register : %x\n", tag().c_str(), data);
m_tdr[TIMER_A] = data;
@@ -849,7 +849,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_TBDR:
- if (LOG) logerror("MC68901 '%s' Timer B Data Register : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Timer B Data Register : %x\n", tag().c_str(), data);
m_tdr[TIMER_B] = data;
@@ -860,7 +860,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_TCDR:
- if (LOG) logerror("MC68901 '%s' Timer C Data Register : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Timer C Data Register : %x\n", tag().c_str(), data);
m_tdr[TIMER_C] = data;
@@ -871,7 +871,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_TDDR:
- if (LOG) logerror("MC68901 '%s' Timer D Data Register : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Timer D Data Register : %x\n", tag().c_str(), data);
m_tdr[TIMER_D] = data;
@@ -882,7 +882,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_SCR:
- if (LOG) logerror("MC68901 '%s' Sync Character : %x\n", tag(), data);
+ if (LOG) logerror("MC68901 '%s' Sync Character : %x\n", tag().c_str(), data);
m_scr = data;
break;
@@ -905,25 +905,25 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
{
if (data & UCR_PARITY_EVEN)
{
- if (LOG) logerror("MC68901 '%s' Parity : Even\n", tag());
+ if (LOG) logerror("MC68901 '%s' Parity : Even\n", tag().c_str());
parity = PARITY_EVEN;
}
else
{
- if (LOG) logerror("MC68901 '%s' Parity : Odd\n", tag());
+ if (LOG) logerror("MC68901 '%s' Parity : Odd\n", tag().c_str());
parity = PARITY_ODD;
}
}
else
{
- if (LOG) logerror("MC68901 '%s' Parity : Disabled\n", tag());
+ if (LOG) logerror("MC68901 '%s' Parity : Disabled\n", tag().c_str());
parity = PARITY_NONE;
}
- if (LOG) logerror("MC68901 '%s' Word Length : %u bits\n", tag(), data_bit_count);
+ if (LOG) logerror("MC68901 '%s' Word Length : %u bits\n", tag().c_str(), data_bit_count);
int start_bits;
@@ -935,35 +935,35 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
default:
start_bits = 0;
stop_bits = STOP_BITS_0;
- if (LOG) logerror("MC68901 '%s' Start Bits : 0, Stop Bits : 0, Format : synchronous\n", tag());
+ if (LOG) logerror("MC68901 '%s' Start Bits : 0, Stop Bits : 0, Format : synchronous\n", tag().c_str());
break;
case UCR_START_STOP_1_1:
start_bits = 1;
stop_bits = STOP_BITS_1;
- if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1, Format : asynchronous\n", tag());
+ if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1, Format : asynchronous\n", tag().c_str());
break;
case UCR_START_STOP_1_15:
start_bits = 1;
stop_bits = STOP_BITS_1_5;
- if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1.5, Format : asynchronous\n", tag());
+ if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1.5, Format : asynchronous\n", tag().c_str());