summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-01-20 21:42:13 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-01-20 21:42:13 +0100
commit4e8e3066f847cc0fa11539f4d9ab8a63f70ca475 (patch)
tree25d48b50f2b89dd5b9e7dbbfeeb85c534ec6852a /src/devices/machine
parent3a8ccb89b426509be06089a19c51ecf55567ed1b (diff)
reverting:
SHA-1: 1f90ceab075c4869298e963bf0a14a0aac2f1caa * tags are now strings (nw) fix start project for custom builds in Visual Studio (nw)
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.cpp71
-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, 2581 deletions
diff --git a/src/devices/machine/40105.cpp b/src/devices/machine/40105.cpp
index 8364f5dbf5d..c220f9eb18c 100644
--- a/src/devices/machine/40105.cpp
+++ b/src/devices/machine/40105.cpp
@@ -34,7 +34,7 @@ const device_type CMOS_40105 = &device_creator<cmos_40105_device>;
// cmos_40105_device - constructor
//-------------------------------------------------
-cmos_40105_device::cmos_40105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+cmos_40105_device::cmos_40105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CMOS_40105, "40105", tag, owner, clock, "40105", __FILE__),
m_write_dir(*this),
m_write_dor(*this), m_d(0), m_q(0), m_dir(0), m_dor(0), m_si(0), m_so(0)
diff --git a/src/devices/machine/40105.h b/src/devices/machine/40105.h
index ea85a3af005..09411a0d3e3 100644
--- a/src/devices/machine/40105.h
+++ b/src/devices/machine/40105.h
@@ -37,7 +37,7 @@ class cmos_40105_device : public device_t
{
public:
// construction/destruction
- cmos_40105_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cmos_40105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 b77ba37a72a..c77baa6a8dc 100644
--- a/src/devices/machine/53c7xx.cpp
+++ b/src/devices/machine/53c7xx.cpp
@@ -58,7 +58,7 @@ const device_type NCR53C7XX = &device_creator<ncr53c7xx_device>;
// ncr53c7xx_device - constructor/destructor
//-------------------------------------------------
-ncr53c7xx_device::ncr53c7xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ncr53c7xx_device::ncr53c7xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: nscsi_device(mconfig, NCR53C7XX, "53C7xx SCSI", tag, owner, clock, "ncr537xx", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
diff --git a/src/devices/machine/53c7xx.h b/src/devices/machine/53c7xx.h
index 3167e45114d..00d87c6337d 100644
--- a/src/devices/machine/53c7xx.h
+++ b/src/devices/machine/53c7xx.h
@@ -72,7 +72,7 @@ class ncr53c7xx_device : public nscsi_device,
{
public:
// construction/destruction
- ncr53c7xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ncr53c7xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<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 db88b7130db..2d6b7049016 100644
--- a/src/devices/machine/53c810.cpp
+++ b/src/devices/machine/53c810.cpp
@@ -621,7 +621,7 @@ void lsi53c810_device::add_opcode(UINT8 op, UINT8 mask, opcode_handler_delegate
}
}
-lsi53c810_device::lsi53c810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+lsi53c810_device::lsi53c810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: legacy_scsi_host_adapter(mconfig, LSI53C810, "53C810 SCSI", tag, owner, clock, "lsi53c810", __FILE__)
{
}
diff --git a/src/devices/machine/53c810.h b/src/devices/machine/53c810.h
index 51958111d2f..49ac2281e2f 100644
--- a/src/devices/machine/53c810.h
+++ b/src/devices/machine/53c810.h
@@ -19,7 +19,7 @@ class lsi53c810_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- lsi53c810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ lsi53c810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_irq_callback(device_t &device, lsi53c810_irq_delegate callback) { downcast<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 d60d7de86a4..fbbe84d7383 100644
--- a/src/devices/machine/64h156.cpp
+++ b/src/devices/machine/64h156.cpp
@@ -54,7 +54,7 @@ const device_type C64H156 = &device_creator<c64h156_device>;
// c64h156_device - constructor
//-------------------------------------------------
-c64h156_device::c64h156_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+c64h156_device::c64h156_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C64H156, "64H156", tag, owner, clock, "c64h156", __FILE__),
m_write_atn(*this),
m_write_sync(*this),
diff --git a/src/devices/machine/64h156.h b/src/devices/machine/64h156.h
index 055239af5dc..6cab8bb369d 100644
--- a/src/devices/machine/64h156.h
+++ b/src/devices/machine/64h156.h
@@ -92,7 +92,7 @@ class c64h156_device : public device_t
{
public:
// construction/destruction
- c64h156_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ c64h156_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 fe4b7d8f37f..56a35e19040 100644
--- a/src/devices/machine/6522via.cpp
+++ b/src/devices/machine/6522via.cpp
@@ -142,7 +142,7 @@ ADDRESS_MAP_END
// via6522_device - constructor
//-------------------------------------------------
-via6522_device::via6522_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+via6522_device::via6522_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VIA6522, "6522 VIA", tag, owner, clock, "via6522", __FILE__),
m_in_a_handler(*this),
m_in_b_handler(*this),
@@ -312,7 +312,7 @@ void via6522_device::set_int(int data)
if (TRACE_VIA)
{
- logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag().c_str(), m_ifr);
+ logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag(), m_ifr);
}
}
}
@@ -332,7 +332,7 @@ void via6522_device::clear_int(int data)
if (TRACE_VIA)
{
- logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag().c_str(), m_ifr);
+ logerror("%s:6522VIA chip %s: IFR = %02X\n", machine().describe_context(), tag(), m_ifr);
}
}
}
@@ -793,7 +793,7 @@ WRITE8_MEMBER( via6522_device::write )
if (TRACE_VIA)
{
- logerror("%s:6522VIA chip %s: PCR = %02X\n", machine().describe_context(), tag().c_str(), data);
+ logerror("%s:6522VIA chip %s: PCR = %02X\n", machine().describe_context(), tag(), data);
}
if (CA2_FIX_OUTPUT(data) && m_out_ca2 != CA2_OUTPUT_LEVEL(data))
@@ -871,7 +871,7 @@ WRITE_LINE_MEMBER( via6522_device::write_ca1 )
m_in_ca1 = state;
if (TRACE_VIA)
- logerror("%s:6522VIA chip %s: CA1 = %02X\n", machine().describe_context(), tag().c_str(), m_in_ca1);
+ logerror("%s:6522VIA chip %s: CA1 = %02X\n", machine().describe_context(), tag(), m_in_ca1);
if ((m_in_ca1 && CA1_LOW_TO_HIGH(m_pcr)) || (!m_in_ca1 && CA1_HIGH_TO_LOW(m_pcr)))
{
diff --git a/src/devices/machine/6522via.h b/src/devices/machine/6522via.h
index b0f34e14d4a..467ff0885fb 100644
--- a/src/devices/machine/6522via.h
+++ b/src/devices/machine/6522via.h
@@ -64,7 +64,7 @@ class via6522_device : public device_t
{
public:
// construction/destruction
- via6522_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ via6522_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// TODO: REMOVE THESE
template<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 cb5d6b40f08..8d5a43a2b35 100644
--- a/src/devices/machine/6525tpi.cpp
+++ b/src/devices/machine/6525tpi.cpp
@@ -106,7 +106,7 @@
const device_type TPI6525 = &device_creator<tpi6525_device>;
-tpi6525_device::tpi6525_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tpi6525_device::tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TPI6525, "6525 TPI", tag, owner, clock, "tpi6525", __FILE__),
m_out_irq_cb(*this),
m_in_pa_cb(*this),
@@ -196,7 +196,7 @@ void tpi6525_device::set_interrupt()
{
m_interrupt_level = 1;
- DBG_LOG(machine(), 3, "tpi6525", ("%s set interrupt\n", tag().c_str()));
+ DBG_LOG(machine(), 3, "tpi6525", ("%s set interrupt\n", tag()));
m_out_irq_cb(m_interrupt_level);
}
@@ -209,7 +209,7 @@ void tpi6525_device::clear_interrupt()
{
m_interrupt_level = 0;
- DBG_LOG(machine(), 3, "tpi6525", ("%s clear interrupt\n", tag().c_str()));
+ DBG_LOG(machine(), 3, "tpi6525", ("%s clear interrupt\n", tag()));
m_out_irq_cb(m_interrupt_level);
}
@@ -401,7 +401,7 @@ READ8_MEMBER( tpi6525_device::read )
data = (data & ~m_ddr_c) | (m_ddr_c & m_port_c);
}
- DBG_LOG(machine(), 2, "tpi6525", ("%s read %.2x %.2x\n", tag().c_str(), offset, data));
+ DBG_LOG(machine(), 2, "tpi6525", ("%s read %.2x %.2x\n", tag(), offset, data));
break;
case 3:
@@ -460,7 +460,7 @@ READ8_MEMBER( tpi6525_device::read )
}
- DBG_LOG(machine(), 3, "tpi6525", ("%s read %.2x %.2x\n", tag().c_str(), offset, data));
+ DBG_LOG(machine(), 3, "tpi6525", ("%s read %.2x %.2x\n", tag(), offset, data));
return data;
}
@@ -468,7 +468,7 @@ READ8_MEMBER( tpi6525_device::read )
WRITE8_MEMBER( tpi6525_device::write )
{
- DBG_LOG(machine(), 2, "tpi6525", ("%s write %.2x %.2x\n", tag().c_str(), offset, data));
+ DBG_LOG(machine(), 2, "tpi6525", ("%s write %.2x %.2x\n", tag(), offset, data));
switch (offset & 7)
{
diff --git a/src/devices/machine/6525tpi.h b/src/devices/machine/6525tpi.h
index bb84b924d73..a1699ea213b 100644
--- a/src/devices/machine/6525tpi.h
+++ b/src/devices/machine/6525tpi.h
@@ -39,7 +39,7 @@
class tpi6525_device : public device_t
{
public:
- tpi6525_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~tpi6525_device() {}
template<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 40cc3f83d9d..8ef5566fbde 100644
--- a/src/devices/machine/6532riot.cpp
+++ b/src/devices/machine/6532riot.cpp
@@ -386,7 +386,7 @@ UINT8 riot6532_device::portb_out_get()
// riot6532_device - constructor
//-------------------------------------------------
-riot6532_device::riot6532_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+riot6532_device::riot6532_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RIOT6532, "6532 RIOT", tag, owner, clock, "riot6532", __FILE__),
m_in_pa_cb(*this),
m_out_pa_cb(*this),
diff --git a/src/devices/machine/6532riot.h b/src/devices/machine/6532riot.h
index 596dd65eebe..dd1699c6c48 100644
--- a/src/devices/machine/6532riot.h
+++ b/src/devices/machine/6532riot.h
@@ -45,7 +45,7 @@ class riot6532_device : public device_t
{
public:
// construction/destruction
- riot6532_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ riot6532_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 085ec25515f..a2a08180086 100644
--- a/src/devices/machine/6821pia.cpp
+++ b/src/devices/machine/6821pia.cpp
@@ -49,7 +49,7 @@ const device_type PIA6821 = &device_creator<pia6821_device>;
// pia6821_device - constructor
//-------------------------------------------------
-pia6821_device::pia6821_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+pia6821_device::pia6821_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PIA6821, "6821 PIA", tag, owner, clock, "pia6821", __FILE__),
m_in_a_handler(*this),
m_in_b_handler(*this),
@@ -241,7 +241,7 @@ UINT8 pia6821_device::get_in_a_value()
if (!m_logged_port_a_not_connected && (m_ddr_a != 0xff))
{
- logerror("PIA #%s: Warning! No port A read handler. Assuming pins 0x%02X not connected\n", tag().c_str(), m_ddr_a ^ 0xff);
+ logerror("PIA #%s: Warning! No port A read handler. Assuming pins 0x%02X not connected\n", tag(), m_ddr_a ^ 0xff);
m_logged_port_a_not_connected = true;
}
}
@@ -290,7 +290,7 @@ UINT8 pia6821_device::get_in_b_value()
{
if (!m_logged_port_b_not_connected && (m_ddr_b != 0xff))
{
- logerror("PIA #%s: Error! No port B read handler. Three-state pins 0x%02X are undefined\n", tag().c_str(), m_ddr_b ^ 0xff);
+ logerror("PIA #%s: Error! No port B read handler. Three-state pins 0x%02X are undefined\n", tag(), m_ddr_b ^ 0xff);
m_logged_port_b_not_connected = true;
}
@@ -360,7 +360,7 @@ void pia6821_device::set_out_ca2(int data)
{
if (m_out_ca2_needs_pulled)
{
- logerror("PIA #%s: Warning! No port CA2 write handler. Previous value has been lost!\n", tag().c_str());
+ logerror("PIA #%s: Warning! No port CA2 write handler. Previous value has been lost!\n", tag());
}
m_out_ca2_needs_pulled = true;
@@ -391,7 +391,7 @@ void pia6821_device::set_out_cb2(int data)
{
if (m_out_cb2_needs_pulled)
{
- logerror("PIA #%s: Warning! No port CB2 write handler. Previous value has been lost!\n", tag().c_str());
+ logerror("PIA #%s: Warning! No port CB2 write handler. Previous value has been lost!\n", tag());
}
m_out_cb2_needs_pulled = true;
@@ -426,7 +426,7 @@ UINT8 pia6821_device::port_a_r()
}
}
- LOG(("PIA #%s: port A read = %02X\n", tag().c_str(), ret));
+ LOG(("PIA #%s: port A read = %02X\n", tag(), ret));
return ret;
}
@@ -440,7 +440,7 @@ UINT8 pia6821_device::ddr_a_r()
{
UINT8 ret = m_ddr_a;
- LOG(("PIA #%s: DDR A read = %02X\n", tag().c_str(), ret));
+ LOG(("PIA #%s: DDR A read = %02X\n", tag(), ret));
return ret;
}
@@ -468,7 +468,7 @@ UINT8 pia6821_device::port_b_r()
m_irq_b2 = FALSE;
update_interrupts();
- LOG(("PIA #%s: port B read = %02X\n", tag().c_str(), ret));
+ LOG(("PIA #%s: port B read = %02X\n", tag(), ret));
return ret;
}
@@ -482,7 +482,7 @@ UINT8 pia6821_device::ddr_b_r()
{
UINT8 ret = m_ddr_b;
- LOG(("PIA #%s: DDR B read = %02X\n", tag().c_str(), ret));
+ LOG(("PIA #%s: DDR B read = %02X\n", tag(), ret));
return ret;
}
@@ -503,7 +503,7 @@ UINT8 pia6821_device::control_a_r()
}
else if(!m_logged_ca1_not_connected && (!m_in_ca1_pushed))
{
- logerror("PIA #%s: Warning! No CA1 read handler. Assuming pin not connected\n", tag().c_str());
+ logerror("PIA #%s: Warning! No CA1 read handler. Assuming pin not connected\n", tag());
m_logged_ca1_not_connected = true;
}
@@ -513,7 +513,7 @@ UINT8 pia6821_device::control_a_r()
}
else if ( !m_logged_ca2_not_connected && C2_INPUT(m_ctl_a) && !m_in_ca2_pushed)
{
- logerror("PIA #%s: Warning! No CA2 read handler. Assuming pin not connected\n", tag().c_str());
+ logerror("PIA #%s: Warning! No CA2 read handler. Assuming pin not connected\n", tag());
m_logged_ca2_not_connected = true;
}
@@ -531,7 +531,7 @@ UINT8 pia6821_device::control_a_r()
ret |= PIA_IRQ2;
}
- LOG(("PIA #%s: control A read = %02X\n", tag().c_str(), ret));
+ LOG(("PIA #%s: control A read = %02X\n", tag(), ret));
return ret;
}
@@ -552,13 +552,13 @@ UINT8 pia6821_device::control_b_r()
}
else if(!m_logged_cb1_not_connected && !m_in_cb1_pushed)
{
- logerror("PIA #%s: Error! no CB1 read handler. Three-state pin is undefined\n", tag().c_str());
+ logerror("PIA #%s: Error! no CB1 read handler. Three-state pin is undefined\n", tag());
m_logged_cb1_not_connected = true;
}
if(!m_logged_cb2_not_connected && C2_INPUT(m_ctl_b) && !m_in_cb2_pushed)
{
- logerror("PIA #%s: Error! Three-state pin is undefined\n", tag().c_str());
+ logerror("PIA #%s: Error! Three-state pin is undefined\n", tag());
m_logged_cb2_not_connected = true;
}
@@ -576,7 +576,7 @@ UINT8 pia6821_device::control_b_r()
ret |= PIA_IRQ2;
}
- LOG(("PIA #%s: control B read = %02X\n", tag().c_str(), ret));
+ LOG(("PIA #%s: control B read = %02X\n", tag(), ret));
return ret;
}
@@ -638,7 +638,7 @@ void pia6821_device::send_to_out_a_func(const char* message)
// input pins are pulled high
UINT8 data = get_out_a_value();
- LOG(("PIA #%s: %s = %02X\n", tag().c_str(), message, data));
+ LOG(("PIA #%s: %s = %02X\n", tag(), message, data));
if(!m_out_a_handler.isnull())
{
@@ -648,7 +648,7 @@ void pia6821_device::send_to_out_a_func(const char* message)
{
if(m_out_a_needs_pulled)
{
- logerror("PIA #%s: Warning! No port A write handler. Previous value has been lost!\n", tag().c_str());
+ logerror("PIA #%s: Warning! No port A write handler. Previous value has been lost!\n", tag());
}
m_out_a_needs_pulled = true;
@@ -665,7 +665,7 @@ void pia6821_device::send_to_out_b_func(const char* message)
// input pins are high-impedance - we just send them as zeros for backwards compatibility
UINT8 data = get_out_b_value();
- LOG(("PIA #%s: %s = %02X\n", tag().c_str(), message, data));
+ LOG(("PIA #%s: %s = %02X\n", tag(), message, data));
if(!m_out_b_handler.isnull())
{
@@ -675,7 +675,7 @@ void pia6821_device::send_to_out_b_func(const char* message)
{
if(m_out_b_needs_pulled)
{
- logerror("PIA #%s: Warning! No port B write handler. Previous value has been lost!\n", tag().c_str());
+ logerror("PIA #%s: Warning! No port B write handler. Previous value has been lost!\n", tag());
}
m_out_b_needs_pulled = true;
@@ -704,15 +704,15 @@ void pia6821_device::ddr_a_w(UINT8 data)
{
if(data == 0x00)
{
- LOG(("PIA #%s: DDR A write = %02X (input mode)\n", tag().c_str(), data));
+ LOG(("PIA #%s: DDR A write = %02X (input mode)\n", tag(), data));
}
else if(data == 0xff)
{
- LOG(("PIA #%s: DDR A write = %02X (output mode)\n", tag().c_str(), data));
+ LOG(("PIA #%s: DDR A write = %02X (output mode)\n", tag(), data));
}
else
{
- LOG(("PIA #%s: DDR A write = %02X (mixed mode)\n", tag().c_str(), data));
+ LOG(("PIA #%s: DDR A write = %02X (mixed mode)\n", tag(), data));
}
if(m_ddr_a != data)
@@ -759,15 +759,15 @@ void pia6821_device::ddr_b_w(UINT8 data)
{
if (data == 0x00)
{
- LOG(("PIA #%s: DDR B write = %02X (input mode)\n", tag().c_str(), data));
+ LOG(("PIA #%s: DDR B write = %02X (input mode)\n", tag(), data));
}
else if (data == 0xff)
{
- LOG(("PIA #%s: DDR B write = %02X (output mode)\n", tag().c_str(), data));
+ LOG(("PIA #%s: DDR B write = %02X (output mode)\n", tag(), data));
}
else
{
- LOG(("PIA #%s: DDR B write = %02X (mixed mode)\n", tag().c_str(), data));
+ LOG(("PIA #%s: DDR B write = %02X (mixed mode)\n", tag(), data));
}
if(m_ddr_b != data)
@@ -789,7 +789,7 @@ void pia6821_device::control_a_w(UINT8 data)
// bit 7 and 6 are read only
data &= 0x3f;
- LOG(("PIA #%s: control A write = %02X\n", tag().c_str(), data));
+ LOG(("PIA #%s: control A write = %02X\n", tag(), data));
// update the control register
m_ctl_a = data;
@@ -829,7 +829,7 @@ void pia6821_device::control_b_w(UINT8 data)
// bit 7 and 6 are read only
data &= 0x3f;
- LOG(("PIA #%s: control B write = %02X\n", tag().c_str(), data));
+ LOG(("PIA #%s: control B write = %02X\n", tag(), data));
// update the control register
m_ctl_b = data;
@@ -902,7 +902,7 @@ void pia6821_device::set_a_input(UINT8 data, UINT8 z_mask)
{
assert_always(m_in_a_handler.isnull(), "pia6821_porta_w() called when in_a_func implemented");
- LOG(("PIA #%s: set input port A = %02X\n", tag().c_str(), data));
+ LOG(("PIA #%s: set input port A = %02X\n", tag(), data));
m_in_a = data;
m_port_a_z_mask = z_mask;
@@ -938,12 +938,12 @@ UINT8 pia6821_device::a_output()
WRITE_LINE_MEMBER( pia6821_device::ca1_w )
{
- LOG(("PIA #%s: set input CA1 = %d\n", tag().c_str(), state));
+ LOG(("PIA #%s: set input CA1 = %d\n", tag(), state));
// the new state has caused a transition
if((m_in_ca1 != state) && ((state && C1_LOW_TO_HIGH(m_ctl_a)) || (!state && C1_HIGH_TO_LOW(m_ctl_a))))
{
- LOG(("PIA #%s: CA1 triggering\n", tag().c_str()));
+ LOG(("PIA #%s: CA1 triggering\n", tag()));
// mark the IRQ
m_irq_a1 = TRUE;
@@ -970,12 +970,12 @@ WRITE_LINE_MEMBER( pia6821_device::ca1_w )
WRITE_LINE_MEMBER( pia6821_device::ca2_w )
{
- LOG(("PIA #%s: set input CA2 = %d\n", tag().c_str(), state));
+ LOG(("PIA #%s: set input CA2 = %d\n", tag(), state));
// if input mode and the new state has caused a transition
if(C2_INPUT(m_ctl_a) && (m_in_ca2 != state) && ((state && C2_LOW_TO_HIGH(m_ctl_a)) || (!state && C2_HIGH_TO_LOW(m_ctl_a))))
{
- LOG(("PIA #%s: CA2 triggering\n", tag().c_str()));
+ LOG(("PIA #%s: CA2 triggering\n", tag()));
// mark the IRQ
m_irq_a2 = TRUE;
@@ -1025,7 +1025,7 @@ void pia6821_device::portb_w(UINT8 data)
{
assert_always(m_in_b_handler.isnull(), "pia_set_input_b() called when in_b_func implemented");
- LOG(("PIA #%s: set input port B = %02X\n", tag().c_str(), data));
+ LOG(("PIA #%s: set input port B = %02X\n", tag(), data));
m_in_b = data;
m_in_b_pushed = true;
@@ -1050,12 +1050,12 @@ UINT8 pia6821_device::b_output()
WRITE_LINE_MEMBER( pia6821_device::cb1_w )
{
- LOG(("PIA #%s: set input CB1 = %d\n", tag().c_str(), state));
+ LOG(("PIA #%s: set input CB1 = %d\n", tag(), state));
// the new state has caused a transition
if((m_in_cb1 != state) && ((state && C1_LOW_TO_HIGH(m_ctl_b)) || (!state && C1_HIGH_TO_LOW(m_ctl_b))))
{
- LOG(("PIA #%s: CB1 triggering\n", tag().c_str()));
+ LOG(("PIA #%s: CB1 triggering\n", tag()));
// mark the IRQ
m_irq_b1 = 1;
@@ -1081,14 +1081,14 @@ WRITE_LINE_MEMBER( pia6821_device::cb1_w )
WRITE_LINE_MEMBER( pia6821_device::cb2_w )
{
- LOG(("PIA #%s: set input CB2 = %d\n", tag().c_str(), state));
+ LOG(("PIA #%s: set input CB2 = %d\n", tag(), state));
// if input mode and the new state has caused a transition
if (C2_INPUT(m_ctl_b) &&
(m_in_cb2 != state) &&
((state && C2_LOW_TO_HIGH(m_ctl_b)) || (!state && C2_HIGH_TO_LOW(m_ctl_b))))
{
- LOG(("PIA #%s: CB2 triggering\n", tag().c_str()));
+ LOG(("PIA #%s: CB2 triggering\n", tag()));
// mark the IRQ
m_irq_b2 = 1;
diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h
index 946fa4ab514..64631184d29 100644
--- a/src/devices/machine/6821pia.h
+++ b/src/devices/machine/6821pia.h
@@ -78,7 +78,7 @@ class pia6821_device : public device_t
{
public:
// construction/destruction
- pia6821_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pia6821_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
// TODO: REMOVE THESE
diff --git a/src/devices/machine/68230pit.cpp b/src/devices/machine/68230pit.cpp
index c30494f2a1d..927ece2cb75 100644
--- a/src/devices/machine/68230pit.cpp
+++ b/src/devices/machine/68230pit.cpp
@@ -26,7 +26,7 @@ const device_type PIT68230 = &device_creator<pit68230_device>;
//-------------------------------------------------
// pit68230_device - constructors
//-------------------------------------------------
-pit68230_device::pit68230_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+pit68230_device::pit68230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: device_t (mconfig, type, name, tag, owner, clock, shortname, source),
device_execute_interface (mconfig, *this)
, m_icount (0)
@@ -36,7 +36,7 @@ pit68230_device::pit68230_device(const machine_config &mconfig, device_type type
}
-pit68230_device::pit68230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+pit68230_device::pit68230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t (mconfig, PIT68230, "PIT68230", tag, owner, clock, "pit68230", __FILE__),
device_execute_interface (mconfig, *this)
, m_icount (0)
diff --git a/src/devices/machine/68230pit.h b/src/devices/machine/68230pit.h
index 8d4a9ea892f..2a2f2c6824c 100644
--- a/src/devices/machine/68230pit.h
+++ b/src/devices/machine/68230pit.h
@@ -86,8 +86,8 @@ class pit68230_device : public device_t, public device_execute_interface
{
public:
// construction/destruction
-pit68230_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
-pit68230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+pit68230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+pit68230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 29cf2b2eee7..cbdd2c1eed8 100644
--- a/src/devices/machine/68307.cpp
+++ b/src/devices/machine/68307.cpp
@@ -52,7 +52,7 @@ machine_config_constructor m68307cpu_device::device_mconfig_additions() const
}
-m68307cpu_device::m68307cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+m68307cpu_device::m68307cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_device(mconfig, "MC68307", tag, owner, clock, M68307, 16,24, ADDRESS_MAP_NAME(m68307_internal_map), "mc68307", __FILE__),
write_irq(*this),
write_a_tx(*this),
diff --git a/src/devices/machine/68307.h b/src/devices/machine/68307.h
index 29583445d5e..60ae61db49a 100644
--- a/src/devices/machine/68307.h
+++ b/src/devices/machine/68307.h
@@ -39,7 +39,7 @@ typedef device_delegate<void (address_space &space, bool dedicated, UINT16 data,
class m68307cpu_device : public m68000_device {
public:
- m68307cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m68307cpu_device(const machine_config &mconfig, const char *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 67731a5027e..b9ddd9c4b16 100644
--- a/src/devices/machine/68340.cpp
+++ b/src/devices/machine/68340.cpp
@@ -109,7 +109,7 @@ ADDRESS_MAP_END
-m68340cpu_device::m68340cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+m68340cpu_device::m68340cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: fscpu32_device(mconfig, "MC68340", tag, owner, clock, M68340, 32,32, ADDRESS_MAP_NAME(m68340_internal_map), "mc68340", __FILE__)
{
m68340SIM = nullptr;
diff --git a/src/devices/machine/68340.h b/src/devices/machine/68340.h
index 4ffb3b9cc91..4dd93bb6e51 100644
--- a/src/devices/machine/68340.h
+++ b/src/devices/machine/68340.h
@@ -21,7 +21,7 @@
class m68340cpu_device : public fscpu32_device {
public:
- m68340cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m68340cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
int m68340_currentcs;
diff --git a/src/devices/machine/6840ptm.cpp b/src/devices/machine/6840ptm.cpp
index ab664982ac0..bbf9a57ce18 100644
--- a/src/devices/machine/6840ptm.cpp
+++ b/src/devices/machine/6840ptm.cpp
@@ -69,7 +69,7 @@ const device_type PTM6840 = &device_creator<ptm6840_device>;
// ptm6840_device - constructor
//-------------------------------------------------
-ptm6840_device::ptm6840_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ptm6840_device::ptm6840_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PTM6840, "6840 PTM", tag, owner, clock, "ptm6840", __FILE__),
m_internal_clock(0.0),
m_out0_cb(*this),
@@ -313,7 +313,7 @@ UINT16 ptm6840_device::compute_counter( int counter ) const
// If there's no timer, return the count
if (!m_enabled[counter])
{
- PLOG(("MC6840 #%s: read counter(%d): %d\n", tag().c_str(), counter, m_counter[counter]));
+ PLOG(("MC6840 #%s: read counter(%d): %d\n", tag(), counter, m_counter[counter]));
return m_counter[counter];
}
@@ -321,12 +321,12 @@ UINT16 ptm6840_device::compute_counter( int counter ) const
if (m_control_reg[counter] & 0x02)
{
clock = m_internal_clock;
- PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag().c_str(), counter, clock));
+ PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag(), counter, clock));
}
else
{
clock = m_external_clock[counter];
- PLOG(("MC6840 #%s: %d external clock freq %f \n", tag().c_str(), counter, clock));
+ PLOG(("MC6840 #%s: %d external clock freq %f \n", tag(), counter, clock));
}
// See how many are left
int remaining = (m_timer[counter]->remaining() * clock).as_double();
@@ -339,7 +339,7 @@ UINT16 ptm6840_device::compute_counter( int counter ) const
int lsb = remaining % divisor;
remaining = (msb << 8) | lsb;
}
- PLOG(("MC6840 #%s: read counter(%d): %d\n", tag().c_str(), counter, remaining));
+ PLOG(("MC6840 #%s: read counter(%d): %d\n", tag(), counter, remaining));
return remaining;
}
@@ -360,12 +360,12 @@ void ptm6840_device::reload_count(int idx)
if (m_control_reg[idx] & 0x02)
{
clock = m_internal_clock;
- PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag().c_str(), idx, clock));
+ PLOG(("MC6840 #%s: %d internal clock freq %f \n", tag(), idx, clock));
}
else
{
clock = m_external_clock[idx];
- PLOG(("MC6840 #%s: %d external clock freq %f \n", tag().c_str(), idx, clock));
+ PLOG(("MC6840 #%s: %d external clock freq %f \n", tag(), idx, clock));
}
// Determine the number of clock periods before we expire
@@ -399,7 +399,7 @@ void ptm6840_device::reload_count(int idx)
}
// Set the timer
- PLOG(("MC6840 #%s: reload_count(%d): clock = %f count = %d\n", tag().c_str(), idx, clock, count));
+ PLOG(("MC6840 #%s: reload_count(%d): clock = %f count = %d\n", tag(), idx, clock, count));
attotime duration = attotime::from_hz(clock) * count;
if (idx == 2)
@@ -407,7 +407,7 @@ void ptm6840_device::reload_count(int idx)
duration *= m_t3_divisor;
}
- PLOG(("MC6840 #%s: reload_count(%d): output = %f\n", tag().c_str(), idx, duration.as_double()));
+ PLOG(("MC6840 #%s: reload_count(%d): output = %f\n", tag(), idx, duration.as_double()));
#if 0
if (!(m_control_reg[idx] & 0x02))
@@ -447,7 +447,7 @@ READ8_MEMBER( ptm6840_device::read )
case PTM_6840_STATUS:
{
- PLOG(("%s: MC6840 #%s: Status read = %04X\n", machine().describe_context(), tag().c_str(), m_status_reg));
+ PLOG(("%s: MC6840 #%s: Status read = %04X\n", machine().describe_context(), tag(), m_status_reg));
m_status_read_since_int |= m_status_reg & 0x07;
val = m_status_reg;
break;
@@ -469,7 +469,7 @@ READ8_MEMBER( ptm6840_device::read )
m_lsb_buffer = result & 0xff;
- PLOG(("%s: MC6840 #%s: Counter %d read = %04X\n", machine().describe_context(), tag().c_str(), idx, result >> 8));
+ PLOG(("%s: MC6840 #%s: Counter %d read = %04X\n", machine().describe_context(), tag(), idx, result >> 8));
val = result >> 8;
break;
}
@@ -510,7 +510,7 @@ WRITE8_MEMBER( ptm6840_device::write )
m_mode[idx] = (data >> 3) & 0x07;
m_control_reg[idx] = data;
- PLOG(("MC6840 #%s : Control register %d selected\n", tag().c_str(), idx));
+ PLOG(("MC6840 #%s : Control register %d selected\n", tag(), idx));
PLOG(("operation mode = %s\n", opmode[ m_mode[idx] ]));
PLOG(("value = %04X\n", m_control_reg[idx]));
PLOG(("t3divisor = %d\n", m_t3_divisor));
@@ -537,7 +537,7 @@ WRITE8_MEMBER( ptm6840_device::write )
// Holding reset down
if (data & 0x01)
{
- PLOG(("MC6840 #%s : Timer reset\n", tag().c_str()));
+ PLOG(("MC6840 #%s : Timer reset\n", tag()));
for (int i = 0; i < 3; i++)
{
m_timer[i]->enable(false);
@@ -569,7 +569,7 @@ WRITE8_MEMBER( ptm6840_device::write )
case PTM_6840_MSBBUF2:
case PTM_6840_MSBBUF3:
{
- PLOG(("MC6840 #%s msbbuf%d = %02X\n", tag().c_str(), offset / 2, data));
+ PLOG(("MC6840 #%s msbbuf%d = %02X\n", tag(), offset / 2, data));
m_msb_buffer = data;
break;
}
@@ -591,7 +591,7 @@ WRITE8_MEMBER( ptm6840_device::write )
reload_count(idx);
}
- PLOG(("%s:MC6840 #%s: Counter %d latch = %04X\n", machine().describe_context(), tag().c_str(), idx, m_latch[idx]));
+ PLOG(("%s:MC6840 #%s: Counter %d latch = %04X\n", machine().describe_context(), tag(), idx, m_latch[idx]));
break;
}
}
@@ -604,7 +604,7 @@ WRITE8_MEMBER( ptm6840_device::write )
void ptm6840_device::timeout(int idx)
{
- PLOG(("**ptm6840 %s t%d timeout**\n", tag().c_str(), idx));
+ PLOG(("**ptm6840 %s t%d timeout**\n", tag(), idx));
// Set the interrupt flag
m_status_reg |= (1 << idx);
@@ -616,7 +616,7 @@ void ptm6840_device::timeout(int idx)
if ((m_mode[idx] == 0)||(m_mode[idx] == 2))
{
m_output[idx] = m_output[idx] ? 0 : 1;
- PLOG(("**ptm6840 %s t%d output %d **\n", tag().c_str(), idx, m_output[idx]));
+ PLOG(("**ptm6840 %s t%d output %d **\n", tag(), idx, m_output[idx]));
switch (idx)
{
@@ -636,7 +636,7 @@ void ptm6840_device::timeout(int idx)
if (!m_fired[idx])
{
m_output[idx] = 1;
- PLOG(("**ptm6840 %s t%d output %d **\n", tag().c_str(), idx, m_output[idx]));
+ PLOG(("**ptm6840 %s t%d output %d **\n", tag(), idx, m_output[idx]));
switch (idx)
{
diff --git a/src/devices/machine/6840ptm.h b/src/devices/machine/6840ptm.h
index 36ac531cb24..5eb1cdd211c 100644
--- a/src/devices/machine/6840ptm.h
+++ b/src/devices/machine/6840ptm.h
@@ -49,7 +49,7 @@ class ptm6840_device : public device_t
{
public:
// construction/destruction
- ptm6840_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ptm6840_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_internal_clock(device_t &device, double clock) { downcast<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 7a70b05e300..7c1fcc85178 100644
--- a/src/devices/machine/6850acia.cpp
+++ b/src/devices/machine/6850acia.cpp
@@ -64,7 +64,7 @@ const device_type ACIA6850 = &device_creator<acia6850_device>;
// acia6850_device - constructor
//-------------------------------------------------
-acia6850_device::acia6850_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+acia6850_device::acia6850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ACIA6850, "6850 ACIA", tag, owner, clock, "acia6850", __FILE__),
m_txd_handler(*this),
m_rts_handler(*this),
@@ -88,7 +88,7 @@ acia6850_device::acia6850_device(const machine_config &mconfig, std::string tag,
{
}
-acia6850_device::acia6850_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+acia6850_device::acia6850_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_txd_handler(*this),
m_rts_handler(*this),
@@ -183,7 +183,7 @@ READ8_MEMBER( acia6850_device::status_r )
WRITE8_MEMBER( acia6850_device::control_w )
{
- if (LOG) logerror("MC6850 '%s' Control: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("MC6850 '%s' Control: %02x\n", tag(), data);
// CR0 & CR1
int counter_divide_select_bits = (data >> 0) & 3;
@@ -253,7 +253,7 @@ void acia6850_device::update_irq()
WRITE8_MEMBER( acia6850_device::data_w )
{
- if (LOG) logerror("MC6850 '%s' Data: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("MC6850 '%s' Data: %02x\n", tag(), data);
/// TODO: find out if data stored during master reset is sent after divider is set
if (m_divide == 0)
@@ -343,7 +343,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc )
{
if (m_rx_counter == 1)
{
- if (LOG) logerror("MC6850 '%s': RX START BIT\n", tag().c_str());
+ if (LOG) logerror("MC6850 '%s': RX START BIT\n", tag());
}
if (m_rx_counter >= m_divide / 2)
@@ -359,7 +359,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc )
{
if (m_rx_counter != 1)
{
- if (LOG) logerror("MC6850 '%s': RX FALSE START BIT\n", tag().c_str());
+ if (LOG) logerror("MC6850 '%s': RX FALSE START BIT\n", tag());
}
m_rx_counter = 0;
@@ -373,11 +373,11 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc )
if (m_rx_bits < m_bits)
{
- if (LOG) logerror("MC6850 '%s': RX DATA BIT %d %d\n", tag().c_str(), m_rx_bits, m_rxd);
+ if (LOG) logerror("MC6850 '%s': RX DATA BIT %d %d\n", tag(), m_rx_bits, m_rxd);
}
else
{
- if (LOG) logerror("MC6850 '%s': RX PARITY BIT %x\n", tag().c_str(), m_rxd);
+ if (LOG) logerror("MC6850 '%s': RX PARITY BIT %x\n", tag(), m_rxd);
}
if (m_rxd)
@@ -433,7 +433,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc )
{
m_rx_counter = 0;
- if (LOG) logerror("MC6850 '%s': RX STOP BIT\n", tag().c_str());
+ if (LOG) logerror("MC6850 '%s': RX STOP BIT\n", tag());
if (!m_rxd)
{
@@ -479,7 +479,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
if (!(m_status & SR_TDRE) && !(m_status & SR_CTS))
{
- if (LOG) logerror("MC6850 '%s': TX DATA %x\n", tag().c_str(), m_tdr);
+ if (LOG) logerror("MC6850 '%s': TX DATA %x\n", tag(), m_tdr);
m_tx_state = STATE_DATA;
m_tx_shift = m_tdr;
@@ -487,7 +487,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
m_tx_parity = 0;
m_status |= SR_TDRE;
- if (LOG) logerror("MC6850 '%s': TX START BIT\n", tag().c_str());
+ if (LOG) logerror("MC6850 '%s': TX START BIT\n", tag());
output_txd(0);
}
@@ -510,7 +510,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
m_tx_bits++;
m_tx_parity ^= m_txd;
- if (LOG) logerror("MC6850 '%s': TX DATA BIT %d %d\n", tag().c_str(), m_tx_bits, m_txd);
+ if (LOG) logerror("MC6850 '%s': TX DATA BIT %d %d\n", tag(), m_tx_bits, m_txd);
}
else if (m_tx_bits == m_bits && m_parity != PARITY_NONE)
{
@@ -524,7 +524,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
output_txd(m_tx_parity);
- if (LOG) logerror("MC6850 '%s': TX PARITY BIT %d\n", tag().c_str(), m_txd);
+ if (LOG) logerror("MC6850 '%s': TX PARITY BIT %d\n", tag(), m_txd);
}
else
{
@@ -543,7 +543,7 @@ WRITE_LINE_MEMBER( acia6850_device::write_txc )
m_tx_bits++;
- if (LOG) logerror("MC6850 '%s': TX STOP BIT %d\n", tag().c_str(), m_tx_bits);
+ if (LOG) logerror("MC6850 '%s': TX STOP BIT %d\n", tag(), m_tx_bits);
if (m_tx_bits == m_stopbits)
{
diff --git a/src/devices/machine/6850acia.h b/src/devices/machine/6850acia.h
index 6712a07d7a5..efaf153bc0c 100644
--- a/src/devices/machine/6850acia.h
+++ b/src/devices/machine/6850acia.h
@@ -28,7 +28,7 @@ class acia6850_device : public device_t
{
public:
// construction/destruction
- acia6850_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ acia6850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ acia6850_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/machine/68561mpcc.cpp b/src/devices/machine/68561mpcc.cpp
index 3b5c8904a06..29c5673a052 100644
--- a/src/devices/machine/68561mpcc.cpp
+++ b/src/devices/machine/68561mpcc.cpp
@@ -27,7 +27,7 @@ const device_type MPCC68561 = &device_creator<mpcc68561_t>;
IMPLEMENTATION
***************************************************************************/
-mpcc68561_t::mpcc68561_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+mpcc68561_t::mpcc68561_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MPCC68561, "Rockwell 68561 MPCC", tag, owner, clock, "mpcc68561", __FILE__), mode(0), reg(0), status(0), IRQV(0), MasterIRQEnable(0), lastIRQStat(0), IRQType(),
intrq_cb(*this)
{
diff --git a/src/devices/machine/68561mpcc.h b/src/devices/machine/68561mpcc.h
index 683a17bc6ff..bb0bb4c2c6d 100644
--- a/src/devices/machine/68561mpcc.h
+++ b/src/devices/machine/68561mpcc.h
@@ -31,7 +31,7 @@ public:
IRQ_B_EXT
};
- mpcc68561_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mpcc68561_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 1b790ff93d1..59e659ae9b5 100644
--- a/src/devices/machine/7200fifo.cpp
+++ b/src/devices/machine/7200fifo.cpp
@@ -19,7 +19,7 @@ const device_type FIFO7200 = &device_creator<fifo7200_device>;
// fifo7200_device - constructor
//-------------------------------------------------
-fifo7200_device::fifo7200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+fifo7200_device::fifo7200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, FIFO7200, "IDT7200 FIFO", tag, owner, clock, "fifo7200", __FILE__),
m_ram_size(0), m_read_ptr(0), m_write_ptr(0), m_ef(0), m_ff(0), m_hf(0),
m_ef_handler(*this),
@@ -77,7 +77,7 @@ void fifo7200_device::fifo_write(UINT16 data)
{
if (m_ff)
{
- logerror("IDT7200 %s fifo_write overflow!\n", tag().c_str());
+ logerror("IDT7200 %s fifo_write overflow!\n", tag());
return;
}
@@ -108,7 +108,7 @@ UINT16 fifo7200_device::fifo_read()
{
if (m_ef)
{
- logerror("IDT7200 %s fifo_read underflow!\n", tag().c_str());
+ logerror("IDT7200 %s fifo_read underflow!\n", tag());
return 0x1ff;
}
diff --git a/src/devices/machine/7200fifo.h b/src/devices/machine/7200fifo.h
index 4e848231f32..044484de076 100644
--- a/src/devices/machine/7200fifo.h
+++ b/src/devices/machine/7200fifo.h
@@ -81,7 +81,7 @@ The following chips are functionally equivalent and pin-compatible.
class fifo7200_device : public device_t
{
public:
- fifo7200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fifo7200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<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 551bdbe0a68..d5eddbe91a3 100644
--- a/src/devices/machine/74123.cpp
+++ b/src/devices/machine/74123.cpp
@@ -28,7 +28,7 @@ const device_type TTL74123 = &device_creator<ttl74123_device>;
// ttl74123_device - constructor
//-------------------------------------------------
-ttl74123_device::ttl74123_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ttl74123_device::ttl74123_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL74123, "74123 TTL", tag, owner, clock, "ttl74123", __FILE__), m_timer(nullptr),
m_connection_type(TTL74123_NOT_GROUNDED_NO_DIODE),
m_res(1.0),
@@ -135,7 +135,7 @@ void ttl74123_device::set_output()
machine().scheduler().timer_set( attotime::zero, timer_expired_delegate(FUNC(ttl74123_device::output_callback ),this), output);
- if (LOG) logerror("74123 %s: Output: %d\n", tag().c_str(), output);
+ if (LOG) logerror("74123 %s: Output: %d\n", tag(), output);
}
@@ -167,11 +167,11 @@ void ttl74123_device::start_pulse()
{
m_timer->adjust(duration);
- if (LOG) logerror("74123 %s: Retriggering pulse. Duration: %f\n", tag().c_str(), duration.as_double());
+ if (LOG) logerror("74123 %s: Retriggering pulse. Duration: %f\n", tag(), duration.as_double());
}
else
{
- if (LOG) logerror("74123 %s: Retriggering failed.\n", tag().c_str());
+ if (LOG) logerror("74123 %s: Retriggering failed.\n", tag());
}
}
else
@@ -181,7 +181,7 @@ void ttl74123_device::start_pulse()
set_output();
- if (LOG) logerror("74123 %s: Starting pulse. Duration: %f\n", tag().c_str(), duration.as_double());
+ if (LOG) logerror("74123 %s: Starting pulse. Duration: %f\n", tag(), duration.as_double());
}
}
@@ -233,7 +233,7 @@ WRITE8_MEMBER( ttl74123_device::clear_w)
{
m_timer->adjust(attotime::zero);
- if (LOG) logerror("74123 #%s: Cleared\n", tag().c_str() );
+ if (LOG) logerror("74123 #%s: Cleared\n", tag() );
}
m_clear = data;
}
diff --git a/src/devices/machine/74123.h b/src/devices/machine/74123.h
index bebc42580a4..898dd48e6ea 100644
--- a/src/devices/machine/74123.h
+++ b/src/devices/machine/74123.h
@@ -96,7 +96,7 @@ class ttl74123_device : public device_t
{
public:
// construction/destruction
- ttl74123_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ttl74123_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_connection_type(device_t &device, int type) { downcast<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 52f4ac8503d..f85439398de 100644
--- a/src/devices/machine/74145.cpp
+++ b/src/devices/machine/74145.cpp
@@ -59,7 +59,7 @@ const device_type TTL74145 = &device_creator<ttl74145_device>;
// ttl74145_device - constructor
//-------------------------------------------------
-ttl74145_device::ttl74145_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ttl74145_device::ttl74145_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL74145, "TTL74145", tag, owner, clock, "ttl74145", __FILE__)
, m_output_line_0_cb(*this)
, m_output_line_1_cb(*this)
diff --git a/src/devices/machine/74145.h b/src/devices/machine/74145.h
index adbb48a1834..a6472f69291 100644
--- a/src/devices/machine/74145.h
+++ b/src/devices/machine/74145.h
@@ -54,7 +54,7 @@ class ttl74145_device : public device_t
{
public:
// construction/destruction
- ttl74145_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ttl74145_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 d6065ebb4e1..71520535f63 100644
--- a/src/devices/machine/74148.cpp
+++ b/src/devices/machine/74148.cpp
@@ -46,7 +46,7 @@
const device_type TTL74148 = &device_creator<ttl74148_device>;
-ttl74148_device::ttl74148_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ttl74148_device::ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL74148, "74148 TTL", tag, owner, clock, "74148", __FILE__),
m_enable_input(0),
m_output(0),
diff --git a/src/devices/machine/74148.h b/src/devices/machine/74148.h
index 8efedd3ec42..37ca98cf0ec 100644
--- a/src/devices/machine/74148.h
+++ b/src/devices/machine/74148.h
@@ -52,13 +52,10 @@ typedef device_delegate<void (void)> ttl74148_output_delegate;
class ttl74148_device : public device_t
{
public:
- ttl74148_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~ttl74148_device() {}
- static void set_output_callback(device_t &device, ttl74148_output_delegate callback)
- {
- downcast<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 c9f4ff0ab4a..d5b8ad37634 100644
--- a/src/devices/machine/74153.cpp
+++ b/src/devices/machine/74153.cpp
@@ -41,7 +41,7 @@
const device_type TTL74153 = &device_creator<ttl74153_device>;
-ttl74153_device::ttl74153_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ttl74153_device::ttl74153_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL74153, "74153 TTL", tag, owner, clock, "74153", __FILE__),
m_a(0),
m_b(0)
diff --git a/src/devices/machine/74153.h b/src/devices/machine/74153.h
index d285c9bb2b0..491fce01565 100644
--- a/src/devices/machine/74153.h
+++ b/src/devices/machine/74153.h
@@ -47,7 +47,7 @@ typedef device_delegate<void (void)> ttl74153_output_delegate;
class ttl74153_device : public device_t
{
public:
- ttl74153_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ttl74153_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~ttl74153_device() {}
static void set_output_callback(device_t &device, ttl74153_output_delegate callback) { downcast<ttl74153_device &>(device).m_output_cb = callback; }
diff --git a/src/devices/machine/74181.cpp b/src/devices/machine/74181.cpp
index b8eaa70cbdf..a58b2cd190c 100644
--- a/src/devices/machine/74181.cpp
+++ b/src/devices/machine/74181.cpp
@@ -26,7 +26,7 @@ const device_type TTL74181 = &device_creator<ttl74181_device>;
// ttl74181_device - constructor
//-------------------------------------------------
-ttl74181_device::ttl74181_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+ttl74181_device::ttl74181_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, TTL74181, "74181 TTL", tag, owner, clock, "ttl74181", __FILE__),
m_a(0),
m_b(0),
diff --git a/src/devices/machine/74181.h b/src/devices/machine/74181.h
index 0a521db590e..563acb3943e 100644
--- a/src/devices/machine/74181.h
+++ b/src/devices/machine/74181.h
@@ -33,7 +33,7 @@ class ttl74181_device : public device_t
{
public:
// construction/destruction
- ttl74181_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ttl74181_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// inputs
void input_a_w(UINT8 data);
diff --git a/src/devices/machine/7474.cpp b/src/devices/machine/7474.cpp
index dcf3dae2e3d..1b6ce95033d 100644
--- a/src/devices/machine/7474.cpp
+++ b/src/devices/machine/7474.cpp
@@ -55,7 +55,7 @@ const device_type TTL7474 = &device_creator<ttl7474_device>;
// ttl7474_device - constructor
//-------------------------------------------------
-ttl7474_device::ttl7474_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ttl7474_device::ttl7474_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TTL7474, "7474 TTL", tag, owner, clock, "7474", __FILE__),
m_output_func(*this),
m_comp_output_func(*this)
diff --git a/src/devices/machine/7474.h b/src/devices/machine/7474.h
index d029aec0752..15ece073ad1 100644
--- a/src/devices/machine/7474.h
+++ b/src/devices/machine/7474.h
@@ -69,7 +69,7 @@ class ttl7474_device : public device_t
{
public:
// construction/destruction
- ttl7474_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ttl7474_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<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 98901cc280a..a1d36a41b43 100644
--- a/src/devices/machine/8042kbdc.cpp
+++ b/src/devices/machine/8042kbdc.cpp
@@ -196,7 +196,7 @@ const device_type KBDC8042 = &device_creator<kbdc8042_device>;
// kbdc8042_device - constructor
//-------------------------------------------------
-kbdc8042_device::kbdc8042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+kbdc8042_device::kbdc8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KBDC8042, "8042 Keyboard Controller", tag, owner, clock, "kbdc8042", __FILE__)
, m_keyboard_dev(*this, "at_keyboard")
, m_system_reset_cb(*this)
diff --git a/src/devices/machine/8042kbdc.h b/src/devices/machine/8042kbdc.h
index 4f5fe666f03..169c2f9cb12 100644
--- a/src/devices/machine/8042kbdc.h
+++ b/src/devices/machine/8042kbdc.h
@@ -54,7 +54,7 @@ class kbdc8042_device : public device_t
{
public:
// construction/destruction
- kbdc8042_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ kbdc8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/machine/8530scc.cpp b/src/devices/machine/8530scc.cpp
index 7f344047b01..c618fd57004 100644
--- a/src/devices/machine/8530scc.cpp
+++ b/src/devices/machine/8530scc.cpp
@@ -25,7 +25,7 @@ const device_type SCC8530 = &device_creator<scc8530_t>;
IMPLEMENTATION
***************************************************************************/
-scc8530_t::scc8530_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+scc8530_t::scc8530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, SCC8530, "Zilog 8530 SCC (Legacy)", tag, owner, clock, "scc8530l", __FILE__), mode(0), reg(0), status(0), IRQV(0), MasterIRQEnable(0), lastIRQStat(0), IRQType(),
intrq_cb(*this)
{
diff --git a/src/devices/machine/8530scc.h b/src/devices/machine/8530scc.h
index 2032c89ad34..2e6e703ceb8 100644
--- a/src/devices/machine/8530scc.h
+++ b/src/devices/machine/8530scc.h
@@ -29,7 +29,7 @@ public:
IRQ_B_EXT
};
- scc8530_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scc8530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 0701542c640..7931f1c019d 100644
--- a/src/devices/machine/aakart.cpp
+++ b/src/devices/machine/aakart.cpp
@@ -39,7 +39,7 @@ const device_type AAKART = &device_creator<aakart_device>;
// aakart_device - constructor
//-------------------------------------------------
-aakart_device::aakart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+aakart_device::aakart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AAKART, "AAKART", tag, owner, clock, "aakart", __FILE__), m_rxtimer(nullptr), m_txtimer(nullptr), m_mousetimer(nullptr), m_keybtimer(nullptr),
m_out_tx_cb(*this),
m_out_rx_cb(*this), m_tx_latch(0), m_rx(0), m_new_command(0), m_status(0), m_mouse_enable(0), m_keyb_enable(0), m_keyb_row(0), m_keyb_col(0), m_keyb_state(0)
diff --git a/src/devices/machine/aakart.h b/src/devices/machine/aakart.h
index 1e209211676..15eefd6bf92 100644
--- a/src/devices/machine/aakart.h
+++ b/src/devices/machine/aakart.h
@@ -43,7 +43,7 @@ class aakart_device : public device_t
{
public:
// construction/destruction
- aakart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ aakart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 6336fdd6869..da7b21f883e 100644
--- a/src/devices/machine/adc0808.cpp
+++ b/src/devices/machine/adc0808.cpp
@@ -23,7 +23,7 @@ const device_type ADC0808 = &device_creator<adc0808_device>;
// adc0808_device - constructor
//-------------------------------------------------
-adc0808_device::adc0808_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+adc0808_device::adc0808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ADC0808, "ADC0808", tag, owner, clock, "adc0808", __FILE__),
m_out_eoc_cb(*this),
m_address(0),
diff --git a/src/devices/machine/adc0808.h b/src/devices/machine/adc0808.h
index 08596cf1136..9a863e4ef81 100644
--- a/src/devices/machine/adc0808.h
+++ b/src/devices/machine/adc0808.h
@@ -80,7 +80,7 @@ class adc0808_device : public device_t
{
public:
// construction/destruction
- adc0808_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ adc0808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 620bec89f4a..690c2d0e1fd 100644
--- a/src/devices/machine/adc083x.cpp
+++ b/src/devices/machine/adc083x.cpp
@@ -51,7 +51,7 @@ const device_type ADC0832 = &device_creator<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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+adc083x_device::adc083x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_cs(0),
m_clk(0),
@@ -68,25 +68,25 @@ adc083x_device::adc083x_device(const machine_config &mconfig, device_type type,
{
}
-adc0831_device::adc0831_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+adc0831_device::adc0831_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: adc083x_device(mconfig, ADC0831, "ADC0831", tag, owner, clock, "adc0831", __FILE__)
{
m_mux_bits = 0;
}
-adc0832_device::adc0832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+adc0832_device::adc0832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: adc083x_device(mconfig, ADC0832, "ADC0832", tag, owner, clock, "adc0832", __FILE__)
{
m_mux_bits = 2;
}
-adc0834_device::adc0834_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+adc0834_device::adc0834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: adc083x_device(mconfig, ADC0834, "ADC0834", tag, owner, clock, "adc0834", __FILE__)
{
m_mux_bits = 3;
}
-adc0838_device::adc0838_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+adc0838_device::adc0838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: adc083x_device(mconfig, ADC0838, "ADC0838", tag, owner, clock, "adc0838", __FILE__)
{
m_mux_bits = 4;
@@ -144,7 +144,7 @@ WRITE_LINE_MEMBER( adc083x_device::cs_write )
{
if( m_cs != state )
{
- verboselog( 2, *this, "adc083x_cs_write( %s, %d )\n", tag().c_str(), state );
+ verboselog( 2, *this, "adc083x_cs_write( %s, %d )\n", tag(), state );
}
if( m_cs == 0 && state != 0 )
@@ -259,7 +259,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
if( m_clk != state )
{
- verboselog( 2, *this, "adc083x_clk_write( %s, %d )\n", tag().c_str(), state );
+ verboselog( 2, *this, "adc083x_clk_write( %s, %d )\n", tag(), state );
}
if( m_cs == 0 )
@@ -271,7 +271,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
case STATE_WAIT_FOR_START:
if( m_di != 0 )
{
- verboselog( 1, *this, "adc083x %s got start bit\n", tag().c_str() );
+ verboselog( 1, *this, "adc083x %s got start bit\n", tag() );
m_state = STATE_SHIFT_MUX;
m_sars = 0;
m_sgl = 0;
@@ -282,7 +282,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
}
else
{
- verboselog( 1, *this, "adc083x %s not start bit\n", tag().c_str() );
+ verboselog( 1, *this, "adc083x %s not start bit\n", tag() );
}
break;
@@ -294,7 +294,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
m_sgl = 1;
}
- verboselog( 1, *this, "adc083x %s sgl <- %d\n", tag().c_str(), m_sgl );
+ verboselog( 1, *this, "adc083x %s sgl <- %d\n", tag(), m_sgl );
break;
case 1:
@@ -302,7 +302,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
m_odd = 1;
}
- verboselog( 1, *this, "adc083x %s odd <- %d\n", tag().c_str(), m_odd );
+ verboselog( 1, *this, "adc083x %s odd <- %d\n", tag(), m_odd );
break;
case 2:
@@ -310,7 +310,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
m_sel1 = 1;
}
- verboselog( 1, *this, "adc083x %s sel1 <- %d\n", tag().c_str(), m_sel1 );
+ verboselog( 1, *this, "adc083x %s sel1 <- %d\n", tag(), m_sel1 );
break;
case 3:
@@ -318,7 +318,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
{
m_sel0 = 1;
}
- verboselog( 1, *this, "adc083x %s sel0 <- %d\n", tag().c_str(), m_sel0 );
+ verboselog( 1, *this, "adc083x %s sel0 <- %d\n", tag(), m_sel0 );
break;
}
@@ -334,11 +334,11 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
m_sars = 0;
if( type() == ADC0838 && m_se != 0 )
{
- verboselog( 1, *this, "adc083x %s not se\n", tag().c_str() );
+ verboselog( 1, *this, "adc083x %s not se\n", tag() );
}
else
{
- verboselog( 1, *this, "adc083x %s got se\n", tag().c_str() );
+ verboselog( 1, *this, "adc083x %s got se\n", tag() );
m_state = STATE_OUTPUT_LSB_FIRST;
m_bit = 1;
}
@@ -351,7 +351,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
switch( m_state )
{
case STATE_MUX_SETTLE:
- verboselog( 1, *this, "adc083x %s mux settle\n", tag().c_str() );
+ verboselog( 1, *this, "adc083x %s mux settle\n", tag() );
m_output = conversion();
m_state = STATE_OUTPUT_MSB_FIRST;
m_bit = 7;
@@ -361,7 +361,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
case STATE_OUTPUT_MSB_FIRST:
m_do = ( m_output >> m_bit ) & 1;
- verboselog( 1, *this, "adc083x %s msb %d -> %d\n", tag().c_str(), m_bit, m_do );
+ verboselog( 1, *this, "adc083x %s msb %d -> %d\n", tag(), m_bit, m_do );
m_bit--;
if( m_bit < 0 )
@@ -379,7 +379,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write )
case STATE_OUTPUT_LSB_FIRST:
m_do = ( m_output >> m_bit ) & 1;
- verboselog( 1, *this, "adc083x %s lsb %d -> %d\n", tag().c_str(), m_bit, m_do );
+ verboselog( 1, *this, "adc083x %s lsb %d -> %d\n", tag(), m_bit, m_do );
m_bit++;
if( m_bit == 8 )
@@ -407,7 +407,7 @@ WRITE_LINE_MEMBER( adc083x_device::di_write )
{
if( m_di != state )
{
- verboselog( 2, *this, "adc083x_di_write( %s, %d )\n", tag().c_str(), state );
+ verboselog( 2, *this, "adc083x_di_write( %s, %d )\n", tag(), state );
}
m_di = state;
@@ -421,7 +421,7 @@ WRITE_LINE_MEMBER( adc083x_device::se_write )
{
if( m_se != state )
{
- verboselog( 2, *this, "adc083x_se_write( %s, %d )\n", tag().c_str(), state );
+ verboselog( 2, *this, "adc083x_se_write( %s, %d )\n", tag(), state );
}
m_se = state;
@@ -433,7 +433,7 @@ WRITE_LINE_MEMBER( adc083x_device::se_write )
READ_LINE_MEMBER( adc083x_device::sars_read )
{
- verboselog( 1, *this, "adc083x_sars_read( %s ) %d\n", tag().c_str(), m_sars );
+ verboselog( 1, *this, "adc083x_sars_read( %s ) %d\n", tag(), m_sars );
return m_sars;
}
@@ -443,6 +443,6 @@ READ_LINE_MEMBER( adc083x_device::sars_read )
READ_LINE_MEMBER( adc083x_device::do_read )
{
- verboselog( 1, *this, "adc083x_do_read( %s ) %d\n", tag().c_str(), m_do );
+ verboselog( 1, *this, "adc083x_do_read( %s ) %d\n", tag(), m_do );
return m_do;
}
diff --git a/src/devices/machine/adc083x.h b/src/devices/machine/adc083x.h
index 78be305986f..6a97973acca 100644
--- a/src/devices/machine/adc083x.h
+++ b/src/devices/machine/adc083x.h
@@ -46,7 +46,7 @@ typedef device_delegate<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, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ adc083x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
static void set_input_callback(device_t &device, adc083x_input_delegate input_callback) { downcast<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, std::string tag, device_t *owner, UINT32 clock);
+ adc0831_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC0831;
@@ -99,7 +99,7 @@ extern const device_type ADC0831;
class adc0832_device : public adc083x_device
{
public:
- adc0832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ adc0832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC0832;
@@ -108,7 +108,7 @@ extern const device_type ADC0832;
class adc0834_device : public adc083x_device
{
public:
- adc0834_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ adc0834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC0834;
@@ -117,7 +117,7 @@ extern const device_type ADC0834;
class adc0838_device : public adc083x_device
{
public:
- adc0838_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ adc0838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC0838;
diff --git a/src/devices/machine/adc1038.cpp b/src/devices/machine/adc1038.cpp
index 16bd8a72012..1f1e2fb3180 100644
--- a/src/devices/machine/adc1038.cpp
+++ b/src/devices/machine/adc1038.cpp
@@ -15,7 +15,7 @@
const device_type ADC1038 = &device_creator<adc1038_device>;
-adc1038_device::adc1038_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+adc1038_device::adc1038_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ADC1038, "ADC1038", tag, owner, clock, "adc1038", __FILE__), m_cycle(0), m_clk(0), m_adr(0), m_data_in(0), m_data_out(0), m_adc_data(0), m_sars(0),
m_gticlub_hack(0)
{
diff --git a/src/devices/machine/adc1038.h b/src/devices/machine/adc1038.h
index c8642b172ac..84e6ecf2f29 100644
--- a/src/devices/machine/adc1038.h
+++ b/src/devices/machine/adc1038.h
@@ -26,7 +26,7 @@ typedef device_delegate<int (int input)> adc1038_input_delegate;
class adc1038_device : public device_t
{
public:
- adc1038_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ adc1038_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~adc1038_device() {}
static void set_input_callback(device_t &device, adc1038_input_delegate callback) { downcast<adc1038_device &>(device).m_input_cb = callback; }
diff --git a/src/devices/machine/adc1213x.cpp b/src/devices/machine/adc1213x.cpp
index a75aaa3f14c..b3aec60a8e7 100644
--- a/src/devices/machine/adc1213x.cpp
+++ b/src/devices/machine/adc1213x.cpp
@@ -36,7 +36,7 @@
const device_type ADC12130 = &device_creator<adc12130_device>;
-adc12130_device::adc12130_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+adc12130_device::adc12130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: adc12138_device(mconfig, ADC12130, "ADC12130", tag, owner, clock, "adc12130", __FILE__)
{
}
@@ -44,7 +44,7 @@ adc12130_device::adc12130_device(const machine_config &mconfig, std::string tag,
const device_type ADC12132 = &device_creator<adc12132_device>;
-adc12132_device::adc12132_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+adc12132_device::adc12132_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: adc12138_device(mconfig, ADC12132, "ADC12132", tag, owner, clock, "adc12132", __FILE__)
{
}
@@ -52,11 +52,11 @@ adc12132_device::adc12132_device(const machine_config &mconfig, std::string tag,
const device_type ADC12138 = &device_creator<adc12138_device>;
-adc12138_device::adc12138_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+adc12138_device::adc12138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ADC12138, "ADC12138", tag, owner, clock, "adc12138", __FILE__)
{
}
-adc12138_device::adc12138_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+adc12138_device::adc12138_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/devices/machine/adc1213x.h b/src/devices/machine/adc1213x.h
index bca6a5856b3..361cd3dede8 100644
--- a/src/devices/machine/adc1213x.h
+++ b/src/devices/machine/adc1213x.h
@@ -27,8 +27,8 @@ typedef device_delegate<double (UINT8 input)> adc1213x_ipt_convert_delegate;
class adc12138_device : public device_t
{
public:
- adc12138_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- adc12138_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ adc12138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adc12138_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~adc12138_device() {}
static void set_ipt_convert_callback(device_t &device, adc1213x_ipt_convert_delegate callback) { downcast<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, std::string tag, device_t *owner, UINT32 clock);
+ adc12130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC12130;
@@ -77,7 +77,7 @@ extern const device_type ADC12130;
class adc12132_device : public adc12138_device
{
public:
- adc12132_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ adc12132_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type ADC12132;
diff --git a/src/devices/machine/aicartc.cpp b/src/devices/machine/aicartc.cpp
index 3a0ab6ed308..b4ebca893eb 100644
--- a/src/devices/machine/aicartc.cpp
+++ b/src/devices/machine/aicartc.cpp
@@ -30,7 +30,7 @@ const device_type AICARTC = &device_creator<aicartc_device>;
// aicartc_device - constructor
//-------------------------------------------------
-aicartc_device::aicartc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+aicartc_device::aicartc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AICARTC, "AICA RTC", tag, owner, clock, "aicartc", __FILE__),
device_rtc_interface(mconfig, *this), m_rtc_reg_lo(0), m_rtc_reg_hi(0), m_rtc_tick(0), m_we(0), m_clock_timer(nullptr)
{
diff --git a/src/devices/machine/aicartc.h b/src/devices/machine/aicartc.h
index 9bec6405cf6..6e1d9e2183e 100644
--- a/src/devices/machine/aicartc.h
+++ b/src/devices/machine/aicartc.h
@@ -31,7 +31,7 @@ class aicartc_device : public device_t,
{
public:
// construction/destruction
- aicartc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ aicartc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE16_MEMBER( write );
diff --git a/src/devices/machine/akiko.cpp b/src/devices/machine/akiko.cpp
index 9179b166371..6a2772187f8 100644
--- a/src/devices/machine/akiko.cpp
+++ b/src/devices/machine/akiko.cpp
@@ -55,7 +55,7 @@ machine_config_constructor akiko_device::device_mconfig_additions() const
// akiko_device - constructor
//-------------------------------------------------
-akiko_device::akiko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+akiko_device::akiko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AKIKO, "CBM AKIKO", tag, owner, clock, "akiko", __FILE__),
m_c2p_input_index(0),
m_c2p_output_index(0),
@@ -103,7 +103,7 @@ akiko_device::akiko_device(const machine_config &mconfig, std::string tag, devic
// set_cputag - set cpu tag for cpu we working on
//-------------------------------------------------
-void akiko_device::set_cputag(device_t &device, std::string tag)
+void akiko_device::set_cputag(device_t &device, const char *tag)
{
akiko_device &akiko = downcast<akiko_device &>(device);
akiko.m_cputag = tag;
diff --git a/src/devices/machine/akiko.h b/src/devices/machine/akiko.h
index 81b69d7aa1c..3fd1b586fb6 100644
--- a/src/devices/machine/akiko.h
+++ b/src/devices/machine/akiko.h
@@ -49,7 +49,7 @@
class akiko_device : public device_t
{
public:
- akiko_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ akiko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~akiko_device() {}
// callbacks
@@ -66,7 +66,7 @@ public:
DECLARE_WRITE32_MEMBER( write );
// inline configuration
- static void set_cputag(device_t &device, std::string tag);
+ static void set_cputag(device_t &device, const char *tag);
protected:
// device-level overrides
@@ -146,7 +146,7 @@ private:
devcb_read_line m_sda_r;
devcb_write_line m_sda_w;
- std::string m_cputag;
+ const char *m_cputag;
};
// device type definition
diff --git a/src/devices/machine/am53cf96.cpp b/src/devices/machine/am53cf96.cpp
index 794cf3f5c34..595a38f985b 100644
--- a/src/devices/machine/am53cf96.cpp
+++ b/src/devices/machine/am53cf96.cpp
@@ -146,7 +146,7 @@ WRITE8_MEMBER( am53cf96_device::write )
}
}
-am53cf96_device::am53cf96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+am53cf96_device::am53cf96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
legacy_scsi_host_adapter(mconfig, AM53CF96, "53CF96 SCSI", tag, owner, clock, "am53cf96", __FILE__),
m_irq_handler(*this)
{
diff --git a/src/devices/machine/am53cf96.h b/src/devices/machine/am53cf96.h
index f00c8d6b030..1c078d6e3f6 100644
--- a/src/devices/machine/am53cf96.h
+++ b/src/devices/machine/am53cf96.h
@@ -41,7 +41,7 @@ class am53cf96_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- am53cf96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ am53cf96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<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 3879d8906f9..7f2ecb7e37f 100644
--- a/src/devices/machine/am9517a.cpp
+++ b/src/devices/machine/am9517a.cpp
@@ -131,7 +131,7 @@ enum
inline void am9517a_device::dma_request(int channel, int state)
{
- if (LOG) logerror("AM9517A '%s' Channel %u DMA Request: %u\n", tag().c_str(), channel, state);
+ if (LOG) logerror("AM9517A '%s' Channel %u DMA Request: %u\n", tag(), channel, state);
if (state ^ COMMAND_DREQ_ACTIVE_LOW)
{
@@ -317,7 +317,7 @@ inline void am9517a_device::dma_write()
case MODE_TRANSFER_VERIFY: {
UINT8 v1 = m_in_memr_cb(offset);
if(0 && m_temp != v1)
- logerror("%s: verify error %02x vs. %02x\n", tag().c_str(), m_temp, v1);
+ logerror("%s: verify error %02x vs. %02x\n", tag(), m_temp, v1);
break;
}
@@ -471,7 +471,7 @@ inline void am9517a_device::end_of_process()
//-------------------------------------------------
-am9517a_device::am9517a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
+am9517a_device::am9517a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
@@ -498,7 +498,7 @@ am9517a_device::am9517a_device(const machine_config &mconfig, device_type type,
}
-am9517a_device::am9517a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+am9517a_device::am9517a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AM9517A, "AM9517A", tag, owner, clock, "am9517a", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
@@ -525,7 +525,7 @@ am9517a_device::am9517a_device(const machine_config &mconfig, std::string tag, d
{
}
-upd71071_v53_device::upd71071_v53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd71071_v53_device::upd71071_v53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: am9517a_device(mconfig, V53_DMAU, "V53 DMAU", tag, owner, clock, "v53_dmau")
{
}
@@ -887,7 +887,7 @@ WRITE8_MEMBER( am9517a_device::write )
m_channel[channel].m_address = (m_channel[channel].m_address & 0xff00) | data;
}
- if (LOG) logerror("AM9517A '%s' Channel %u Base Address: %04x\n", tag().c_str(), channel, m_channel[channel].m_base_address);
+ if (LOG) logerror("AM9517A '%s' Channel %u Base Address: %04x\n", tag(), channel, m_channel[channel].m_base_address);
break;
case REGISTER_WORD_COUNT:
@@ -902,7 +902,7 @@ WRITE8_MEMBER( am9517a_device::write )
m_channel[channel].m_count = (m_channel[channel].m_count & 0xff00) | data;
}
- if (LOG) logerror("AM9517A '%s' Channel %u Base Word Count: %04x\n", tag().c_str(), channel, m_channel[channel].m_base_count);
+ if (LOG) logerror("AM9517A '%s' Channel %u Base Word Count: %04x\n", tag(), channel, m_channel[channel].m_base_count);
break;
}
@@ -915,7 +915,7 @@ WRITE8_MEMBER( am9517a_device::write )
case REGISTER_COMMAND:
m_command = data;
- if (LOG) logerror("AM9517A '%s' Command Register: %02x\n", tag().c_str(), m_command);
+ if (LOG) logerror("AM9517A '%s' Command Register: %02x\n", tag(), m_command);
break;
case REGISTER_REQUEST:
@@ -935,7 +935,7 @@ WRITE8_MEMBER( am9517a_device::write )
m_request &= ~(1 << (channel + 4));
}
- if (LOG) logerror("AM9517A '%s' Request Register: %01x\n", tag().c_str(), m_request);
+ if (LOG) logerror("AM9517A '%s' Request Register: %01x\n", tag(), m_request);
}
break;
@@ -952,7 +952,7 @@ WRITE8_MEMBER( am9517a_device::write )
m_mask &= ~(1 << channel);
}
- if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag().c_str(), m_mask);
+ if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag(), m_mask);
}
break;
@@ -965,24 +965,24 @@ WRITE8_MEMBER( am9517a_device::write )
// clear terminal count
m_status &= ~(1 << channel);
- if (LOG) logerror("AM9517A '%s' Channel %u Mode: %02x\n", tag().c_str(), channel, data & 0xfc);
+ if (LOG) logerror("AM9517A '%s' Channel %u Mode: %02x\n", tag(), channel, data & 0xfc);
}
break;
case REGISTER_BYTE_POINTER:
- if (LOG) logerror("AM9517A '%s' Clear Byte Pointer Flip-Flop\n", tag().c_str());
+ if (LOG) logerror("AM9517A '%s' Clear Byte Pointer Flip-Flop\n", tag());
m_msb = 0;
break;
case REGISTER_MASTER_CLEAR:
- if (LOG) logerror("AM9517A '%s' Master Clear\n", tag().c_str());
+ if (LOG) logerror("AM9517A '%s' Master Clear\n", tag());
device_reset();
break;
case REGISTER_CLEAR_MASK:
- if (LOG) logerror("AM9517A '%s' Clear Mask Register\n", tag().c_str());
+ if (LOG) logerror("AM9517A '%s' Clear Mask Register\n", tag());
m_mask = 0;
break;
@@ -990,7 +990,7 @@ WRITE8_MEMBER( am9517a_device::write )
case REGISTER_MASK:
m_mask = data & 0x0f;
- if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag().c_str(), m_mask);
+ if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag(), m_mask);
break;
}
}
@@ -1004,7 +1004,7 @@ WRITE8_MEMBER( am9517a_device::write )
WRITE_LINE_MEMBER( am9517a_device::hack_w )
{
- if (LOG) logerror("AM9517A '%s' Hold Acknowledge: %u\n", tag().c_str(), state);
+ if (LOG) logerror("AM9517A '%s' Hold Acknowledge: %u\n", tag(), state);
m_hack = state;
trigger(1);
@@ -1017,7 +1017,7 @@ WRITE_LINE_MEMBER( am9517a_device::hack_w )
WRITE_LINE_MEMBER( am9517a_device::ready_w )
{
- if (LOG) logerror("AM9517A '%s' Ready: %u\n", tag().c_str(), state);
+ if (LOG) logerror("AM9517A '%s' Ready: %u\n", tag(), state);
m_ready = state;
}
@@ -1029,7 +1029,7 @@ WRITE_LINE_MEMBER( am9517a_device::ready_w )
WRITE_LINE_MEMBER( am9517a_device::eop_w )
{
- if (LOG) logerror("AM9517A '%s' End of Process: %u\n", tag().c_str(), state);
+ if (LOG) logerror("AM9517A '%s' End of Process: %u\n", tag(), state);
}
diff --git a/src/devices/machine/am9517a.h b/src/devices/machine/am9517a.h
index dc48331e970..7d5bd2601f4 100644
--- a/src/devices/machine/am9517a.h
+++ b/src/devices/machine/am9517a.h
@@ -48,8 +48,8 @@ class am9517a_device : public device_t,
{
public:
// construction/destruction
- am9517a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
- am9517a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ am9517a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ am9517a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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, std::string tag, device_t *owner, UINT32 clock);
+ upd71071_v53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ8_MEMBER( read ) override;
virtual DECLARE_WRITE8_MEMBER( write ) override;
diff --git a/src/devices/machine/amigafdc.cpp b/src/devices/machine/amigafdc.cpp
index 050e9315c9e..d71b4f458dc 100644
--- a/src/devices/machine/amigafdc.cpp
+++ b/src/devices/machine/amigafdc.cpp
@@ -18,7 +18,7 @@ FLOPPY_FORMATS_MEMBER( amiga_fdc::floppy_formats )
FLOPPY_ADF_FORMAT
FLOPPY_FORMATS_END
-amiga_fdc::amiga_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+amiga_fdc::amiga_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, AMIGA_FDC, "Amiga FDC", tag, owner, clock, "amiga_fdc", __FILE__),
m_write_index(*this), floppy(nullptr), t_gen(nullptr), dsklen(0), pre_dsklen(0), dsksync(0), dskbyt(0), adkcon(0), dmacon(0), dskpt(0), dma_value(0), dma_state(0)
{
diff --git a/src/devices/machine/amigafdc.h b/src/devices/machine/amigafdc.h
index 1376db45d04..2cef736e6cf 100644
--- a/src/devices/machine/amigafdc.h
+++ b/src/devices/machine/amigafdc.h
@@ -11,7 +11,7 @@
class amiga_fdc : public device_t {
public:
- amiga_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ amiga_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 9beb82cbcc1..9461850043d 100644
--- a/src/devices/machine/at28c16.cpp
+++ b/src/devices/machine/at28c16.cpp
@@ -39,7 +39,7 @@ const device_type AT28C16 = &device_creator<at28c16_device>;
// at28c16_device - constructor
//-------------------------------------------------
-at28c16_device::at28c16_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+at28c16_device::at28c16_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: device_t(mconfig, AT28C16, "AT28C16", tag, owner, clock, "at28c16", __FILE__),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -124,12 +124,12 @@ void at28c16_device::nvram_default()
{
if( m_region->bytes() != AT28C16_DATA_BYTES )
{
- fatalerror( "at28c16 region '%s' wrong size (expected size = 0x%X)\n", tag().c_str(), AT28C16_DATA_BYTES );
+ fatalerror( "at28c16 region '%s' wrong size (expected size = 0x%X)\n", tag(), AT28C16_DATA_BYTES );
}
if( m_region->bytewidth() != 1 )
{
- fatalerror( "at28c16 region '%s' needs to be an 8-bit region\n", tag().c_str() );
+ fatalerror( "at28c16 region '%s' needs to be an 8-bit region\n", tag() );
}
UINT8 *default_data = m_region->base();
diff --git a/src/devices/machine/at28c16.h b/src/devices/machine/at28c16.h
index 162f552dd62..5cc51cf9078 100644
--- a/src/devices/machine/at28c16.h
+++ b/src/devices/machine/at28c16.h
@@ -35,7 +35,7 @@ class at28c16_device :
{
public:
// construction/destruction
- at28c16_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
+ at28c16_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
// I/O operations
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/at29x.cpp b/src/devices/machine/at29x.cpp
index 097ab676fc7..bb2bdd8b8b9 100644
--- a/src/devices/machine/at29x.cpp
+++ b/src/devices/machine/at29x.cpp
@@ -54,7 +54,7 @@ enum
Constructor for all variants
*/
-at29x_device::at29x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+at29x_device::at29x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nvram_interface(mconfig, *this),
m_memory_size(0), // bytes
@@ -70,7 +70,7 @@ at29x_device::at29x_device(const machine_config &mconfig, device_type type, cons
/*
Constructor for AT29C020
*/
-at29c020_device::at29c020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+at29c020_device::at29c020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: at29x_device(mconfig, AT29C020, "ATMEL 29C020 256K x 8 FEEPROM", tag, owner, clock, "at29c020", __FILE__)
{
m_memory_size = 256*1024;
@@ -81,7 +81,7 @@ at29c020_device::at29c020_device(const machine_config &mconfig, std::string tag,
/*
Constructor for AT29C040
*/
-at29c040_device::at29c040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+at29c040_device::at29c040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: at29x_device(mconfig, AT29C040, "ATMEL 29C040 512K x 8 FEEPROM", tag, owner, clock, "at29c040", __FILE__)
{
m_memory_size = 512*1024;
@@ -92,7 +92,7 @@ at29c040_device::at29c040_device(const machine_config &mconfig, std::string tag,
/*
Constructor for AT29C040A
*/
-at29c040a_device::at29c040a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+at29c040a_device::at29c040a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: at29x_device(mconfig, AT29C040A, "ATMEL 29C040A 512K x 8 FEEPROM", tag, owner, clock, "at29c040a", __FILE__)
{
m_memory_size = 512*1024;
@@ -129,7 +129,7 @@ void at29x_device::nvram_read(emu_file &file)
void at29x_device::nvram_write(emu_file &file)
{
// If we don't write (because there were no changes), the file will be wiped
- if (TRACE_PRG) logerror("%s: Write to NVRAM file\n", tag().c_str());
+ if (TRACE_PRG) logerror("%s: Write to NVRAM file\n", tag());
m_eememory[0] = m_version;
file.write(m_eememory.get(), m_memory_size+2);
}
@@ -143,13 +143,13 @@ void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param,
{
case PGM_1:
// Programming cycle timeout
- logerror("%s: Programming cycle timeout\n", tag().c_str());
+ logerror("%s: Programming cycle timeout\n", tag());
m_pgm = PGM_0;
break;
case PGM_2:
// Programming cycle start
- if (TRACE_PRG) logerror("%s: Sector write start\n", tag().c_str());
+ if (TRACE_PRG) logerror("%s: Sector write start\n", tag());
m_pgm = PGM_3;
// We assume a typical delay of 70% of the max value
m_programming_timer->adjust(attotime::from_msec(m_cycle_time*7/10));
@@ -159,7 +159,7 @@ void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// Programming cycle end; now burn the buffer into the flash EEPROM
memcpy(m_eememory.get() + 2 + get_sector_number(m_programming_last_offset) * m_sector_size, m_programming_buffer.get(), m_sector_size);
- if (TRACE_PRG) logerror("%s: Sector write completed at location %04x\n", tag().c_str(), m_programming_last_offset);
+ if (TRACE_PRG) logerror("%s: Sector write completed at location %04x\n", tag(), m_programming_last_offset);
// Data protect state will be activated at the end of the program cycle [1]
if (m_enabling_sdb) m_sdp = true;
@@ -167,7 +167,7 @@ void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// Data protect state will be deactivated at the end of the program period [1]
if (m_disabling_sdb) m_sdp = false;
- if (TRACE_PRG) logerror("%s: Software data protection = %d\n", tag().c_str(), m_sdp);
+ if (TRACE_PRG) logerror("%s: Software data protection = %d\n", tag(), m_sdp);
m_pgm = PGM_0;
m_enabling_sdb = false;
@@ -176,7 +176,7 @@ void at29x_device::device_timer(emu_timer &timer, device_timer_id id, int param,
break;
default:
- logerror("%s: Invalid state %d during programming\n", tag().c_str(), m_pgm);
+ logerror("%s: Invalid state %d during programming\n", tag(), m_pgm);
m_pgm = PGM_0;
break;
}
@@ -251,7 +251,7 @@ READ8_MEMBER( at29x_device::read )
m_programming_timer->adjust(attotime::from_msec(m_cycle_time*7/10));
}
- if (TRACE_READ) logerror("%s: DATA poll; toggle bit 1\n", tag().c_str());
+ if (TRACE_READ) logerror("%s: DATA poll; toggle bit 1\n", tag());
reply = m_toggle_bit? 0x02 : 0x00;
m_toggle_bit = !m_toggle_bit;
@@ -265,7 +265,7 @@ READ8_MEMBER( at29x_device::read )
// Simple case: just read the memory contents
reply = m_eememory[offset+2];
- if (TRACE_READ) logerror("%s: %05x -> %02x (PGM=%d)\n", tag().c_str(), offset, reply, m_pgm);
+ if (TRACE_READ) logerror("%s: %05x -> %02x (PGM=%d)\n", tag(), offset, reply, m_pgm);
return reply;
}
@@ -276,7 +276,7 @@ READ8_MEMBER( at29x_device::read )
WRITE8_MEMBER( at29x_device::write )
{
offset &= m_address_mask;
- if (TRACE_WRITE) logerror("%s: %05x <- %02x\n", tag().c_str(), offset, data);
+ if (TRACE_WRITE) logerror("%s: %05x <- %02x\n", tag(), offset, data);
// The special CFI commands assume a smaller address space according
// to the specification ("address format A14-A0")
@@ -285,12 +285,12 @@ WRITE8_MEMBER( at29x_device::write )
if (m_enabling_bbl)
{
// Determine whether we lock the upper or lower boot block
- if (TRACE_STATE) logerror("%s: Enabling boot block lockout\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: Enabling boot block lockout\n", tag());
m_enabling_bbl = false;
if ((offset == 0x00000) && (data == 0x00))
{
- if (TRACE_STATE) logerror("%s: Enabling lower boot block lockout\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: Enabling lower boot block lockout\n", tag());
m_lower_bbl = true;
sync_flags();
return;
@@ -299,14 +299,14 @@ WRITE8_MEMBER( at29x_device::write )
{
if ((offset == 0x7ffff) && (data == 0xff))
{
- if (TRACE_STATE) logerror("%s: Enabling higher boot block lockout\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: Enabling higher boot block lockout\n", tag());
m_higher_bbl = true;
sync_flags();
return;
}
else
{
- logerror("%s: Invalid boot block specification: %05x/%02x\n", tag().c_str(), offset, data);
+ logerror("%s: Invalid boot block specification: %05x/%02x\n", tag(), offset, data);
}
}
}
@@ -317,7 +317,7 @@ WRITE8_MEMBER( at29x_device::write )
// CMD_0: start state
if ((cfi_offset == 0x5555) && (data == 0xaa))
{
- if (TRACE_STATE) logerror("%s: Command sequence started (aa)\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: Command sequence started (aa)\n", tag());
m_cmd = CMD_1;
return;
}
@@ -332,7 +332,7 @@ WRITE8_MEMBER( at29x_device::write )
// CMD_1: state after writing aa to 5555
if ((cfi_offset == 0x2aaa) && (data == 0x55))
{
- if (TRACE_STATE) logerror("%s: Command sequence continued (55)\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: Command sequence continued (55)\n", tag());
m_cmd = CMD_2;
return;
}
@@ -340,7 +340,7 @@ WRITE8_MEMBER( at29x_device::write )
{
m_cmd = CMD_0;
m_long_sequence = false;
- if (TRACE_STATE) logerror("%s: Command sequence aborted\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: Command sequence aborted\n", tag());
}
break;
@@ -354,7 +354,7 @@ WRITE8_MEMBER( at29x_device::write )
m_programming_timer->adjust(attotime::never);
// Process command
- if (TRACE_STATE) logerror("%s: Command sequence continued (%2x)\n", tag().c_str(), data);
+ if (TRACE_STATE) logerror("%s: Command sequence continued (%2x)\n", tag(), data);
switch (data)
{
case 0x10:
@@ -362,10 +362,10 @@ WRITE8_MEMBER( at29x_device::write )
if (m_long_sequence)
{
if (m_lower_bbl || m_higher_bbl)
- logerror("%s: Boot block lockout active; chip cannot be erased.\n", tag().c_str());
+ logerror("%s: Boot block lockout active; chip cannot be erased.\n", tag());
else
{
- if (TRACE_STATE) logerror("%s: Erase chip\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: Erase chip\n", tag());
memset(m_eememory.get()+2, 0xff, m_memory_size);
}
}
@@ -377,7 +377,7 @@ WRITE8_MEMBER( at29x_device::write )
// so we need a 80 before, else the sequence is invalid
if (m_long_sequence)
{
- if (TRACE_STATE) logerror("%s: Software data protection disable\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: Software data protection disable\n", tag());
m_pgm = PGM_1;
m_disabling_sdb = true;
// It is not clear from the specification whether the byte cycle timer
@@ -388,7 +388,7 @@ WRITE8_MEMBER( at29x_device::write )
case 0x40:
// Boot block lockout enable
// Complete sequence is aa-55-80-aa-55-40
- if (TRACE_STATE) logerror("%s: Boot block lockout enable\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: Boot block lockout enable\n", tag());
if (m_long_sequence) m_enabling_bbl = true;
// We'll know which boot block is affected on the next write
break;
@@ -400,13 +400,13 @@ WRITE8_MEMBER( at29x_device::write )
case 0x90:
// Software product identification entry
- if (TRACE_STATE) logerror("%s: Entering Identification mode\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: Entering Identification mode\n", tag());
m_id_mode = true;
break;
case 0xa0:
// Software data protection enable
- if (TRACE_STATE) logerror("%s: Software data protection enable\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: Software data protection enable\n", tag());
m_pgm = PGM_1;
m_enabling_sdb = true;
// It is not clear from the specification whether the byte cycle timer
@@ -415,7 +415,7 @@ WRITE8_MEMBER( at29x_device::write )
case 0xf0:
// Software product identification exit
- if (TRACE_STATE) logerror("%s: Exiting Identification mode\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: Exiting Identification mode\n", tag());
m_id_mode = false;
break;
}
@@ -435,7 +435,7 @@ WRITE8_MEMBER( at29x_device::write )
if ((m_pgm == PGM_2) && (get_sector_number(offset) != get_sector_number(m_programming_last_offset)))
{
// cancel current programming cycle
- if (TRACE_WRITE) logerror("%s: Invalid sector change (from sector 0x%04x to 0x%04x); cancel programming cycle\n", tag().c_str(), get_sector_number(m_programming_last_offset), get_sector_number(offset));
+ if (TRACE_WRITE) logerror("%s: Invalid sector change (from sector 0x%04x to 0x%04x); cancel programming cycle\n", tag(), get_sector_number(m_programming_last_offset), get_sector_number(offset));
m_pgm = PGM_0;
m_enabling_sdb = false;
m_disabling_sdb = false;
@@ -450,7 +450,7 @@ WRITE8_MEMBER( at29x_device::write )
{
// attempt to access a locked out boot block: cancel programming
// command if necessary
- if (TRACE_WRITE) logerror("%s: Attempt to access a locked out boot block: offset = %05x, lowblock=%d, highblock=%d\n", tag().c_str(), offset, m_lower_bbl, m_higher_bbl);
+ if (TRACE_WRITE) logerror("%s: Attempt to access a locked out boot block: offset = %05x, lowblock=%d, highblock=%d\n", tag(), offset, m_lower_bbl, m_higher_bbl);
m_pgm = PGM_0;
m_enabling_sdb = false;
@@ -458,7 +458,7 @@ WRITE8_MEMBER( at29x_device::write )
}
else
{ // enter programming mode
- if (TRACE_STATE) logerror("%s: Enter programming mode (m_pgm=%d, m_sdp=%d)\n", tag().c_str(), m_pgm, m_sdp);
+ if (TRACE_STATE) logerror("%s: Enter programming mode (m_pgm=%d, m_sdp=%d)\n", tag(), m_pgm, m_sdp);
// Clear the programming buffer
memset(m_programming_buffer.get(), 0xff, m_sector_size);
m_pgm = PGM_2;
@@ -470,7 +470,7 @@ WRITE8_MEMBER( at29x_device::write )
if (m_pgm == PGM_2)
{
// write data to programming buffer
- if (TRACE_PRG) logerror("%s: Write data to programming buffer: buf[%x] = %02x\n", tag().c_str(), offset & m_sector_mask, data);
+ if (TRACE_PRG) logerror("%s: Write data to programming buffer: buf[%x] = %02x\n", tag(), offset & m_sector_mask, data);
m_programming_buffer[offset & m_sector_mask] = data;
m_programming_last_offset = offset;
m_programming_timer->adjust(attotime::from_usec(150)); // next byte must be written before the timer expires
@@ -498,7 +498,7 @@ void at29x_device::device_reset(void)
{
if (m_eememory[0] != m_version)
{
- logerror("%s: Warning: Version mismatch; expected %d but found %d in file. Resetting.\n", tag().c_str(), m_version, m_eememory[0]);
+ logerror("%s: Warning: Version mismatch; expected %d but found %d in file. Resetting.\n", tag(), m_version, m_eememory[0]);
m_eememory[0] = 0;
m_eememory[1] = 0;
}
@@ -507,7 +507,7 @@ void at29x_device::device_reset(void)
m_higher_bbl = ((m_eememory[1] & 0x02)!=0);
m_sdp = ((m_eememory[1] & 0x01)!=0);
- if (TRACE_CONFIG) logerror("%s: LowerBBL = %d, HigherBBL = %d, SoftDataProt = %d\n", tag().c_str(), m_lower_bbl, m_higher_bbl, m_sdp);
+ if (TRACE_CONFIG) logerror("%s: LowerBBL = %d, HigherBBL = %d, SoftDataProt = %d\n", tag(), m_lower_bbl, m_higher_bbl, m_sdp);
m_id_mode = false;
m_cmd = CMD_0;
diff --git a/src/devices/machine/at29x.h b/src/devices/machine/at29x.h
index 02f68d5b0c7..924a17e0f70 100644
--- a/src/devices/machine/at29x.h
+++ b/src/devices/machine/at29x.h
@@ -34,7 +34,7 @@ enum s_pgm_t
class at29x_device : public device_t, public device_nvram_interface
{
public:
- at29x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ at29x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -89,19 +89,19 @@ private:
class at29c020_device : public at29x_device
{
public:
- at29c020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ at29c020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class at29c040_device : public at29x_device
{
public:
- at29c040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ at29c040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class at29c040a_device : public at29x_device
{
public:
- at29c040a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ at29c040a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
#define MCFG_AT29C020_ADD(_tag ) \
diff --git a/src/devices/machine/at45dbxx.cpp b/src/devices/machine/at45dbxx.cpp
index 3a7a6efb105..e61fcca498a 100644
--- a/src/devices/machine/at45dbxx.cpp
+++ b/src/devices/machine/at45dbxx.cpp
@@ -45,7 +45,7 @@ const device_type AT45DB161 = &device_creator<at45db161_device>;
// at45db041_device - constructor
//-------------------------------------------------
-at45db041_device::at45db041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+at45db041_device::at45db041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AT45DB041, "AT45DB041", tag, owner, clock, "at45db041", __FILE__),
device_nvram_interface(mconfig, *this),
write_so(*this)
@@ -53,7 +53,7 @@ at45db041_device::at45db041_device(const machine_config &mconfig, std::string ta
}
-at45db041_device::at45db041_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+at45db041_device::at45db041_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nvram_interface(mconfig, *this),
write_so(*this)
@@ -61,13 +61,13 @@ at45db041_device::at45db041_device(const machine_config &mconfig, device_type ty
}
-at45db081_device::at45db081_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+at45db081_device::at45db081_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: at45db041_device(mconfig, AT45DB081, "AT45DB081", tag, owner, clock, "at45db081", __FILE__)
{
}
-at45db161_device::at45db161_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+at45db161_device::at45db161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: at45db041_device(mconfig, AT45DB161, "AT45DB161", tag, owner, clock, "at45db161", __FILE__)
{
}
diff --git a/src/devices/machine/at45dbxx.h b/src/devices/machine/at45dbxx.h
index a7defed9e1f..40688fd786e 100644
--- a/src/devices/machine/at45dbxx.h
+++ b/src/devices/machine/at45dbxx.h
@@ -41,8 +41,8 @@ class at45db041_device : public device_t,
public device_nvram_interface
{
public:
- at45db041_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- at45db041_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ at45db041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ at45db041_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_WRITE_LINE_MEMBER(cs_w);
DECLARE_WRITE_LINE_MEMBER(sck_w);
@@ -117,7 +117,7 @@ protected:
class at45db081_device : public at45db041_device
{
public:
- at45db081_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ at45db081_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual int num_pages() const override { return 4096; }
@@ -132,7 +132,7 @@ protected:
class at45db161_device : public at45db041_device
{
public:
- at45db161_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ at45db161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual int num_pages() const override { return 4096; }
diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp
index 5756ed8f9e2..c77e6c8eed2 100644
--- a/src/devices/machine/at_keybc.cpp
+++ b/src/devices/machine/at_keybc.cpp
@@ -58,7 +58,7 @@ ROM_END
// at_keyboard_controller_device - constructor
//-------------------------------------------------
-at_keyboard_controller_device::at_keyboard_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+at_keyboard_controller_device::at_keyboard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AT_KEYBOARD_CONTROLLER, "AT Keyboard Controller", tag, owner, clock, "at_keybc", __FILE__),
m_cpu(nullptr),
m_system_reset_cb(*this),
diff --git a/src/devices/machine/at_keybc.h b/src/devices/machine/at_keybc.h
index 1774efe74cb..d6ff52d6975 100644
--- a/src/devices/machine/at_keybc.h
+++ b/src/devices/machine/at_keybc.h
@@ -47,7 +47,7 @@ class at_keyboard_controller_device : public device_t
{
public:
// construction/destruction
- at_keyboard_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ at_keyboard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 87f614d4c36..a7491f1eb1e 100644
--- a/src/devices/machine/ataflash.cpp
+++ b/src/devices/machine/ataflash.cpp
@@ -8,7 +8,7 @@
const device_type ATA_FLASH_PCCARD = &device_creator<ata_flash_pccard_device>;
-ata_flash_pccard_device::ata_flash_pccard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+ata_flash_pccard_device::ata_flash_pccard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
ide_hdd_device(mconfig, ATA_FLASH_PCCARD, "ATA Flash PCCARD", tag, owner, clock, "ataflash", __FILE__), m_gnetreadlock(0), m_locked(0)
{
}
diff --git a/src/devices/machine/ataflash.h b/src/devices/machine/ataflash.h
index 3ef8eefef09..e0504b2f180 100644
--- a/src/devices/machine/ataflash.h
+++ b/src/devices/machine/ataflash.h
@@ -14,7 +14,7 @@ class ata_flash_pccard_device : public ide_hdd_device,
public pccard_interface
{
public:
- ata_flash_pccard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ata_flash_pccard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_READ16_MEMBER(read_memory) override;
virtual DECLARE_WRITE16_MEMBER(write_memory) override;
diff --git a/src/devices/machine/atahle.cpp b/src/devices/machine/atahle.cpp
index 08bf542136a..6bd963f946c 100644
--- a/src/devices/machine/atahle.cpp
+++ b/src/devices/machine/atahle.cpp
@@ -39,7 +39,7 @@ enum
#define DEVICE1_PDIAG_TIME (attotime::from_msec(2))
#define DIAGNOSTIC_TIME (attotime::from_msec(2))
-ata_hle_device::ata_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
+ata_hle_device::ata_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
ata_device_interface(mconfig, *this),
device_slot_card_interface(mconfig, *this),
@@ -550,27 +550,27 @@ UINT16 ata_hle_device::read_dma()
{
if (!m_dmack)
{
- logerror( "%s: %s dev %d read_dma ignored (!DMACK)\n", machine().describe_context(), tag().c_str(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (!DMACK)\n", machine().describe_context(), tag(), dev() );
}
else if (m_dmarq && single_word_dma_mode() >= 0)
{
- logerror( "%s: %s dev %d read_dma ignored (DMARQ)\n", machine().describe_context(), tag().c_str(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (DMARQ)\n", machine().describe_context(), tag(), dev() );
}
else if (!m_dmarq && multi_word_dma_mode() >= 0)
{
- logerror( "%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag(), dev() );
}
else if (!m_dmarq && ultra_dma_mode() >= 0)
{
- logerror("%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev());
+ logerror("%s: %s dev %d read_dma ignored (!DMARQ)\n", machine().describe_context(), tag(), dev());
}
else if (m_status & IDE_STATUS_BSY)
{
- logerror( "%s: %s dev %d read_dma ignored (BSY)\n", machine().describe_context(), tag().c_str(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (BSY)\n", machine().describe_context(), tag(), dev() );
}
else if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d read_dma ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev() );
+ logerror( "%s: %s dev %d read_dma ignored (!DRQ)\n", machine().describe_context(), tag(), dev() );
}
else
{
@@ -596,7 +596,7 @@ READ16_MEMBER( ata_hle_device::read_cs0 )
{
if (m_dmack)
{
- logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag().c_str(), dev(), offset, mem_mask );
+ logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset, mem_mask );
}
else if ((m_status & IDE_STATUS_BSY) && offset != IDE_CS0_STATUS_R)
{
@@ -607,7 +607,7 @@ READ16_MEMBER( ata_hle_device::read_cs0 )
switch (offset)
{
case IDE_CS0_DATA_RW:
- logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (BSY)\n", machine().describe_context(), tag().c_str(), dev(), offset, mem_mask );
+ logerror( "%s: %s dev %d read_cs0 %04x %04x ignored (BSY)\n", machine().describe_context(), tag(), dev(), offset, mem_mask );
break;
default:
@@ -630,7 +630,7 @@ READ16_MEMBER( ata_hle_device::read_cs0 )
{
if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d read_cs0 ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev() );
+ logerror( "%s: %s dev %d read_cs0 ignored (!DRQ)\n", machine().describe_context(), tag(), dev() );
}
else
{
@@ -714,7 +714,7 @@ READ16_MEMBER( ata_hle_device::read_cs1 )
{
if (m_dmack)
{
- logerror( "%s: %s dev %d read_cs1 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag().c_str(), dev(), offset, mem_mask );
+ logerror( "%s: %s dev %d read_cs1 %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset, mem_mask );
}
else
{
@@ -774,27 +774,27 @@ void ata_hle_device::write_dma( UINT16 data )
{
if (!m_dmack)
{
- logerror( "%s: %s dev %d write_dma %04x ignored (!DMACK)\n", machine().describe_context(), tag().c_str(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (!DMACK)\n", machine().describe_context(), tag(), dev(), data );
}
else if (m_dmarq && single_word_dma_mode() >= 0)
{
- logerror( "%s: %s dev %d write_dma %04x ignored (DMARQ)\n", machine().describe_context(), tag().c_str(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (DMARQ)\n", machine().describe_context(), tag(), dev(), data );
}
else if (!m_dmarq && multi_word_dma_mode() >= 0)
{
- logerror( "%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag(), dev(), data );
}
else if (!m_dmarq && ultra_dma_mode() >= 0)
{
- logerror("%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag().c_str(), dev(), data);
+ logerror("%s: %s dev %d write_dma %04x ignored (!DMARQ)\n", machine().describe_context(), tag(), dev(), data);
}
else if (m_status & IDE_STATUS_BSY)
{
- logerror( "%s: %s dev %d write_dma %04x ignored (BSY)\n", machine().describe_context(), tag().c_str(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (BSY)\n", machine().describe_context(), tag(), dev(), data );
}
else if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d write_dma %04x ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev(), data );
+ logerror( "%s: %s dev %d write_dma %04x ignored (!DRQ)\n", machine().describe_context(), tag(), dev(), data );
}
else
{
@@ -815,15 +815,15 @@ WRITE16_MEMBER( ata_hle_device::write_cs0 )
if (m_dmack)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask );
}
else if ((m_status & IDE_STATUS_BSY) && offset != IDE_CS0_COMMAND_W)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (BSY) command %02x\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask, m_command );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (BSY) command %02x\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask, m_command );
}
else if ((m_status & IDE_STATUS_DRQ) && offset != IDE_CS0_DATA_RW && offset != IDE_CS0_COMMAND_W)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DRQ) command %02x\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask, m_command );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DRQ) command %02x\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask, m_command );
}
else
{
@@ -837,7 +837,7 @@ WRITE16_MEMBER( ata_hle_device::write_cs0 )
{
if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (!DRQ)\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (!DRQ)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask );
}
else
{
@@ -884,11 +884,11 @@ WRITE16_MEMBER( ata_hle_device::write_cs0 )
// Packet devices can accept DEVICE RESET when BSY or DRQ is set.
if (m_status & IDE_STATUS_BSY)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (BSY) command %02x\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask, m_command );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (BSY) command %02x\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask, m_command );
}
else if (m_status & IDE_STATUS_DRQ)
{
- logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DRQ) command %02x\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask, m_command );
+ logerror( "%s: %s dev %d write_cs0 %04x %04x %04x ignored (DRQ) command %02x\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask, m_command );
}
else if (device_selected() || m_command == IDE_COMMAND_DIAGNOSTIC)
{
@@ -922,7 +922,7 @@ WRITE16_MEMBER( ata_hle_device::write_cs1 )
if (m_dmack)
{
- logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask );
+ logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask );
}
else
{
@@ -944,7 +944,7 @@ WRITE16_MEMBER( ata_hle_device::write_cs1 )
{
if (m_resetting)
{
- logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (RESET)\n", machine().describe_context(), tag().c_str(), dev(), offset, data, mem_mask );
+ logerror( "%s: %s dev %d write_cs1 %04x %04x %04x ignored (RESET)\n", machine().describe_context(), tag(), dev(), offset, data, mem_mask );
}
else
{
diff --git a/src/devices/machine/atahle.h b/src/devices/machine/atahle.h
index b329b7dc10d..e26ad86b92c 100644
--- a/src/devices/machine/atahle.h
+++ b/src/devices/machine/atahle.h
@@ -20,7 +20,7 @@ class ata_hle_device : public device_t,
public device_slot_card_interface
{
public:
- ata_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ ata_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
virtual UINT16 read_dma() override;
virtual DECLARE_READ16_MEMBER(read_cs0) override;
diff --git a/src/devices/machine/ataintf.cpp b/src/devices/machine/ataintf.cpp
index f8e4669b577..b9c51351e71 100644
--- a/src/devices/machine/ataintf.cpp
+++ b/src/devices/machine/ataintf.cpp
@@ -207,7 +207,7 @@ SLOT_INTERFACE_START(ata_devices)
SLOT_INTERFACE("cdrom", ATAPI_CDROM)
SLOT_INTERFACE_END
-ata_interface_device::ata_interface_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ata_interface_device::ata_interface_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_irq_handler(*this),
m_dmarq_handler(*this),
@@ -217,7 +217,7 @@ ata_interface_device::ata_interface_device(const machine_config &mconfig, device
const device_type ATA_INTERFACE = &device_creator<ata_interface_device>;
-ata_interface_device::ata_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+ata_interface_device::ata_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ATA_INTERFACE, "ATA Interface", tag, owner, clock, "ata_interface", __FILE__),
m_irq_handler(*this),
m_dmarq_handler(*this),
@@ -296,7 +296,7 @@ const device_type ATA_SLOT = &device_creator<ata_slot_device>;
// ata_slot_device - constructor
//-------------------------------------------------
-ata_slot_device::ata_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ata_slot_device::ata_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ATA_SLOT, "ATA Connector", tag, owner, clock, "ata_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_dev(nullptr)
diff --git a/src/devices/machine/ataintf.h b/src/devices/machine/ataintf.h
index d7006701188..d1752d5923b 100644
--- a/src/devices/machine/ataintf.h
+++ b/src/devices/machine/ataintf.h
@@ -26,7 +26,7 @@ class ata_slot_device : public device_t,
{
public:
// construction/destruction
- ata_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ata_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
ata_device_interface *dev() { return m_dev; }
protected:
@@ -77,8 +77,8 @@ SLOT_INTERFACE_EXTERN(ata_devices);
class ata_interface_device : public device_t
{
public:
- ata_interface_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- ata_interface_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ata_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ata_interface_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<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 540aa493b66..1588f6d17cd 100644
--- a/src/devices/machine/atapicdr.cpp
+++ b/src/devices/machine/atapicdr.cpp
@@ -5,12 +5,12 @@
// device type definition
const device_type ATAPI_CDROM = &device_creator<atapi_cdrom_device>;
-atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
atapi_hle_device(mconfig, ATAPI_CDROM, "ATAPI CDROM", tag, owner, clock, "cdrom", __FILE__)
{
}
-atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
atapi_hle_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/devices/machine/atapicdr.h b/src/devices/machine/atapicdr.h
index 99b2651c1a7..b18999839c7 100644
--- a/src/devices/machine/atapicdr.h
+++ b/src/devices/machine/atapicdr.h
@@ -20,8 +20,8 @@ class atapi_cdrom_device : public atapi_hle_device,
public t10mmc
{
public:
- atapi_cdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ atapi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ atapi_cdrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
UINT16 *identify_device_buffer() { return m_identify_buffer; }
diff --git a/src/devices/machine/atapihle.cpp b/src/devices/machine/atapihle.cpp
index 1c503304663..1216e7a91ad 100644
--- a/src/devices/machine/atapihle.cpp
+++ b/src/devices/machine/atapihle.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "atapihle.h"
-atapi_hle_device::atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
+atapi_hle_device::atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
: ata_hle_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_packet(0),
m_data_size(0)
diff --git a/src/devices/machine/atapihle.h b/src/devices/machine/atapihle.h
index 97cd3f50398..d124259e577 100644
--- a/src/devices/machine/atapihle.h
+++ b/src/devices/machine/atapihle.h
@@ -20,7 +20,7 @@ class atapi_hle_device : public ata_hle_device,
public virtual t10spc
{
public:
- atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ atapi_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
enum atapi_features_flag_t
{
diff --git a/src/devices/machine/ay31015.cpp b/src/devices/machine/ay31015.cpp
index 0effc877efd..f1db92a19d8 100644
--- a/src/devices/machine/ay31015.cpp
+++ b/src/devices/machine/ay31015.cpp
@@ -97,7 +97,7 @@ Start bit (low), Bit 0, Bit 1... highest bit, Parity bit (if enabled), 1-2 stop
const device_type AY31015 = &device_creator<ay31015_device>;
const device_type AY51013 = &device_creator<ay51013_device>;
-ay31015_device::ay31015_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ay31015_device::ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_control_reg(0),
m_status_reg(0),
@@ -125,7 +125,7 @@ ay31015_device::ay31015_device(const machine_config &mconfig, device_type type,
elem = 0;
}
-ay31015_device::ay31015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ay31015_device::ay31015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AY31015, "AY-3-1015", tag, owner, clock, "ay31015", __FILE__),
m_control_reg(0),
m_status_reg(0),
@@ -153,7 +153,7 @@ ay31015_device::ay31015_device(const machine_config &mconfig, std::string tag, d
elem = 0;
}
-ay51013_device::ay51013_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ay51013_device::ay51013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ay31015_device(mconfig, AY31015, "AY-5-1013", tag, owner, clock, "ay51013", __FILE__)
{
}
diff --git a/src/devices/machine/ay31015.h b/src/devices/machine/ay31015.h
index a28595d723b..acdf3a01536 100644
--- a/src/devices/machine/ay31015.h
+++ b/src/devices/machine/ay31015.h
@@ -61,8 +61,8 @@ ALLOW_SAVE_TYPE(state_t);
class ay31015_device : public device_t
{
public:
- ay31015_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- ay31015_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ay31015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~ay31015_device() {}
static void set_tx_clock(device_t &device, double tx_clock) { downcast<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, std::string tag, device_t *owner, UINT32 clock);
+ ay51013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void internal_reset() override;
diff --git a/src/devices/machine/bankdev.cpp b/src/devices/machine/bankdev.cpp
index 757190247fa..65d56a39819 100644
--- a/src/devices/machine/bankdev.cpp
+++ b/src/devices/machine/bankdev.cpp
@@ -5,7 +5,7 @@
// device type definition
const device_type ADDRESS_MAP_BANK = &device_creator<address_map_bank_device>;
-address_map_bank_device::address_map_bank_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+address_map_bank_device::address_map_bank_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: device_t(mconfig, ADDRESS_MAP_BANK, "Address Map Bank", tag, owner, clock, "address_map_bank", __FILE__),
device_memory_interface(mconfig, *this),
m_endianness(ENDIANNESS_NATIVE),
diff --git a/src/devices/machine/bankdev.h b/src/devices/machine/bankdev.h
index 1f26eb8eee9..946faef53f0 100644
--- a/src/devices/machine/bankdev.h
+++ b/src/devices/machine/bankdev.h
@@ -25,7 +25,7 @@ class address_map_bank_device :
{
public:
// construction/destruction
- address_map_bank_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
+ address_map_bank_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
// static configuration helpers
static void set_endianness(device_t &device, endianness_t endianness) { downcast<address_map_bank_device &>(device).m_endianness = endianness; }
diff --git a/src/devices/machine/bcreader.cpp b/src/devices/machine/bcreader.cpp
index 42d5528ec67..5a5df7fb452 100644
--- a/src/devices/machine/bcreader.cpp
+++ b/src/devices/machine/bcreader.cpp
@@ -59,7 +59,7 @@ const device_type BARCODE_READER = &device_creator<barcode_reader_device>;
// barcode_reader_device - constructor
//-------------------------------------------------
-barcode_reader_device::barcode_reader_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+barcode_reader_device::barcode_reader_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, BARCODE_READER, "Barcode Reader", tag, owner, clock, "bcreader", __FILE__)
, m_byte_length(0)
, m_pixel_length(0)
diff --git a/src/devices/machine/bcreader.h b/src/devices/machine/bcreader.h
index 95e49c4715b..ecb6908e0ae 100644
--- a/src/devices/machine/bcreader.h
+++ b/src/devices/machine/bcreader.h
@@ -24,7 +24,7 @@ class barcode_reader_device : public device_t
{
public:
// construction/destruction
- barcode_reader_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ barcode_reader_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void write_code(const char *barcode, int len);
int get_pending_code() { return m_new_code; }
diff --git a/src/devices/machine/buffer.cpp b/src/devices/machine/buffer.cpp
index 91b7ef62a07..6b2058c6937 100644
--- a/src/devices/machine/buffer.cpp
+++ b/src/devices/machine/buffer.cpp
@@ -5,7 +5,7 @@
const device_type INPUT_BUFFER = &device_creator<input_buffer_device>;
-input_buffer_device::input_buffer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+input_buffer_device::input_buffer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, INPUT_BUFFER, "Input Buffer", tag, owner, clock, "input_buffer", __FILE__),
m_input_data(0xff)
{
diff --git a/src/devices/machine/buffer.h b/src/devices/machine/buffer.h
index e9dcd539ab4..7c719c918af 100644
--- a/src/devices/machine/buffer.h
+++ b/src/devices/machine/buffer.h
@@ -6,7 +6,7 @@
class input_buffer_device : public device_t
{
public:
- input_buffer_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ input_buffer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
UINT8 read() { return m_input_data; }
DECLARE_READ8_MEMBER(read) { return read(); }
diff --git a/src/devices/machine/cdp1852.cpp b/src/devices/machine/cdp1852.cpp
index 90572f4dc87..52fe18eb82b 100644
--- a/src/devices/machine/cdp1852.cpp
+++ b/src/devices/machine/cdp1852.cpp
@@ -38,7 +38,7 @@ enum
// cdp1852_device - constructor
//-------------------------------------------------
-cdp1852_device::cdp1852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+cdp1852_device::cdp1852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CDP1852, "CDP1852 I/O", tag, owner, clock, "cdp1852", __FILE__),
m_read_mode(*this),
m_write_sr(*this),
diff --git a/src/devices/machine/cdp1852.h b/src/devices/machine/cdp1852.h
index ed8d9baa017..eb8cef75dd4 100644
--- a/src/devices/machine/cdp1852.h
+++ b/src/devices/machine/cdp1852.h
@@ -58,7 +58,7 @@ class cdp1852_device : public device_t
{
public:
// construction/destruction
- cdp1852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cdp1852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 e7a19c97d49..e685f8c43ad 100644
--- a/src/devices/machine/cdp1871.cpp
+++ b/src/devices/machine/cdp1871.cpp
@@ -95,7 +95,7 @@ const UINT8 cdp1871_device::key_codes[4][11][8] =
// cdp1871_device - constructor
//-------------------------------------------------
-cdp1871_device::cdp1871_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+cdp1871_device::cdp1871_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CDP1871, "RCA CDP1871", tag, owner, clock, "cdp1871", __FILE__),
m_read_d1(*this),
m_read_d2(*this),
diff --git a/src/devices/machine/cdp1871.h b/src/devices/machine/cdp1871.h
index 4fb1aa652db..02238822057 100644
--- a/src/devices/machine/cdp1871.h
+++ b/src/devices/machine/cdp1871.h
@@ -93,7 +93,7 @@ class cdp1871_device : public device_t
{
public:
// construction/destruction
- cdp1871_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cdp1871_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 15b8320e23d..70d3bd4fade 100644
--- a/src/devices/machine/clock.cpp
+++ b/src/devices/machine/clock.cpp
@@ -4,7 +4,7 @@
const device_type CLOCK = &device_creator<clock_device>;
-clock_device::clock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+clock_device::clock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CLOCK, "Clock", tag, owner, clock, "clock", __FILE__),
m_signal(0),
m_timer(nullptr),
diff --git a/src/devices/machine/clock.h b/src/devices/machine/clock.h
index 8a673443a1a..4be97128bfe 100644
--- a/src/devices/machine/clock.h
+++ b/src/devices/machine/clock.h
@@ -13,7 +13,7 @@
class clock_device : public device_t
{
public:
- clock_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ clock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 10efcdf7a58..46a0ce83986 100644
--- a/src/devices/machine/com8116.cpp
+++ b/src/devices/machine/com8116.cpp
@@ -45,7 +45,7 @@ const int com8116_device::divisors_32X_5_0688MHz[] =
// com8116_device - constructor
//-------------------------------------------------
-com8116_device::com8116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+com8116_device::com8116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, COM8116, "COM8116", tag, owner, clock, "com8116", __FILE__),
m_fx4_handler(*this),
m_fr_handler(*this),
@@ -128,7 +128,7 @@ void com8116_device::str_w(UINT8 data)
int fr_divider = data & 0x0f;
int fr_clock = clock() / m_fr_divisors[fr_divider];
- if (LOG) logerror("COM8116 '%s' Receiver Divisor Select %01x: %u (%u Hz)\n", tag().c_str(), data & 0x0f, m_fr_divisors[fr_divider], fr_clock);
+ if (LOG) logerror("COM8116 '%s' Receiver Divisor Select %01x: %u (%u Hz)\n", tag(), data & 0x0f, m_fr_divisors[fr_divider], fr_clock);
m_fr_timer->adjust(attotime::from_nsec(3500), 0, attotime::from_hz(fr_clock * 2));
}
@@ -148,7 +148,7 @@ void com8116_device::stt_w(UINT8 data)
int ft_divider = data & 0x0f;
int ft_clock = clock() / m_ft_divisors[ft_divider];
- if (LOG) logerror("COM8116 '%s' Transmitter Divisor Select %01x: %u (%u Hz)\n", tag().c_str(), data & 0x0f, m_ft_divisors[ft_divider], ft_clock);
+ if (LOG) logerror("COM8116 '%s' Transmitter Divisor Select %01x: %u (%u Hz)\n", tag(), data & 0x0f, m_ft_divisors[ft_divider], ft_clock);
m_ft_timer->adjust(attotime::from_nsec(3500), 0, attotime::from_hz(ft_clock * 2));
}
diff --git a/src/devices/machine/com8116.h b/src/devices/machine/com8116.h
index 96020f08931..119f40d4b3d 100644
--- a/src/devices/machine/com8116.h
+++ b/src/devices/machine/com8116.h
@@ -51,7 +51,7 @@ class com8116_device : public device_t
{
public:
// construction/destruction
- com8116_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ com8116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 491ea9c0118..558851c0b7a 100644
--- a/src/devices/machine/corvushd.cpp
+++ b/src/devices/machine/corvushd.cpp
@@ -72,7 +72,7 @@
const device_type CORVUS_HDC = &device_creator<corvus_hdc_t>;
-corvus_hdc_t::corvus_hdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+corvus_hdc_t::corvus_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CORVUS_HDC, "Corvus Flat Cable HDC", tag, owner, clock, "corvus_hdc", __FILE__),
m_status(0),
m_prep_mode(false),
diff --git a/src/devices/machine/corvushd.h b/src/devices/machine/corvushd.h
index 64d7d636b1a..cb3bee03594 100644
--- a/src/devices/machine/corvushd.h
+++ b/src/devices/machine/corvushd.h
@@ -182,7 +182,7 @@ class corvus_hdc_t : public device_t
{
public:
// construction/destruction
- corvus_hdc_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ corvus_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp
index 9d579df4ac6..debd3906fbc 100644
--- a/src/devices/machine/cr511b.cpp
+++ b/src/devices/machine/cr511b.cpp
@@ -45,7 +45,7 @@ machine_config_constructor cr511b_device::device_mconfig_additions() const
// cr511b_device - constructor
//-------------------------------------------------
-cr511b_device::cr511b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+cr511b_device::cr511b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CR511B, "CR-511-B CD-ROM drive", tag, owner, clock, "cr511b", __FILE__),
m_cdrom(*this, "cdrom"),
m_cdda(*this, "cdda"),
diff --git a/src/devices/machine/cr511b.h b/src/devices/machine/cr511b.h
index 05053525812..b4b3529f061 100644
--- a/src/devices/machine/cr511b.h
+++ b/src/devices/machine/cr511b.h
@@ -75,7 +75,7 @@ class cr511b_device : public device_t
{
public:
// construction/destruction
- cr511b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cr511b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// callbacks
template<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 31bc4f3d077..8c0ae34f6c9 100644
--- a/src/devices/machine/cr589.cpp
+++ b/src/devices/machine/cr589.cpp
@@ -139,7 +139,7 @@ void matsushita_cr589_device::WriteData( UINT8 *data, int dataLength )
// device type definition
const device_type CR589 = &device_creator<matsushita_cr589_device>;
-matsushita_cr589_device::matsushita_cr589_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+matsushita_cr589_device::matsushita_cr589_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
atapi_cdrom_device(mconfig, CR589, "Matsushita CR589 CD-ROM Drive", tag, owner, clock, "cr589", __FILE__),
device_nvram_interface(mconfig, *this)
{
diff --git a/src/devices/machine/cr589.h b/src/devices/machine/cr589.h
index 6f485a243ed..e74e2612663 100644
--- a/src/devices/machine/cr589.h
+++ b/src/devices/machine/cr589.h
@@ -20,7 +20,7 @@ class matsushita_cr589_device : public atapi_cdrom_device,
public device_nvram_interface
{
public:
- matsushita_cr589_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ matsushita_cr589_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual void ExecCommand() override;
virtual void WriteData( UINT8 *data, int dataLength ) override;
diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp
index 3f81bced150..b6d8de1acd8 100644
--- a/src/devices/machine/cs4031.cpp
+++ b/src/devices/machine/cs4031.cpp
@@ -154,7 +154,7 @@ machine_config_constructor cs4031_device::device_mconfig_additions() const
// cs4031_device - constructor
//-------------------------------------------------
-cs4031_device::cs4031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+cs4031_device::cs4031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, CS4031, "CS4031", tag, owner, clock, "cs4031", __FILE__),
m_read_ior(*this),
m_write_iow(*this),
@@ -190,25 +190,25 @@ cs4031_device::cs4031_device(const machine_config &mconfig, std::string tag, dev
{
}
-void cs4031_device::static_set_cputag(device_t &device, std::string tag)
+void cs4031_device::static_set_cputag(device_t &device, const char *tag)
{
cs4031_device &cs4031 = downcast<cs4031_device &>(device);
cs4031.m_cputag = tag;
}
-void cs4031_device::static_set_isatag(device_t &device, std::string tag)
+void cs4031_device::static_set_isatag(device_t &device, const char *tag)
{
cs4031_device &cs4031 = downcast<cs4031_device &>(device);
cs4031.m_isatag = tag;
}
-void cs4031_device::static_set_biostag(device_t &device, std::string tag)
+void cs4031_device::static_set_biostag(device_t &device, const char *tag)
{
cs4031_device &cs4031 = downcast<cs4031_device &>(device);
cs4031.m_biostag = tag;
}
-void cs4031_device::static_set_keybctag(device_t &device, std::string tag)
+void cs4031_device::static_set_keybctag(device_t &device, const char *tag)
{
cs4031_device &cs4031 = downcast<cs4031_device &>(device);
cs4031.m_keybctag = tag;
diff --git a/src/devices/machine/cs4031.h b/src/devices/machine/cs4031.h
index 2880d330cf8..9a194a8699b 100644
--- a/src/devices/machine/cs4031.h
+++ b/src/devices/machine/cs4031.h
@@ -82,7 +82,7 @@ class cs4031_device : public device_t
{
public:
// construction/destruction
- cs4031_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cs4031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -181,10 +181,10 @@ public:
IRQ_CALLBACK_MEMBER(int_ack_r) { return m_intc1->acknowledge(); }
// inline configuration
- static void static_set_cputag(device_t &device, std::string tag);
- static void static_set_isatag(device_t &device, std::string tag);
- static void static_set_biostag(device_t &device, std::string tag);
- static void static_set_keybctag(device_t &device, std::string tag);
+ static void static_set_cputag(device_t &device, const char *tag);
+ static void static_set_isatag(device_t &device, const char *tag);
+ static void static_set_biostag(device_t &device, const char *tag);
+ static void static_set_keybctag(device_t &device, const char *tag);
protected:
// device-level overrides
@@ -221,10 +221,10 @@ private:
void update_write_regions();
// internal state
- std::string m_cputag;
- std::string m_isatag;
- std::string m_biostag;
- std::string m_keybctag;
+ const char *m_cputag;
+ const char *m_isatag;
+ const char *m_biostag;
+ const char *m_keybctag;
address_space *m_space;
address_space *m_space_io;
diff --git a/src/devices/machine/cs8221.cpp b/src/devices/machine/cs8221.cpp
index 118c9b08c3d..95a890d7bba 100644
--- a/src/devices/machine/cs8221.cpp
+++ b/src/devices/machine/cs8221.cpp
@@ -58,26 +58,26 @@ static const char *const register_names[] =
// cs8221_device - constructor
//-------------------------------------------------
-cs8221_device::cs8221_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+cs8221_device::cs8221_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CS8221, "CS8221", tag, owner, clock, "cs8221", __FILE__),
m_address(0),
m_address_valid(false)
{
}
-void cs8221_device::static_set_cputag(device_t &device, std::string tag)
+void cs8221_device::static_set_cputag(device_t &device, const char *tag)
{
cs8221_device &cs8221 = downcast<cs8221_device &>(device);
cs8221.m_cputag = tag;
}
-void cs8221_device::static_set_isatag(device_t &device, std::string tag)
+void cs8221_device::static_set_isatag(device_t &device, const char *tag)
{
cs8221_device &cs8221 = downcast<cs8221_device &>(device);
cs8221.m_isatag = tag;
}
-void cs8221_device::static_set_biostag(device_t &device, std::string tag)
+void cs8221_device::static_set_biostag(device_t &device, const char *tag)
{
cs8221_device &cs8221 = downcast<cs8221_device &>(device);
cs8221.m_biostag = tag;
diff --git a/src/devices/machine/cs8221.h b/src/devices/machine/cs8221.h
index b53d63a76b5..ea7cc4a99b4 100644
--- a/src/devices/machine/cs8221.h
+++ b/src/devices/machine/cs8221.h
@@ -44,16 +44,16 @@ class cs8221_device : public device_t
{
public:
// construction/destruction
- cs8221_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ cs8221_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( address_w );
DECLARE_READ8_MEMBER( data_r );
DECLARE_WRITE8_MEMBER( data_w );
// inline configuration
- static void static_set_cputag(device_t &device, std::string tag);
- static void static_set_isatag(device_t &device, std::string tag);
- static void static_set_biostag(device_t &device, std::string tag);
+ static void static_set_cputag(device_t &device, const char *tag);
+ static void static_set_isatag(device_t &device, const char *tag);
+ static void static_set_biostag(device_t &device, const char *tag);
protected:
// device-level overrides
@@ -72,9 +72,9 @@ private:
UINT8 m_address;
bool m_address_valid;
- std::string m_cputag;
- std::string m_isatag;
- std::string m_biostag;
+ const char *m_cputag;
+ const char *m_isatag;
+ const char *m_biostag;
UINT8 m_registers[0x10];
diff --git a/src/devices/machine/diablo_hd.cpp b/src/devices/machine/diablo_hd.cpp
index 8cc89ca66f1..f833cf54504 100644
--- a/src/devices/machine/diablo_hd.cpp
+++ b/src/devices/machine/diablo_hd.cpp
@@ -57,7 +57,7 @@
* </PRE>
*/
-diablo_hd_device::diablo_hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+diablo_hd_device::diablo_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, DIABLO_HD, "Diablo Disk", tag, owner, clock, "diablo_hd", __FILE__),
#if DIABLO_DEBUG
m_log_level(8),
@@ -1322,7 +1322,7 @@ void diablo_hd_device::device_start()
m_image = static_cast<diablo_image_device *>(subdevice("drive"));
m_packs = 1; // FIXME: get from configuration?
- m_unit = strstr(m_image->tag().c_str(), "diablo0") ? 0 : 1;
+ m_unit = strstr(m_image->tag(), "diablo0") ? 0 : 1;
m_timer = timer_alloc(1, nullptr);
}
diff --git a/src/devices/machine/diablo_hd.h b/src/devices/machine/diablo_hd.h
index a391e352199..c3fadd2a073 100644
--- a/src/devices/machine/diablo_hd.h
+++ b/src/devices/machine/diablo_hd.h
@@ -22,7 +22,7 @@ extern const device_type DIABLO_HD;
class diablo_hd_device : public device_t
{
public:
- diablo_hd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ diablo_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~diablo_hd_device();
static const int DIABLO_UNIT_MAX = 2; //!< max number of drive units
diff --git a/src/devices/machine/dmac.cpp b/src/devices/machine/dmac.cpp
index ea1c16fa61c..34992fc4f5c 100644
--- a/src/devices/machine/dmac.cpp
+++ b/src/devices/machine/dmac.cpp
@@ -37,7 +37,7 @@ const device_type DMAC = &device_creator<dmac_device>;
// dmac_device - constructor
//-------------------------------------------------
-dmac_device::dmac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+dmac_device::dmac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, DMAC, "DMAC DMA Controller", tag, owner, clock, "dmac", __FILE__),
amiga_autoconfig(),
m_cfgout_handler(*this),
diff --git a/src/devices/machine/dmac.h b/src/devices/machine/dmac.h
index 494888cecf1..2d86c427013 100644
--- a/src/devices/machine/dmac.h
+++ b/src/devices/machine/dmac.h
@@ -55,7 +55,7 @@ class dmac_device : public device_t, public amiga_autoconfig
{
public:
// construction/destruction
- dmac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ dmac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// callbacks
template<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 87c9725ee9f..52e66168322 100644
--- a/src/devices/machine/dp8390.cpp
+++ b/src/devices/machine/dp8390.cpp
@@ -9,17 +9,17 @@
const device_type DP8390D = &device_creator<dp8390d_device>;
const device_type RTL8019A = &device_creator<rtl8019a_device>;
-dp8390d_device::dp8390d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+dp8390d_device::dp8390d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: dp8390_device(mconfig, DP8390D, "DP8390D", tag, owner, clock, 10.0f, "dp8390d", __FILE__) {
m_type = TYPE_DP8390D;
}
-rtl8019a_device::rtl8019a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+rtl8019a_device::rtl8019a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: dp8390_device(mconfig, RTL8019A, "RTL8019A", tag, owner, clock, 10.0f, "rtl8019a", __FILE__) {
m_type = TYPE_RTL8019A;
}
-dp8390_device::dp8390_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source)
+dp8390_device::dp8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_network_interface(mconfig, *this, bandwidth), m_type(0),
m_irq_cb(*this),
diff --git a/src/devices/machine/dp8390.h b/src/devices/machine/dp8390.h
index bb3f39bc314..49341e30e49 100644
--- a/src/devices/machine/dp8390.h
+++ b/src/devices/machine/dp8390.h
@@ -38,7 +38,7 @@ class dp8390_device : public device_t,
{
public:
// construction/destruction
- dp8390_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source);
+ dp8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source);
template<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, std::string tag, device_t *owner, UINT32 clock);
+ rtl8019a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class dp8390d_device : public dp8390_device
{
public:
- dp8390d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ dp8390d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
// device type definition
diff --git a/src/devices/machine/ds1204.cpp b/src/devices/machine/ds1204.cpp
index b882022d306..72029b2aecc 100644
--- a/src/devices/machine/ds1204.cpp
+++ b/src/devices/machine/ds1204.cpp
@@ -22,14 +22,14 @@ inline void ATTR_PRINTF( 3, 4 ) ds1204_device::verboselog( int n_level, const ch
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: ds1204(%s) %s", machine().describe_context(), tag().c_str(), buf );
+ logerror( "%s: ds1204(%s) %s", machine().describe_context(), tag(), buf );
}
}
// device type definition
const device_type DS1204 = &device_creator<ds1204_device>;
-ds1204_device::ds1204_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+ds1204_device::ds1204_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: device_t( mconfig, DS1204, "DS1204", tag, owner, clock, "ds1204", __FILE__ ),
device_nvram_interface(mconfig, *this),
m_rst( 0 ),
@@ -71,11 +71,11 @@ void ds1204_device::nvram_default()
if( !m_region )
{
- logerror( "ds1204(%s) region not found\n", tag().c_str() );
+ logerror( "ds1204(%s) region not found\n", tag() );
}
else if( m_region->bytes() != expected_bytes )
{
- logerror( "ds1204(%s) region length 0x%x expected 0x%x\n", tag().c_str(), m_region->bytes(), expected_bytes );
+ logerror( "ds1204(%s) region length 0x%x expected 0x%x\n", tag(), m_region->bytes(), expected_bytes );
}
else
{
diff --git a/src/devices/machine/ds1204.h b/src/devices/machine/ds1204.h
index 61e317126c6..42b68de7538 100644
--- a/src/devices/machine/ds1204.h
+++ b/src/devices/machine/ds1204.h
@@ -22,7 +22,7 @@ class ds1204_device : public device_t,
{
public:
// construction/destruction
- ds1204_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
+ ds1204_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
DECLARE_WRITE_LINE_MEMBER( write_rst );
DECLARE_WRITE_LINE_MEMBER( write_clk );
diff --git a/src/devices/machine/ds128x.cpp b/src/devices/machine/ds128x.cpp
index 6c0e9a2696b..5b7fa8e0663 100644
--- a/src/devices/machine/ds128x.cpp
+++ b/src/devices/machine/ds128x.cpp
@@ -10,7 +10,7 @@ const device_type DS12885 = &device_creator<ds12885_device>;
// ds12885_device - constructor
//-------------------------------------------------
-ds12885_device::ds12885_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ds12885_device::ds12885_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mc146818_device(mconfig, DS12885, "DS12885", tag, owner, clock, "ds12885", __FILE__)
{
}
diff --git a/src/devices/machine/ds128x.h b/src/devices/machine/ds128x.h
index e61bad76964..7dbd2deb92c 100644
--- a/src/devices/machine/ds128x.h
+++ b/src/devices/machine/ds128x.h
@@ -14,7 +14,7 @@ class ds12885_device : public mc146818_device
{
public:
// construction/destruction
- ds12885_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ds12885_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual int data_size() override { return 128; }
diff --git a/src/devices/machine/ds1302.cpp b/src/devices/machine/ds1302.cpp
index 108d4740c0c..c2cd23b560f 100644
--- a/src/devices/machine/ds1302.cpp
+++ b/src/devices/machine/ds1302.cpp
@@ -72,7 +72,7 @@ const device_type DS1302 = &device_creator<ds1302_device>;
// ds1302_device - constructor
//-------------------------------------------------
-ds1302_device::ds1302_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ds1302_device::ds1302_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS1302, "DS1302", tag, owner, clock, "ds1302", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this)
@@ -191,7 +191,7 @@ void ds1302_device::rtc_clock_updated(int year, int month, int day, int day_of_w
WRITE_LINE_MEMBER( ds1302_device::ce_w )
{
- if (LOG) logerror("DS1302 '%s' CE: %u\n", tag().c_str(), state);
+ if (LOG) logerror("DS1302 '%s' CE: %u\n", tag(), state);
if (!state && m_ce)
{
@@ -224,26 +224,26 @@ void ds1302_device::load_shift_register()
{
m_data = m_ram[m_addr];
- if (LOG) logerror("DS1302 '%s' Read RAM %u:%02x\n", tag().c_str(), m_addr, m_data);
+ if (LOG) logerror("DS1302 '%s' Read RAM %u:%02x\n", tag(), m_addr, m_data);
}
else
{
m_data = m_user[m_addr];
- if (LOG) logerror("DS1302 '%s' Read Clock %u:%02x\n", tag().c_str(), m_addr, m_data);
+ if (LOG) logerror("DS1302 '%s' Read Clock %u:%02x\n", tag(), m_addr, m_data);
}
}
else
{
if (COMMAND_RAM)
{
- if (LOG) logerror("DS1302 '%s' Write RAM %u:%02x\n", tag().c_str(), m_addr, m_data);
+ if (LOG) logerror("DS1302 '%s' Write RAM %u:%02x\n", tag(), m_addr, m_data);
m_ram[m_addr] = m_data;
}
else if (m_addr < 9)
{
- if (LOG) logerror("DS1302 '%s' Write Clock %u:%02x\n", tag().c_str(), m_addr, m_data);
+ if (LOG) logerror("DS1302 '%s' Write Clock %u:%02x\n", tag(), m_addr, m_data);
m_reg[m_addr] = m_data;
}
@@ -266,7 +266,7 @@ void ds1302_device::input_bit()
if (m_bits == 8)
{
- if (LOG) logerror("DS1302 '%s' Command: %02x\n", tag().c_str(), m_cmd);
+ if (LOG) logerror("DS1302 '%s' Command: %02x\n", tag(), m_cmd);
m_bits = 0;
m_addr = (m_cmd >> 1) & 0x1f;
@@ -303,7 +303,7 @@ void ds1302_device::input_bit()
if (m_bits == 8)
{
- if (LOG) logerror("DS1302 '%s' Data: %02x\n", tag().c_str(), m_data);
+ if (LOG) logerror("DS1302 '%s' Data: %02x\n", tag(), m_data);
m_bits = 0;
@@ -374,7 +374,7 @@ void ds1302_device::output_bit()
WRITE_LINE_MEMBER( ds1302_device::sclk_w )
{
- if (LOG) logerror("DS1302 '%s' CLK: %u\n", tag().c_str(), state);
+ if (LOG) logerror("DS1302 '%s' CLK: %u\n", tag(), state);
if (!m_ce) return;
@@ -397,7 +397,7 @@ WRITE_LINE_MEMBER( ds1302_device::sclk_w )
WRITE_LINE_MEMBER( ds1302_device::io_w )
{
- if (LOG) logerror("DS1302 '%s' I/O: %u\n", tag().c_str(), state);
+ if (LOG) logerror("DS1302 '%s' I/O: %u\n", tag(), state);
m_io = state;
}
diff --git a/src/devices/machine/ds1302.h b/src/devices/machine/ds1302.h
index 5f0784519b7..515613579b2 100644
--- a/src/devices/machine/ds1302.h
+++ b/src/devices/machine/ds1302.h
@@ -43,7 +43,7 @@ class ds1302_device : public device_t,
{
public:
// construction/destruction
- ds1302_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ds1302_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( ce_w );
DECLARE_WRITE_LINE_MEMBER( sclk_w );
diff --git a/src/devices/machine/ds1315.cpp b/src/devices/machine/ds1315.cpp
index 239f2ca866a..e9c984e4716 100644
--- a/src/devices/machine/ds1315.cpp
+++ b/src/devices/machine/ds1315.cpp
@@ -27,7 +27,7 @@
const device_type DS1315 = &device_creator<ds1315_device>;
-ds1315_device::ds1315_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ds1315_device::ds1315_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS1315, "Dallas Semiconductor DS1315", tag, owner, clock, "ds1315", __FILE__), m_mode(), m_count(0)
{
}
diff --git a/src/devices/machine/ds1315.h b/src/devices/machine/ds1315.h
index ae51a2a753d..1894a05aac7 100644
--- a/src/devices/machine/ds1315.h
+++ b/src/devices/machine/ds1315.h
@@ -31,7 +31,7 @@ ALLOW_SAVE_TYPE(ds1315_mode_t);
class ds1315_device : public device_t
{
public:
- ds1315_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ds1315_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~ds1315_device() {}
DECLARE_READ8_MEMBER(read_0);
diff --git a/src/devices/machine/ds2401.cpp b/src/devices/machine/ds2401.cpp
index 889baf7ebaa..7298fa888ee 100644
--- a/src/devices/machine/ds2401.cpp
+++ b/src/devices/machine/ds2401.cpp
@@ -22,14 +22,14 @@ inline void ds2401_device::verboselog(int n_level, const char *s_fmt, ...)
va_start(v, s_fmt);
vsprintf(buf, s_fmt, v);
va_end(v);
- logerror("ds2401 %s %s: %s", tag().c_str(), machine().describe_context(), buf);
+ logerror("ds2401 %s %s: %s", tag(), machine().describe_context(), buf);
}
}
// device type definition
const device_type DS2401 = &device_creator<ds2401_device>;
-ds2401_device::ds2401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ds2401_device::ds2401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS2401, "DS2401", tag, owner, clock, "ds2401", __FILE__), m_state(0), m_bit(0), m_shift(0), m_byte(0), m_rx(false), m_tx(false), m_timer_main(nullptr), m_timer_reset(nullptr)
{
}
@@ -73,11 +73,11 @@ void ds2401_device::device_reset()
return;
}
- logerror("ds2401 %s: Wrong region length for id data, expected 0x%x, got 0x%x\n", tag().c_str(), SIZE_DATA, m_region->bytes());
+ logerror("ds2401 %s: Wrong region length for id data, expected 0x%x, got 0x%x\n", tag(), SIZE_DATA, m_region->bytes());
}
else
{
- logerror("ds2401 %s: Warning, no id provided, answer will be all zeroes.\n", tag().c_str());
+ logerror("ds2401 %s: Warning, no id provided, answer will be all zeroes.\n", tag());
}
memset(m_data, 0, SIZE_DATA);
diff --git a/src/devices/machine/ds2401.h b/src/devices/machine/ds2401.h
index 7bef492f499..11c05f27a02 100644
--- a/src/devices/machine/ds2401.h
+++ b/src/devices/machine/ds2401.h
@@ -20,7 +20,7 @@ class ds2401_device : public device_t
{
public:
// construction/destruction
- ds2401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ds2401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( write );
DECLARE_READ_LINE_MEMBER( read );
diff --git a/src/devices/machine/ds2404.cpp b/src/devices/machine/ds2404.cpp
index 7a437332620..68082389cee 100644
--- a/src/devices/machine/ds2404.cpp
+++ b/src/devices/machine/ds2404.cpp
@@ -24,7 +24,7 @@ const device_type DS2404 = &device_creator<ds2404_device>;
// ds2404_device - constructor
//-------------------------------------------------
-ds2404_device::ds2404_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ds2404_device::ds2404_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS2404, "DS2404", tag, owner, clock, "ds2404", __FILE__),
device_nvram_interface(mconfig, *this), m_tick_timer(nullptr), m_ref_year(0), m_ref_month(0), m_ref_day(0),
m_address(0),
diff --git a/src/devices/machine/ds2404.h b/src/devices/machine/ds2404.h
index 5510afc9006..86b9c7be05d 100644
--- a/src/devices/machine/ds2404.h
+++ b/src/devices/machine/ds2404.h
@@ -49,7 +49,7 @@ class ds2404_device : public device_t,
{
public:
// construction/destruction
- ds2404_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ds2404_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_ref_year(device_t &device, UINT32 m_ref_year);
diff --git a/src/devices/machine/ds75160a.cpp b/src/devices/machine/ds75160a.cpp
index 56a602fd607..1560fa4f0b2 100644
--- a/src/devices/machine/ds75160a.cpp
+++ b/src/devices/machine/ds75160a.cpp
@@ -26,7 +26,7 @@ const device_type DS75160A = &device_creator<ds75160a_device>;
// ds75160a_device - constructor
//-------------------------------------------------
-ds75160a_device::ds75160a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ds75160a_device::ds75160a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS75160A, "DS75160A", tag, owner, clock, "ds75160a", __FILE__),
m_read(*this),
m_write(*this),
diff --git a/src/devices/machine/ds75160a.h b/src/devices/machine/ds75160a.h
index 0ac0f1c4d4d..5cb4898322d 100644
--- a/src/devices/machine/ds75160a.h
+++ b/src/devices/machine/ds75160a.h
@@ -48,7 +48,7 @@ class ds75160a_device : public device_t
{
public:
// construction/destruction
- ds75160a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ds75160a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 6280661e6aa..5ec21a0e003 100644
--- a/src/devices/machine/ds75161a.cpp
+++ b/src/devices/machine/ds75161a.cpp
@@ -26,7 +26,7 @@ const device_type DS75161A = &device_creator<ds75161a_device>;
// ds75161a_device - constructor
//-------------------------------------------------
-ds75161a_device::ds75161a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ds75161a_device::ds75161a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DS75161A, "DS75161A", tag, owner, clock, "ds75161a", __FILE__),
m_in_ren_cb(*this),
m_in_ifc_cb(*this),
diff --git a/src/devices/machine/ds75161a.h b/src/devices/machine/ds75161a.h
index 9ff55d436e7..33c244f6528 100644
--- a/src/devices/machine/ds75161a.h
+++ b/src/devices/machine/ds75161a.h
@@ -90,7 +90,7 @@ class ds75161a_device : public device_t
{
public:
// construction/destruction
- ds75161a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ds75161a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 fd09cf68137..f80cad5bdb5 100644
--- a/src/devices/machine/e0516.cpp
+++ b/src/devices/machine/e0516.cpp
@@ -38,7 +38,7 @@ const device_type E0516 = &device_creator<e0516_device>;
// e0516_device - constructor
//-------------------------------------------------
-e0516_device::e0516_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+e0516_device::e0516_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, E0516, "E05-16", tag, owner, clock, "e0516", __FILE__),
device_rtc_interface(mconfig, *this), m_cs(0), m_clk(0), m_data_latch(0), m_reg_latch(0), m_read_write(0), m_state(0), m_bits(0), m_dio(0), m_timer(nullptr)
{
@@ -93,7 +93,7 @@ void e0516_device::device_timer(emu_timer &timer, device_timer_id id, int param,
WRITE_LINE_MEMBER( e0516_device::cs_w )
{
- if (LOG) logerror("E05-16 '%s' CS %u\n", tag().c_str(), state);
+ if (LOG) logerror("E05-16 '%s' CS %u\n", tag(), state);
m_cs = state;
@@ -113,7 +113,7 @@ WRITE_LINE_MEMBER( e0516_device::cs_w )
WRITE_LINE_MEMBER( e0516_device::clk_w )
{
- if (LOG) logerror("E05-16 '%s' CLK %u\n", tag().c_str(), state);
+ if (LOG) logerror("E05-16 '%s' CLK %u\n", tag(), state);
m_clk = state;
@@ -123,7 +123,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w )
if (m_state == STATE_ADDRESS)
{
- if (LOG) logerror("E05-16 '%s' Command Bit %u\n", tag().c_str(), m_dio);
+ if (LOG) logerror("E05-16 '%s' Command Bit %u\n", tag(), m_dio);
// command
m_reg_latch |= m_dio << 3;
@@ -147,7 +147,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w )
if (BIT(m_reg_latch, 0))
{
// read
- if (LOG) logerror("E05-16 '%s' Data Bit OUT %u\n", tag().c_str(), m_dio);
+ if (LOG) logerror("E05-16 '%s' Data Bit OUT %u\n", tag(), m_dio);
m_dio = BIT(m_data_latch, 0);
m_data_latch >>= 1;
@@ -155,7 +155,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w )
else
{
// write
- if (LOG) logerror("E05-16 '%s' Data Bit IN %u\n", tag().c_str(), m_dio);
+ if (LOG) logerror("E05-16 '%s' Data Bit IN %u\n", tag(), m_dio);
m_data_latch |= m_dio << 7;
m_data_latch >>= 1;
@@ -182,7 +182,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w )
WRITE_LINE_MEMBER( e0516_device::dio_w )
{
- if (LOG) logerror("E05-16 '%s' DIO %u\n", tag().c_str(), state);
+ if (LOG) logerror("E05-16 '%s' DIO %u\n", tag(), state);
m_dio = state;
}
diff --git a/src/devices/machine/e0516.h b/src/devices/machine/e0516.h
index edecd2d613d..7e95be0dfc1 100644
--- a/src/devices/machine/e0516.h
+++ b/src/devices/machine/e0516.h
@@ -46,7 +46,7 @@ class e0516_device : public device_t,
{
public:
// construction/destruction
- e0516_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ e0516_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( cs_w );
DECLARE_WRITE_LINE_MEMBER( clk_w );
diff --git a/src/devices/machine/e05a03.cpp b/src/devices/machine/e05a03.cpp
index 71b985967de..b0389abb6df 100644
--- a/src/devices/machine/e05a03.cpp
+++ b/src/devices/machine/e05a03.cpp
@@ -16,7 +16,7 @@
const device_type E05A03 = &device_creator<e05a03_device>;
-e05a03_device::e05a03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+e05a03_device::e05a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, E05A03, "E05A03", tag, owner, clock, "e05a03", __FILE__),
m_write_nlq_lp(*this),
m_write_pe_lp(*this),
diff --git a/src/devices/machine/e05a03.h b/src/devices/machine/e05a03.h
index ab768434d68..86b36b673b0 100644
--- a/src/devices/machine/e05a03.h
+++ b/src/devices/machine/e05a03.h
@@ -36,7 +36,7 @@
class e05a03_device : public device_t
{
public:
- e05a03_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ e05a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~e05a03_device() {}
template<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 331584e57b8..8bb802f9265 100644
--- a/src/devices/machine/e05a30.cpp
+++ b/src/devices/machine/e05a30.cpp
@@ -22,7 +22,7 @@
const device_type E05A30 = &device_creator<e05a30_device>;
-e05a30_device::e05a30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+e05a30_device::e05a30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, E05A30, "E05A30", tag, owner, clock, "e05a30", __FILE__),
m_write_printhead(*this),
m_write_pf_stepper(*this),
diff --git a/src/devices/machine/e05a30.h b/src/devices/machine/e05a30.h
index b3b90086860..f05b3fd35c9 100644
--- a/src/devices/machine/e05a30.h
+++ b/src/devices/machine/e05a30.h
@@ -46,7 +46,7 @@
class e05a30_device : public device_t
{
public:
- e05a30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ e05a30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~e05a30_device() {}
template<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 5909d6781a1..53b92a0ee0d 100644
--- a/src/devices/machine/eeprom.cpp
+++ b/src/devices/machine/eeprom.cpp
@@ -44,7 +44,7 @@ ADDRESS_MAP_END
// eeprom_base_device - constructor
//-------------------------------------------------
-eeprom_base_device::eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+eeprom_base_device::eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
: device_t(mconfig, devtype, name, tag, owner, 0, shortname, file),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -292,12 +292,12 @@ void eeprom_base_device::nvram_default()
if (m_region != nullptr)
{
if (m_region->bytes() != eeprom_bytes)
- fatalerror("eeprom region '%s' wrong size (expected size = 0x%X)\n", tag().c_str(), eeprom_bytes);
+ fatalerror("eeprom region '%s' wrong size (expected size = 0x%X)\n", tag(), eeprom_bytes);
if (m_data_bits == 8 && m_region->bytewidth() != 1)
- fatalerror("eeprom region '%s' needs to be an 8-bit region\n", tag().c_str());
+ fatalerror("eeprom region '%s' needs to be an 8-bit region\n", tag());
if (m_data_bits == 16 && (m_region->bytewidth() != 2 || m_region->endianness() != ENDIANNESS_BIG))
- fatalerror("eeprom region '%s' needs to be a 16-bit big-endian region\n", tag().c_str());
- osd_printf_verbose("Loading data from EEPROM region '%s'\n", tag().c_str());
+ fatalerror("eeprom region '%s' needs to be a 16-bit big-endian region\n", tag());
+ osd_printf_verbose("Loading data from EEPROM region '%s'\n", tag());
if (m_data_bits == 8)
{
diff --git a/src/devices/machine/eeprom.h b/src/devices/machine/eeprom.h
index 605ff258a07..23ba81cf42f 100644
--- a/src/devices/machine/eeprom.h
+++ b/src/devices/machine/eeprom.h
@@ -49,7 +49,7 @@ class eeprom_base_device : public device_t,
{
protected:
// construction/destruction
- eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
public:
// timing constants
diff --git a/src/devices/machine/eeprompar.cpp b/src/devices/machine/eeprompar.cpp
index df360f69b09..af575ec1419 100644
--- a/src/devices/machine/eeprompar.cpp
+++ b/src/devices/machine/eeprompar.cpp
@@ -51,7 +51,7 @@
// eeprom_parallel_base_device - constructor
//-------------------------------------------------
-eeprom_parallel_base_device::eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+eeprom_parallel_base_device::eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
: eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -88,7 +88,7 @@ void eeprom_parallel_base_device::device_reset()
// eeprom_parallel_28xx_device - constructor
//-------------------------------------------------
-eeprom_parallel_28xx_device::eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+eeprom_parallel_28xx_device::eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
: eeprom_parallel_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -116,7 +116,7 @@ READ8_MEMBER(eeprom_parallel_28xx_device::read)
// macro for defining a new device class
#define DEFINE_PARALLEL_EEPROM_DEVICE(_baseclass, _lowercase, _uppercase, _bits, _cells) \
-eeprom_parallel_##_lowercase##_device::eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) \
+eeprom_parallel_##_lowercase##_device::eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) \
: eeprom_parallel_##_baseclass##_device(mconfig, EEPROM_PARALLEL_##_uppercase, "Parallel EEPROM " #_uppercase " (" #_cells "x" #_bits ")", tag, owner, #_lowercase, __FILE__) \
{ \
static_set_size(*this, _cells, _bits); \
diff --git a/src/devices/machine/eeprompar.h b/src/devices/machine/eeprompar.h
index 814a1e5d674..e8ed153dd97 100644
--- a/src/devices/machine/eeprompar.h
+++ b/src/devices/machine/eeprompar.h
@@ -51,7 +51,7 @@ class eeprom_parallel_base_device : public eeprom_base_device
{
protected:
// construction/destruction
- eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_parallel_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
protected:
// device-level overrides
@@ -67,7 +67,7 @@ class eeprom_parallel_28xx_device : public eeprom_parallel_base_device
{
protected:
// construction/destruction
- eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_parallel_28xx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
public:
// read/write data lines - for now we cheat and ignore the control lines, assuming
@@ -87,7 +87,7 @@ public:
class eeprom_parallel_##_lowercase##_device : public eeprom_parallel_##_baseclass##_device \
{ \
public: \
- eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); \
+ eeprom_parallel_##_lowercase##_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); \
}; \
extern const device_type EEPROM_PARALLEL_##_uppercase;
// standard 28XX class of 8-bit EEPROMs
diff --git a/src/devices/machine/eepromser.cpp b/src/devices/machine/eepromser.cpp
index 9419993bc29..347accae06f 100644
--- a/src/devices/machine/eepromser.cpp
+++ b/src/devices/machine/eepromser.cpp
@@ -143,7 +143,7 @@ ALLOW_SAVE_TYPE(eeprom_serial_base_device::eeprom_state);
// eeprom_serial_base_device - constructor
//-------------------------------------------------
-eeprom_serial_base_device::eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+eeprom_serial_base_device::eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
: eeprom_base_device(mconfig, devtype, name, tag, owner, shortname, file),
m_command_address_bits(0),
m_streaming_enabled(false),
@@ -625,7 +625,7 @@ void eeprom_serial_base_device::execute_write_command()
// eeprom_serial_93cxx_device - constructor
//-------------------------------------------------
-eeprom_serial_93cxx_device::eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+eeprom_serial_93cxx_device::eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
: eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -692,7 +692,7 @@ WRITE_LINE_MEMBER(eeprom_serial_93cxx_device::di_write) { base_di_write(state);
// eeprom_serial_er5911_device - constructor
//-------------------------------------------------
-eeprom_serial_er5911_device::eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+eeprom_serial_er5911_device::eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
: eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -760,7 +760,7 @@ WRITE_LINE_MEMBER(eeprom_serial_er5911_device::di_write) { base_di_write(state);
// eeprom_serial_x24c44_device - constructor
//-------------------------------------------------
-eeprom_serial_x24c44_device::eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file)
+eeprom_serial_x24c44_device::eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
: eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file)
{
}
@@ -1127,7 +1127,7 @@ WRITE_LINE_MEMBER(eeprom_serial_x24c44_device::di_write) { base_di_write(state);
// macro for defining a new device class
#define DEFINE_SERIAL_EEPROM_DEVICE(_baseclass, _lowercase, _uppercase, _bits, _cells, _addrbits) \
-eeprom_serial_##_lowercase##_##_bits##bit_device::eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) \
+eeprom_serial_##_lowercase##_##_bits##bit_device::eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) \
: eeprom_serial_##_baseclass##_device(mconfig, EEPROM_SERIAL_##_uppercase##_##_bits##BIT, "Serial EEPROM " #_uppercase " (" #_cells "x" #_bits ")", tag, owner, #_lowercase "_" #_bits, __FILE__) \
{ \
static_set_size(*this, _cells, _bits); \
diff --git a/src/devices/machine/eepromser.h b/src/devices/machine/eepromser.h
index 84c20239572..cbba81bfbbe 100644
--- a/src/devices/machine/eepromser.h
+++ b/src/devices/machine/eepromser.h
@@ -85,7 +85,7 @@ class eeprom_serial_base_device : public eeprom_base_device
{
protected:
// construction/destruction
- eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
public:
// inline configuration helpers
@@ -178,7 +178,7 @@ class eeprom_serial_93cxx_device : public eeprom_serial_base_device
{
protected:
// construction/destruction
- eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
public:
// read handlers
@@ -201,7 +201,7 @@ class eeprom_serial_er5911_device : public eeprom_serial_base_device
{
protected:
// construction/destruction
- eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
public:
// read handlers
@@ -227,7 +227,7 @@ class eeprom_serial_x24c44_device : public eeprom_serial_base_device
//async store not implemented
protected:
// construction/destruction
- eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, std::string tag, device_t *owner, const char *shortname, const char *file);
+ eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
public:
// read handlers
@@ -264,7 +264,7 @@ protected:
class eeprom_serial_##_lowercase##_##_bits##bit_device : public eeprom_serial_##_baseclass##_device \
{ \
public: \
- eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); \
+ eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); \
}; \
extern const device_type EEPROM_SERIAL_##_uppercase##_##_bits##BIT;
// standard 93CX6 class of 16-bit EEPROMs
diff --git a/src/devices/machine/er2055.cpp b/src/devices/machine/er2055.cpp
index f6f5e891320..7c395a83b62 100644
--- a/src/devices/machine/er2055.cpp
+++ b/src/devices/machine/er2055.cpp
@@ -33,7 +33,7 @@ ADDRESS_MAP_END
// er2055_device - constructor
//-------------------------------------------------
-er2055_device::er2055_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+er2055_device::er2055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ER2055, "ER2055 EAROM", tag, owner, clock, "er2055", __FILE__),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -85,9 +85,9 @@ void er2055_device::nvram_default()
if (m_region != nullptr)
{
if (m_region->bytes() != SIZE_DATA)
- fatalerror("er2055 region '%s' wrong size (expected size = 0x40)\n", tag().c_str());
+ fatalerror("er2055 region '%s' wrong size (expected size = 0x40)\n", tag());
if (m_region->bytewidth() != 1)
- fatalerror("er2055 region '%s' needs to be an 8-bit region\n", tag().c_str());
+ fatalerror("er2055 region '%s' needs to be an 8-bit region\n", tag());
UINT8 *default_data = m_region->base();
for (int byte = 0; byte < SIZE_DATA; byte++)
diff --git a/src/devices/machine/er2055.h b/src/devices/machine/er2055.h
index 39a7767adee..900cac15b06 100644
--- a/src/devices/machine/er2055.h
+++ b/src/devices/machine/er2055.h
@@ -36,7 +36,7 @@ class er2055_device : public device_t,
{
public:
// construction/destruction
- er2055_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ er2055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
UINT8 data() const { return m_data; }
diff --git a/src/devices/machine/f3853.cpp b/src/devices/machine/f3853.cpp
index adc0aa82ea5..a37e1b7e59b 100644
--- a/src/devices/machine/f3853.cpp
+++ b/src/devices/machine/f3853.cpp
@@ -49,7 +49,7 @@ const device_type F3853 = &device_creator<f3853_device>;
// f3853_device - constructor
//-------------------------------------------------
-f3853_device::f3853_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+f3853_device::f3853_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, F3853, "F3853", tag, owner, clock, "f3853", __FILE__)
{
}
diff --git a/src/devices/machine/f3853.h b/src/devices/machine/f3853.h
index 61a1e0dd131..82e9610c174 100644
--- a/src/devices/machine/f3853.h
+++ b/src/devices/machine/f3853.h
@@ -62,7 +62,7 @@ class f3853_device : public device_t
{
public:
// construction/destruction
- f3853_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ f3853_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_interrupt_req_callback(device_t &device, f3853_interrupt_req_delegate callback) { downcast<f3853_device &>(device).m_interrupt_req_cb = callback; }
diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp
index 21429d640b8..671d0314560 100644
--- a/src/devices/machine/fdc37c665gt.cpp
+++ b/src/devices/machine/fdc37c665gt.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "fdc37c665gt.h"
-fdc37c665gt_device::fdc37c665gt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+fdc37c665gt_device::fdc37c665gt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, FDC37C665GT, "FDC37C665GT", tag, owner, clock, "fdc37c665gt", __FILE__),
m_uart1(*this, "uart1"),
m_uart2(*this, "uart2")
diff --git a/src/devices/machine/fdc37c665gt.h b/src/devices/machine/fdc37c665gt.h
index 822bb3cb80e..569bf8ed0e8 100644
--- a/src/devices/machine/fdc37c665gt.h
+++ b/src/devices/machine/fdc37c665gt.h
@@ -16,7 +16,7 @@ class fdc37c665gt_device : public device_t
{
public:
// construction/destruction
- fdc37c665gt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fdc37c665gt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/devices/machine/gayle.cpp b/src/devices/machine/gayle.cpp
index 03f96ac1517..93ea9034eb0 100644
--- a/src/devices/machine/gayle.cpp
+++ b/src/devices/machine/gayle.cpp
@@ -33,7 +33,7 @@ const device_type GAYLE = &device_creator<gayle_device>;
// gayle_device - constructor
//-------------------------------------------------
-gayle_device::gayle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+gayle_device::gayle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, GAYLE, "GAYLE", tag, owner, clock, "gayle", __FILE__),
m_int2_w(*this),
m_cs0_read(*this),
diff --git a/src/devices/machine/gayle.h b/src/devices/machine/gayle.h
index 92d7d95b3c7..6ea542dd392 100644
--- a/src/devices/machine/gayle.h
+++ b/src/devices/machine/gayle.h
@@ -50,7 +50,7 @@ class gayle_device : public device_t
{
public:
// construction/destruction
- gayle_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ gayle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// callbacks
template<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 99460c3e16b..e15039fbb38 100644
--- a/src/devices/machine/hd63450.cpp
+++ b/src/devices/machine/hd63450.cpp
@@ -10,7 +10,7 @@
const device_type HD63450 = &device_creator<hd63450_device>;
-hd63450_device::hd63450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+hd63450_device::hd63450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HD63450, "Hitachi HD63450", tag, owner, clock, "hd63450", __FILE__),
m_dma_end(*this),
m_dma_error(*this),
@@ -22,6 +22,7 @@ hd63450_device::hd63450_device(const machine_config &mconfig, std::string tag, d
m_dma_write_1(*this),
m_dma_write_2(*this),
m_dma_write_3(*this),
+ m_cpu_tag(nullptr),
m_cpu(nullptr)
{
for (int i = 0; i < 4; i++)
diff --git a/src/devices/machine/hd63450.h b/src/devices/machine/hd63450.h
index 86e5f6d2ee3..e303a0d28b2 100644
--- a/src/devices/machine/hd63450.h
+++ b/src/devices/machine/hd63450.h
@@ -71,7 +71,7 @@ struct hd63450_regs
class hd63450_device : public device_t
{
public:
- hd63450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hd63450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~hd63450_device() {}
template<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, std::string tag) { downcast<hd63450_device &>(device).m_cpu_tag = tag; }
+ static void set_cpu_tag(device_t &device, const char *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;
- std::string m_cpu_tag;
+ const char *m_cpu_tag;
attotime m_our_clock[4];
attotime m_burst_clock[4];
diff --git a/src/devices/machine/hd64610.cpp b/src/devices/machine/hd64610.cpp
index 95b6a556e99..d4639892e17 100644
--- a/src/devices/machine/hd64610.cpp
+++ b/src/devices/machine/hd64610.cpp
@@ -86,7 +86,7 @@ inline void hd64610_device::set_irq_line()
if (m_irq_out != irq_out)
{
- if (LOG) logerror("HD64610 '%s' IRQ %u\n", tag().c_str(), irq_out);
+ if (LOG) logerror("HD64610 '%s' IRQ %u\n", tag(), irq_out);
m_out_irq_cb(irq_out);
m_irq_out = irq_out;
@@ -150,7 +150,7 @@ inline void hd64610_device::check_alarm()
// hd64610_device - constructor
//-------------------------------------------------
-hd64610_device::hd64610_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+hd64610_device::hd64610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HD64610, "HD64610", tag, owner, clock, "hd64610", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -298,7 +298,7 @@ READ8_MEMBER( hd64610_device::read )
{
UINT8 data = m_regs[offset & 0x0f];
- if (LOG) logerror("HD64610 '%s' Register %u Read %02x\n", tag().c_str(), offset, data);
+ if (LOG) logerror("HD64610 '%s' Register %u Read %02x\n", tag(), offset, data);
return data;
}
@@ -314,7 +314,7 @@ WRITE8_MEMBER( hd64610_device::write )
{
case REG_64HZ:
// read only
- logerror("HD64610 '%s' Writing to read-only register 64Hz Counter\n", tag().c_str());
+ logerror("HD64610 '%s' Writing to read-only register 64Hz Counter\n", tag());
break;
case REG_CRA:
@@ -322,17 +322,17 @@ WRITE8_MEMBER( hd64610_device::write )
if ((data & CRA_CF) == 0)
{
- if (LOG) logerror("HD64610 '%s' clear carry flag\n", tag().c_str());
+ if (LOG) logerror("HD64610 '%s' clear carry flag\n", tag());
m_regs[REG_CRA] &= 0x7f;
}
if ((data & CRA_AF) == 0)
{
- if (LOG) logerror("HD64610 '%s' clear alarm flag\n", tag().c_str());
+ if (LOG) logerror("HD64610 '%s' clear alarm flag\n", tag());
m_regs[REG_CRA] &= 0xfe;
}
- if (LOG) logerror("HD64610 '%s' set alarm IRQ %d\n", tag().c_str(), BIT(data, 3));
- if (LOG) logerror("HD64610 '%s' set carry IRQ %d\n", tag().c_str(), BIT(data, 4));
+ if (LOG) logerror("HD64610 '%s' set alarm IRQ %d\n", tag(), BIT(data, 3));
+ if (LOG) logerror("HD64610 '%s' set carry IRQ %d\n", tag(), BIT(data, 4));
break;
case REG_CRB:
@@ -340,7 +340,7 @@ WRITE8_MEMBER( hd64610_device::write )
if (data & CRB_ADJ)
{
- if (LOG) logerror("HD64610 '%s' 30-sec adjustament\n", tag().c_str());
+ if (LOG) logerror("HD64610 '%s' 30-sec adjustament\n", tag());
adjust_seconds();
m_regs[REG_64HZ] = 0;
@@ -349,18 +349,18 @@ WRITE8_MEMBER( hd64610_device::write )
if (data & CRB_RESET)
{
- if (LOG) logerror("HD64610 '%s' CRB reset\n", tag().c_str());
+ if (LOG) logerror("HD64610 '%s' CRB reset\n", tag());
m_regs[REG_64HZ] = 0;
m_regs[REG_CRB] &= ~CRB_RESET;
}
- if (LOG) logerror("HD64610 '%s' set timer %d\n", tag().c_str(), BIT(data, 0));
+ if (LOG) logerror("HD64610 '%s' set timer %d\n", tag(), BIT(data, 0));
break;
default:
m_regs[offset & 0x0f] = data & REG_WRITE_MASK[offset & 0x0f];
- if (LOG) logerror("HD64610 '%s' Register %u Write %02x\n", tag().c_str(), offset & 0x0f, data);
+ if (LOG) logerror("HD64610 '%s' Register %u Write %02x\n", tag(), offset & 0x0f, data);
break;
}
}
diff --git a/src/devices/machine/hd64610.h b/src/devices/machine/hd64610.h
index 001d9e67b18..021cf181c27 100644
--- a/src/devices/machine/hd64610.h
+++ b/src/devices/machine/hd64610.h
@@ -53,7 +53,7 @@ class hd64610_device : public device_t,
{
public:
// construction/destruction
- hd64610_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hd64610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 c2659edcfd0..54a8f802b99 100644
--- a/src/devices/machine/hdc92x4.cpp
+++ b/src/devices/machine/hdc92x4.cpp
@@ -431,7 +431,7 @@ const hdc92x4_device::cmddef hdc92x4_device::s_command[] =
/*
Standard constructor for the base class and the two variants
*/
-hdc92x4_device::hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+hdc92x4_device::hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_out_intrq(*this),
m_out_dmarq(*this),
@@ -443,13 +443,13 @@ hdc92x4_device::hdc92x4_device(const machine_config &mconfig, device_type type,
{
}
-hdc9224_device::hdc9224_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+hdc9224_device::hdc9224_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: hdc92x4_device(mconfig, HDC9224, "SMC HDC9224 Universal Disk Controller", tag, owner, clock, "hdc9224", __FILE__)
{
m_is_hdc9234 = false;
}
-hdc9234_device::hdc9234_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+hdc9234_device::hdc9234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: hdc92x4_device(mconfig, HDC9234, "SMC HDC9234 Universal Disk Controller", tag, owner, clock, "hdc9234", __FILE__)
{
m_is_hdc9234 = true;
@@ -622,7 +622,7 @@ void hdc92x4_device::wait_time(emu_timer *tm, int microsec, int next_substate)
void hdc92x4_device::wait_time(emu_timer *tm, const attotime &delay, int param)
{
- if (TRACE_DELAY) logerror("%s: [%s] Delaying by %4.2f microsecs\n", tag().c_str(), ttsn().c_str(), delay.as_double()*1000000);
+ if (TRACE_DELAY) logerror("%s: [%s] Delaying by %4.2f microsecs\n", tag(), ttsn().c_str(), delay.as_double()*1000000);
tm->adjust(delay);
m_substate = param;
m_state_after_line = UNDEF;
@@ -639,19 +639,19 @@ void hdc92x4_device::wait_line(int line, line_state level, int substate, bool st
if (line == SEEKCOMP_LINE && (seek_complete() == (level==ASSERT_LINE)))
{
- if (TRACE_LINES) logerror("%s: SEEK_COMPLETE line is already %d\n", tag().c_str(), level);
+ if (TRACE_LINES) logerror("%s: SEEK_COMPLETE line is already %d\n", tag(), level);
}
else
{
if (line == INDEX_LINE && (index_hole() == (level==ASSERT_LINE)))
{
- if (TRACE_LINES) logerror("%s: INDEX line is already %d\n", tag().c_str(), level);
+ if (TRACE_LINES) logerror("%s: INDEX line is already %d\n", tag(), level);
}
else
{
if (line == READY_LINE && (drive_ready() == (level==ASSERT_LINE)))
{
- if (TRACE_LINES) logerror("%s: READY line is already %d\n", tag().c_str(), level);
+ if (TRACE_LINES) logerror("%s: READY line is already %d\n", tag(), level);
}
else
{
@@ -698,7 +698,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
{
case READ_ID:
// Implied seek: Enter the READ_ID subprogram.
- if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate READ_ID\n", tag().c_str());
+ if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate READ_ID\n", tag());
// First step: Search the next IDAM, and if found, read the
// ID values into the registers
@@ -716,22 +716,22 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
// If an error occurred (no IDAM found), terminate the command
if ((m_register_r[CHIP_STATUS] & CS_SYNCERR) != 0)
{
- if (TRACE_FAIL) logerror("%s: READ_ID failed to find any IDAM\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: READ_ID failed to find any IDAM\n", tag());
cont = ERROR;
break;
}
if (TRACE_READID)
{
- if (TRACE_SUBSTATES) logerror("%s: substate READ_ID1\n", tag().c_str());
- logerror("%s: DESIRED_CYL = %d; CURRENT_CYL = %d\n", tag().c_str(), desired_cylinder(), current_cylinder());
+ if (TRACE_SUBSTATES) logerror("%s: substate READ_ID1\n", tag());
+ logerror("%s: DESIRED_CYL = %d; CURRENT_CYL = %d\n", tag(), desired_cylinder(), current_cylinder());
}
// The CRC has been updated automatically with each read_one_bit during the live_run.
// We just need to check whether it ended in 0000
if (m_live_state.crc != 0)
{
- if (TRACE_FAIL) logerror("%s: CRC error in sector header\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: CRC error in sector header\n", tag());
set_bits(m_register_r[CHIP_STATUS], CS_CRCERR, true);
cont = ERROR;
break;
@@ -752,7 +752,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
if (wait_seek_complete)
{
// We have to wait for SEEK COMPLETE
- if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: Waiting for SEEK COMPLETE\n", tag().c_str());
+ if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: Waiting for SEEK COMPLETE\n", tag());
wait_line(SEEKCOMP_LINE, ASSERT_LINE, READ_ID_SEEK_COMPLETE, false);
cont = WAIT;
}
@@ -765,7 +765,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
break;
}
- if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag().c_str());
+ if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag());
// STEPDIR = 0 -> towards TRK00
set_bits(m_output2, OUT2_STEPDIR, (m_track_delta>0));
set_bits(m_output2, OUT2_STEPPULSE, true);
@@ -774,7 +774,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
break;
case READ_ID_STEPOFF:
- if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag().c_str());
+ if (TRACE_READID && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag());
set_bits(m_output2, OUT2_STEPPULSE, false);
m_track_delta += (m_track_delta<0)? 1 : -1;
// Return to STEP_ON, check whether there are more steps
@@ -788,7 +788,7 @@ void hdc92x4_device::read_id(int& cont, bool implied_seek, bool wait_seek_comple
break;
default:
- logerror("%s: BUG: Unknown substate %02x in read_id, aborting command\n", tag().c_str(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in read_id, aborting command\n", tag(), m_substate);
cont = ERROR;
}
}
@@ -820,8 +820,8 @@ void hdc92x4_device::verify(int& cont)
// After seeking (or immediately when implied seek has been disabled),
// find the desired sector.
- if (TRACE_VERIFY && TRACE_SUBSTATES) logerror("%s: substate VERIFY\n", tag().c_str());
- if (TRACE_VERIFY) logerror("%s: VERIFY: Find sector CHS=(%d,%d,%d)\n", tag().c_str(),
+ if (TRACE_VERIFY && TRACE_SUBSTATES) logerror("%s: substate VERIFY\n", tag());
+ if (TRACE_VERIFY) logerror("%s: VERIFY: Find sector CHS=(%d,%d,%d)\n", tag(),
desired_cylinder(),
desired_head(),
desired_sector());
@@ -830,7 +830,7 @@ void hdc92x4_device::verify(int& cont)
// (This test is only relevant when we did not have a seek phase before)
if ((m_register_r[CHIP_STATUS] & CS_SYNCERR) != 0)
{
- if (TRACE_FAIL) logerror("%s: VERIFY failed to find any IDAM\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: VERIFY failed to find any IDAM\n", tag());
cont = ERROR;
break;
}
@@ -846,7 +846,7 @@ void hdc92x4_device::verify(int& cont)
&& desired_head() == current_head()
&& desired_sector() == current_sector())
{
- if (TRACE_VERIFY) logerror("%s: Found the desired sector CHS=(%d,%d,%d)\n", tag().c_str(),
+ if (TRACE_VERIFY) logerror("%s: Found the desired sector CHS=(%d,%d,%d)\n", tag(),
desired_cylinder(),
desired_head(),
desired_sector());
@@ -856,7 +856,7 @@ void hdc92x4_device::verify(int& cont)
}
else
{
- if (TRACE_VERIFY && TRACE_DETAIL) logerror("%s: Current CHS=(%d,%d,%d), desired CHS=(%d,%d,%d).\n", tag().c_str(),
+ if (TRACE_VERIFY && TRACE_DETAIL) logerror("%s: Current CHS=(%d,%d,%d), desired CHS=(%d,%d,%d).\n", tag(),
current_cylinder(),
current_head(),
current_sector(),
@@ -875,10 +875,10 @@ void hdc92x4_device::verify(int& cont)
break;
case VERIFY3:
- if (TRACE_VERIFY) logerror("%s: Next IDAM found; total bytes read: %d\n", tag().c_str(), m_live_state.bit_count_total / 16);
+ if (TRACE_VERIFY) logerror("%s: Next IDAM found; total bytes read: %d\n", tag(), m_live_state.bit_count_total / 16);
if ((m_register_r[CHIP_STATUS] & CS_COMPERR) != 0)
{
- if (TRACE_FAIL) logerror("%s: VERIFY failed to find sector CHS=(%d,%d,%d)\n", tag().c_str(), desired_cylinder(), desired_head(), desired_sector());
+ if (TRACE_FAIL) logerror("%s: VERIFY failed to find sector CHS=(%d,%d,%d)\n", tag(), desired_cylinder(), desired_head(), desired_sector());
cont = ERROR;
break;
}
@@ -900,7 +900,7 @@ void hdc92x4_device::verify(int& cont)
break;
default:
- logerror("%s: BUG: Unknown substate %02x in verify, aborting command\n", tag().c_str(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in verify, aborting command\n", tag(), m_substate);
cont = ERROR;
}
}
@@ -931,7 +931,7 @@ void hdc92x4_device::data_transfer(int& cont)
switch (m_substate)
{
case DATA_TRANSFER:
- if (TRACE_TRANSFER && TRACE_SUBSTATES) logerror("%s: substate DATA_TRANSFER (%s)\n", tag().c_str(), m_write? "write" : "read");
+ if (TRACE_TRANSFER && TRACE_SUBSTATES) logerror("%s: substate DATA_TRANSFER (%s)\n", tag(), m_write? "write" : "read");
// Count from 0 again
m_live_state.bit_count_total = 0;
@@ -941,12 +941,12 @@ void hdc92x4_device::data_transfer(int& cont)
if (TRACE_TRANSFER && TRACE_DETAIL)
{
if (m_logical)
- logerror("%s: %s sector CHS=(%d,%d,%d)\n", tag().c_str(), m_write? "Write" : "Read",
+ logerror("%s: %s sector CHS=(%d,%d,%d)\n", tag(), m_write? "Write" : "Read",
desired_cylinder(),
desired_head(),
desired_sector());
else
- logerror("%s: %s next sector on track\n", tag().c_str(), m_write? "Write" : "Read");
+ logerror("%s: %s next sector on track\n", tag(), m_write? "Write" : "Read");
}
if (m_write)
@@ -974,12 +974,12 @@ void hdc92x4_device::data_transfer(int& cont)
// Decrement the retry register (one's complemented value; 0000 = 15)
int retry = 15-((m_register_w[RETRY_COUNT] >> 4)&0x0f);
- if (TRACE_FAIL) logerror("%s: DATA TRANSFER got CRC error in sector data, retries = %d\n", tag().c_str(), retry);
+ if (TRACE_FAIL) logerror("%s: DATA TRANSFER got CRC error in sector data, retries = %d\n", tag(), retry);
m_register_w[RETRY_COUNT] = (m_register_w[RETRY_COUNT] & 0x0f) | ((15-(retry-1))<<4);
if (retry == 0)
{
- if (TRACE_FAIL) logerror("%s: CRC error; no retries left\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: CRC error; no retries left\n", tag());
set_bits(m_register_r[CHIP_STATUS], CS_CRCERR, true);
cont = ERROR;
}
@@ -997,7 +997,7 @@ void hdc92x4_device::data_transfer(int& cont)
}
else
{
- if (TRACE_TRANSFER) logerror("%s: Sector successfully read (count=%d)\n", tag().c_str(), m_register_w[SECTOR_COUNT]-1);
+ if (TRACE_TRANSFER) logerror("%s: Sector successfully read (count=%d)\n", tag(), m_register_w[SECTOR_COUNT]-1);
// Update the DMA registers for multi-sector operations
if (m_multi_sector)
@@ -1011,7 +1011,7 @@ void hdc92x4_device::data_transfer(int& cont)
m_register_w[DMA23_16] = m_register_r[DMA23_16] = (dma_address & 0xff0000) >> 16;
m_register_w[DMA15_8] = m_register_r[DMA15_8] = (dma_address & 0x00ff00) >> 8;
m_register_w[DMA7_0] = m_register_r[DMA7_0] = (dma_address & 0x0000ff);
- if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag().c_str(), dma_address);
+ if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag(), dma_address);
}
// Decrement the count
@@ -1040,7 +1040,7 @@ void hdc92x4_device::data_transfer(int& cont)
break;
case DATA_TRANSFER_WRITE:
- if (TRACE_TRANSFER) logerror("%s: Sector successfully written (count=%d)\n", tag().c_str(), m_register_w[SECTOR_COUNT]-1);
+ if (TRACE_TRANSFER) logerror("%s: Sector successfully written (count=%d)\n", tag(), m_register_w[SECTOR_COUNT]-1);
// Update the DMA registers for multi-sector operations
if (m_multi_sector)
@@ -1054,7 +1054,7 @@ void hdc92x4_device::data_transfer(int& cont)
m_register_w[DMA23_16] = m_register_r[DMA23_16] = (dma_address & 0xff0000) >> 16;
m_register_w[DMA15_8] = m_register_r[DMA15_8] = (dma_address & 0x00ff00) >> 8;
m_register_w[DMA7_0] = m_register_r[DMA7_0] = (dma_address & 0x0000ff);
- if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag().c_str(), dma_address);
+ if (TRACE_TRANSFER) logerror("%s: New DMA address = %06x\n", tag(), dma_address);
}
// Decrement the count
@@ -1072,7 +1072,7 @@ void hdc92x4_device::data_transfer(int& cont)
break;
default:
- logerror("%s: BUG: Unknown substate %02x in data_transfer, aborting command\n", tag().c_str(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in data_transfer, aborting command\n", tag(), m_substate);
cont = ERROR;
}
}
@@ -1105,7 +1105,7 @@ void hdc92x4_device::data_transfer(int& cont)
*/
void hdc92x4_device::reset_controller()
{
- logerror("%s: RESET command\n", tag().c_str());
+ logerror("%s: RESET command\n", tag());
device_reset();
}
@@ -1122,7 +1122,7 @@ void hdc92x4_device::reset_controller()
*/
void hdc92x4_device::drive_deselect()
{
- if (TRACE_SELECT) logerror("%s: DESELECT command\n", tag().c_str());
+ if (TRACE_SELECT) logerror("%s: DESELECT command\n", tag());
m_selected_drive_number = NODRIVE;
m_output1 = 0x00;
set_command_done(TC_SUCCESS);
@@ -1151,7 +1151,7 @@ void hdc92x4_device::restore_drive()
if (m_substate == UNDEF)
{
- if (TRACE_RESTORE) logerror("%s: RESTORE command %02x\n", tag().c_str(), current_command());
+ if (TRACE_RESTORE) logerror("%s: RESTORE command %02x\n", tag(), current_command());
m_seek_count = 0;
m_substate = RESTORE_CHECK;
}
@@ -1164,7 +1164,7 @@ void hdc92x4_device::restore_drive()
// Track 0 has not been reached yet
if (!drive_ready())
{
- if (TRACE_RESTORE) logerror("%s: restore command: Drive not ready\n", tag().c_str());
+ if (TRACE_RESTORE) logerror("%s: restore command: Drive not ready\n", tag());
// Does not look like a success, but this takes into account
// that if a drive is not connected we do not want an error message
cont = SUCCESS;
@@ -1179,7 +1179,7 @@ void hdc92x4_device::restore_drive()
// When we have buffered steps, the seek limit will be reached
// before TRK00 is asserted. In that case we have to wait for
// SEEK_COMPLETE. We also wait as soon as TRK00 is asserted.
- if (TRACE_RESTORE) logerror("%s: restore using buffered steps\n", tag().c_str());
+ if (TRACE_RESTORE) logerror("%s: restore using buffered steps\n", tag());
wait_line(SEEKCOMP_LINE, ASSERT_LINE, SEEK_COMPLETE, false);
cont = WAIT;
}
@@ -1194,7 +1194,7 @@ void hdc92x4_device::restore_drive()
break;
case STEP_ON:
- if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_ON\n", tag().c_str(), ttsn().c_str());
+ if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_ON\n", tag(), ttsn().c_str());
// Increase step count
m_seek_count++;
@@ -1209,7 +1209,7 @@ void hdc92x4_device::restore_drive()
break;
case STEP_OFF:
- if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_OFF\n", tag().c_str(), ttsn().c_str());
+ if (TRACE_RESTORE && TRACE_SUBSTATES) logerror("%s: [%s] substate STEP_OFF\n", tag(), ttsn().c_str());
set_bits(m_output2, OUT2_STEPPULSE, false);
wait_time(m_timer, step_time(), RESTORE_CHECK);
cont = WAIT;
@@ -1219,7 +1219,7 @@ void hdc92x4_device::restore_drive()
// If TRK00 is not set, the drive failed to reach it.
if (!on_track00())
{
- if (TRACE_FAIL) logerror("%s: restore command: failed to reach track 00\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: restore command: failed to reach track 00\n", tag());
set_command_done(TC_VRFYERR);
cont = ERROR;
}
@@ -1250,7 +1250,7 @@ void hdc92x4_device::step_drive()
if (m_substate == UNDEF)
{
- if (TRACE_STEP) logerror("%s: STEP IN/OUT command %02x\n", tag().c_str(), current_command());
+ if (TRACE_STEP) logerror("%s: STEP IN/OUT command %02x\n", tag(), current_command());
m_substate = STEP_ON;
}
@@ -1259,7 +1259,7 @@ void hdc92x4_device::step_drive()
switch (m_substate)
{
case STEP_ON:
- if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag().c_str());
+ if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_ON\n", tag());
// STEPDIR = 0 -> towards TRK00
set_bits(m_output2, OUT2_STEPDIR, (current_command() & 0x02)==0);
@@ -1271,7 +1271,7 @@ void hdc92x4_device::step_drive()
break;
case STEP_OFF:
- if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag().c_str());
+ if (TRACE_STEP && TRACE_SUBSTATES) logerror("%s: substate STEP_OFF\n", tag());
set_bits(m_output2, OUT2_STEPPULSE, false);
wait_time(m_timer, step_time(), ((current_command() & 0x01)!=0)? WAIT_SEEK_COMPLETE : DONE);
cont = WAIT;
@@ -1296,7 +1296,7 @@ void hdc92x4_device::step_drive()
*/
void hdc92x4_device::tape_backup()
{
- logerror("%s: TAPE BACKUP command %02x not implemented\n", tag().c_str(), current_command());
+ logerror("%s: TAPE BACKUP command %02x not implemented\n", tag(), current_command());
set_command_done(TC_SUCCESS);
}
@@ -1322,7 +1322,7 @@ void hdc92x4_device::poll_drives()
UINT8 drivebit;
if (m_substate == UNDEF)
{
- logerror("%s: POLL DRIVES command %02x\n", tag().c_str(), current_command());
+ logerror("%s: POLL DRIVES command %02x\n", tag(), current_command());
m_substate = POLL1;
m_selected_drive_number = 0;
// If there is no selection, do not enter the loop
@@ -1344,7 +1344,7 @@ void hdc92x4_device::poll_drives()
m_register_r[CHIP_STATUS] = (m_register_r[CHIP_STATUS] & 0xfc) | m_selected_drive_number;
m_output1 = (drivebit << 4) | (m_register_w[RETRY_COUNT]&0x0f);
- if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag().c_str(), m_output1);
+ if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag(), m_output1);
wait_time(m_timer, 1, POLL2); // Wait for 1 usec
cont = WAIT;
}
@@ -1419,7 +1419,7 @@ void hdc92x4_device::drive_select()
head_load_delay = head_load_delay_enable? m_register_w[DATA] * head_load_timer_increment[m_selected_drive_type] : 0;
if (fm_mode()) head_load_delay <<= 1;
- if (TRACE_SELECT) logerror("%s: DRIVE SELECT command (%02x): head load delay=%d, type=%d, drive=%d, pout=%02x, step_rate=%d\n", tag().c_str(), current_command(), head_load_delay, m_selected_drive_type, driveparm&3, m_register_w[RETRY_COUNT]&0x0f, pulse_width() + step_time());
+ if (TRACE_SELECT) logerror("%s: DRIVE SELECT command (%02x): head load delay=%d, type=%d, drive=%d, pout=%02x, step_rate=%d\n", tag(), current_command(), head_load_delay, m_selected_drive_type, driveparm&3, m_register_w[RETRY_COUNT]&0x0f, pulse_width() + step_time());
// Copy the DMA registers to registers CURRENT_HEAD, CURRENT_CYLINDER,
// and CURRENT_IDENT. This is required during formatting ([1], p. 14)
@@ -1433,7 +1433,7 @@ void hdc92x4_device::drive_select()
m_output1 = (m_selected_drive_number != NODRIVE)? (0x10 << m_selected_drive_number) : 0;
m_output1 |= (m_register_w[RETRY_COUNT]&0x0f);
- if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag().c_str(), m_output1);
+ if (TRACE_AUXBUS) logerror("%s: Setting OUTPUT1 to %02x\n", tag(), m_output1);
m_substate = (head_load_delay>0)? HEAD_DELAY : DONE;
}
@@ -1464,12 +1464,12 @@ void hdc92x4_device::drive_select()
void hdc92x4_device::set_register_pointer()
{
m_register_pointer = current_command() & 0xf;
- if (TRACE_SETPTR) logerror("%s: SET REGISTER POINTER command; start reg=%d\n", tag().c_str(), m_register_pointer);
+ if (TRACE_SETPTR) logerror("%s: SET REGISTER POINTER command; start reg=%d\n", tag(), m_register_pointer);
// The specification does not say anything about the effect of setting an
// invalid value (only "care should be taken")
if (m_register_pointer > 10)
{
- logerror("%s: set register pointer: Invalid register number: %d. Setting to 10.\n", tag().c_str(), m_register_pointer);
+ logerror("%s: set register pointer: Invalid register number: %d. Setting to 10.\n", tag(), m_register_pointer);
m_register_pointer = 10;
}
set_command_done(TC_SUCCESS);
@@ -1495,7 +1495,7 @@ void hdc92x4_device::seek_read_id()
if (m_substate == UNDEF)
{
// Command init
- if (TRACE_READ) logerror("%s: SEEK / READ ID command %02x, CHS=(%d,%d,%d)\n", tag().c_str(), current_command(), desired_cylinder(), desired_head(), desired_sector());
+ if (TRACE_READ) logerror("%s: SEEK / READ ID command %02x, CHS=(%d,%d,%d)\n", tag(), current_command(), desired_cylinder(), desired_head(), desired_sector());
m_substate = READ_ID;
}
@@ -1523,7 +1523,7 @@ void hdc92x4_device::seek_read_id()
cont = SUCCESS;
break;
default:
- logerror("%s: BUG: Unknown substate %02x in seek_read_id, aborting command\n", tag().c_str(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in seek_read_id, aborting command\n", tag(), m_substate);
set_command_done(TC_DATAERR);
cont = ERROR;
}
@@ -1560,7 +1560,7 @@ void hdc92x4_device::read_sectors()
if (m_substate == UNDEF)
{
// Command init
- if (TRACE_READ) logerror("%s: READ SECTORS %s command %02x, CHS=(%d,%d,%d)\n", tag().c_str(), m_logical? "LOGICAL": "PHYSICAL", current_command(), desired_cylinder(), desired_head(), desired_sector());
+ if (TRACE_READ) logerror("%s: READ SECTORS %s command %02x, CHS=(%d,%d,%d)\n", tag(), m_logical? "LOGICAL": "PHYSICAL", current_command(), desired_cylinder(), desired_head(), desired_sector());
m_retry_save = m_register_w[RETRY_COUNT];
m_multi_sector = (m_register_w[SECTOR_COUNT] != 1);
m_write = false;
@@ -1586,7 +1586,7 @@ void hdc92x4_device::read_sectors()
data_transfer(cont);
break;
default:
- logerror("%s: BUG: Unknown substate %02x in read_sectors, aborting command\n", tag().c_str(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in read_sectors, aborting command\n", tag(), m_substate);
set_command_done(TC_DATAERR);
cont = ERROR;
}
@@ -1612,7 +1612,7 @@ void hdc92x4_device::read_track()
{
if (m_substate == UNDEF)
{
- if (TRACE_READTRACK) logerror("%s: READ TRACK command %02x, head = %d\n", tag().c_str(), current_command(), desired_head());
+ if (TRACE_READTRACK) logerror("%s: READ TRACK command %02x, head = %d\n", tag(), current_command(), desired_head());
dma_address_out(m_register_w[DMA23_16], m_register_w[DMA15_8], m_register_w[DMA7_0]);
m_transfer_enabled = (current_command() & 1)!=0;
}
@@ -1623,7 +1623,7 @@ void hdc92x4_device::read_track()
switch (m_substate)
{
case WAITINDEX0:
- if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - waiting for index hole\n", tag().c_str());
+ if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - waiting for index hole\n", tag());
if (!index_hole())
{
m_substate = WAITINDEX1;
@@ -1632,7 +1632,7 @@ void hdc92x4_device::read_track()
else
{
// We're above the index hole; wait for the index line going down
- if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Index hole just passing by ... waiting for next\n", tag().c_str());
+ if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Index hole just passing by ... waiting for next\n", tag());
wait_line(INDEX_LINE, ASSERT_LINE, WAITINDEX1, false);
cont = WAIT;
}
@@ -1643,12 +1643,12 @@ void hdc92x4_device::read_track()
cont = WAIT;
break;
case TRACKSTART:
- if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - index hole arrived\n", tag().c_str());
+ if (TRACE_READTRACK && TRACE_DETAIL) logerror("%s: Read track - index hole arrived\n", tag());
live_start(READ_TRACK);
cont = WAIT;
break;
case TRACKDONE:
- if (TRACE_READTRACK && TRACE_SUBSTATES) logerror("%s: Track reading done\n", tag().c_str());
+ if (TRACE_READTRACK && TRACE_SUBSTATES) logerror("%s: Track reading done\n", tag());
cont = SUCCESS;
m_out_dmarq(CLEAR_LINE);
m_out_dip(CLEAR_LINE);
@@ -1720,7 +1720,7 @@ void hdc92x4_device::format_track()
{
if (m_substate == UNDEF)
{
- if (TRACE_FORMAT) logerror("%s: FORMAT TRACK command %02x, head = %d\n", tag().c_str(), current_command(), desired_head());
+ if (TRACE_FORMAT) logerror("%s: FORMAT TRACK command %02x, head = %d\n", tag(), current_command(), desired_head());
m_substate = WAITINDEX0;
m_deleted = (current_command() & 0x10)!=0;
m_reduced_write_current = (current_command() & 0x08)!=0;
@@ -1737,13 +1737,13 @@ void hdc92x4_device::format_track()
if (TRACE_FORMAT && TRACE_DETAIL)
{
- logerror("%s: GAP0 length = %d\n", tag().c_str(), m_gap0_size);
- logerror("%s: GAP1 length = %d\n", tag().c_str(), m_gap1_size);
- logerror("%s: GAP2 length = %d\n", tag().c_str(), m_gap2_size);
- logerror("%s: GAP3 length = %d\n", tag().c_str(), m_gap3_size);
- logerror("%s: Sync size = %d\n", tag().c_str(), m_sync_size);
- logerror("%s: Sector count = %d\n", tag().c_str(), m_sector_count);
- logerror("%s: Sector size = %d\n", tag().c_str(), m_sector_size);
+ logerror("%s: GAP0 length = %d\n", tag(), m_gap0_size);
+ logerror("%s: GAP1 length = %d\n", tag(), m_gap1_size);
+ logerror("%s: GAP2 length = %d\n", tag(), m_gap2_size);
+ logerror("%s: GAP3 length = %d\n", tag(), m_gap3_size);
+ logerror("%s: Sync size = %d\n", tag(), m_sync_size);
+ logerror("%s: Sector count = %d\n", tag(), m_sector_count);
+ logerror("%s: Sector size = %d\n", tag(), m_sector_size);
}
dma_address_out(m_register_r[CURRENT_IDENT], m_register_r[CURRENT_CYLINDER], m_register_r[CURRENT_HEAD]);
@@ -1755,7 +1755,7 @@ void hdc92x4_device::format_track()
switch (m_substate)
{
case WAITINDEX0:
- if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track; looking for track start\n", tag().c_str());
+ if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track; looking for track start\n", tag());
if (!index_hole())
{
m_substate = WAITINDEX1;
@@ -1764,24 +1764,24 @@ void hdc92x4_device::format_track()
else
{
// We're above the index hole right now, so wait for the line going down
- if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Index hole just passing by ... \n", tag().c_str());
+ if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Index hole just passing by ... \n", tag());
wait_line(INDEX_LINE, CLEAR_LINE, WAITINDEX1, false);
cont = WAIT;
}
break;
case WAITINDEX1:
// Waiting for the next rising edge
- if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Waiting for next index hole\n", tag().c_str());
+ if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Waiting for next index hole\n", tag());
wait_line(INDEX_LINE, ASSERT_LINE, TRACKSTART, false);
cont = WAIT;
break;
case TRACKSTART:
- if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track - index hole arrived\n", tag().c_str());
+ if (TRACE_FORMAT && TRACE_DETAIL) logerror("%s: Format track - index hole arrived\n", tag());
live_start(FORMAT_TRACK);
cont = WAIT;
break;
case TRACKDONE:
- if (FORMAT_TRACK && TRACE_SUBSTATES) logerror("%s: Track writing done\n", tag().c_str());
+ if (FORMAT_TRACK && TRACE_SUBSTATES) logerror("%s: Track writing done\n", tag());
cont = SUCCESS;
break;
}
@@ -1817,7 +1817,7 @@ void hdc92x4_device::write_sectors()
if (m_substate == UNDEF)
{
- if (TRACE_WRITE) logerror("%s: WRITE SECTORS %s command %02x, CHS=(%d,%d,%d)\n", tag().c_str(), m_logical? "LOGICAL" : "PHYSICAL", current_command(), desired_cylinder(), desired_head(), desired_sector());
+ if (TRACE_WRITE) logerror("%s: WRITE SECTORS %s command %02x, CHS=(%d,%d,%d)\n", tag(), m_logical? "LOGICAL" : "PHYSICAL", current_command(), desired_cylinder(), desired_head(), desired_sector());
m_multi_sector = (m_register_w[SECTOR_COUNT] != 1);
m_substate = READ_ID;
@@ -1869,7 +1869,7 @@ void hdc92x4_device::write_sectors()
data_transfer(cont);
break;
default:
- logerror("%s: BUG: Unknown substate %02x in write_sectors, aborting command\n", tag().c_str(), m_substate);
+ logerror("%s: BUG: Unknown substate %02x in write_sectors, aborting command\n", tag(), m_substate);
set_command_done(TC_DATAERR);
cont = ERROR;
}
@@ -1948,7 +1948,7 @@ bool hdc92x4_device::found_mark(int state)
*/
void hdc92x4_device::live_start(int state)
{
- if (TRACE_LIVE) logerror("%s: [%s] Live start substate=%02x\n", tag().c_str(), ttsn().c_str(), state);
+ if (TRACE_LIVE) logerror("%s: [%s] Live start substate=%02x\n", tag(), ttsn().c_str(), state);
m_live_state.time = machine().time();
m_live_state.state = state;
m_live_state.next_state = -1;
@@ -1969,7 +1969,7 @@ void hdc92x4_device::live_start(int state)
live_run();
m_last_live_state = UNDEF;
- if (TRACE_LIVE) logerror("%s: [%s] Live start end\n", tag().c_str(), ttsn().c_str()); // delete
+ if (TRACE_LIVE) logerror("%s: [%s] Live start end\n", tag(), ttsn().c_str()); // delete
}
void hdc92x4_device::live_run()
@@ -1996,9 +1996,9 @@ void hdc92x4_device::live_run_until(attotime limit)
if (TRACE_LIVE)
{
if (limit == attotime::never)
- logerror("%s: [%s live] live_run, live_state=%02x, mode=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
+ logerror("%s: [%s live] live_run, live_state=%02x, mode=%s\n", tag(), tts(m_live_state.time).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
else
- logerror("%s: [%s live] live_run until %s, live_state=%02x, mode=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
+ logerror("%s: [%s live] live_run until %s, live_state=%02x, mode=%s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
}
if (limit == attotime::never)
@@ -2030,7 +2030,7 @@ void hdc92x4_device::live_run_until(attotime limit)
if (TRACE_LIVE && m_last_live_state != SEARCH_IDAM)
{
- logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag().c_str(),tts(m_live_state.time).c_str(), tts(limit).c_str());
+ logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag(),tts(m_live_state.time).c_str(), tts(limit).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2039,11 +2039,11 @@ void hdc92x4_device::live_run_until(attotime limit)
if (read_one_bit(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag(), tts(m_live_state.time).c_str());
return;
}
// logerror("%s: SEARCH_IDAM\n", tts(m_live_state.time).c_str());
- if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
+ if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
get_data_from_encoding(m_live_state.shift_reg), m_live_state.bit_counter);
// [1] p. 9: The ID field sync mark must be found within 33,792 byte times
@@ -2062,7 +2062,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// MFM case
if (m_live_state.shift_reg == 0x4489)
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
m_live_state.crc = 0x443b;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2075,7 +2075,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// FM case
if (m_live_state.shift_reg == 0xf57e)
{
- if (TRACE_LIVE) logerror("%s: SEARCH_IDAM: IDAM found\n", tag().c_str());
+ if (TRACE_LIVE) logerror("%s: SEARCH_IDAM: IDAM found\n", tag());
m_live_state.crc = 0xef21;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2098,14 +2098,14 @@ void hdc92x4_device::live_run_until(attotime limit)
if (TRACE_LIVE && m_last_live_state != READ_TWO_MORE_A1_IDAM)
{
- logerror("%s: [%s live] READ_TWO_MORE_A1\n", tag().c_str(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_TWO_MORE_A1\n", tag(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
// Beyond time limit?
if (read_one_bit(limit)) return;
- if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
+ if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
get_data_from_encoding(m_live_state.shift_reg), m_live_state.bit_counter);
if (m_live_state.bit_count_total > 33792*16)
@@ -2127,12 +2127,12 @@ void hdc92x4_device::live_run_until(attotime limit)
m_live_state.state = SEARCH_IDAM;
}
else
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
// Continue
break;
}
- if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag().c_str(),tts(m_live_state.time).c_str(), m_live_state.data_reg);
+ if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag(),tts(m_live_state.time).c_str(), m_live_state.data_reg);
// Check for ident field (fe, ff, fd, fc)
if ((m_live_state.data_reg & 0xfc) != 0xfc)
@@ -2141,9 +2141,9 @@ void hdc92x4_device::live_run_until(attotime limit)
if (TRACE_LIVE)
{
if (m_live_state.data_reg == 0xf8 || m_live_state.data_reg == 0xfb)
- logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag().c_str(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag(), tts(m_live_state.time).c_str());
else
- logerror("%s: [%s live] Missing ident data after A1A1A1, and it was not DAM; format corrupt?\n", tag().c_str(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] Missing ident data after A1A1A1, and it was not DAM; format corrupt?\n", tag(), tts(m_live_state.time).c_str());
}
m_live_state.state = SEARCH_IDAM;
break;
@@ -2159,7 +2159,7 @@ void hdc92x4_device::live_run_until(attotime limit)
case READ_ID_FIELDS_INTO_REGS:
if (TRACE_LIVE && m_last_live_state != READ_ID_FIELDS_INTO_REGS)
{
- logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag().c_str(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2172,7 +2172,7 @@ void hdc92x4_device::live_run_until(attotime limit)
slot = (m_live_state.bit_counter >> 4)-1;
- if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag().c_str(), slot, m_live_state.data_reg, m_live_state.crc);
+ if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag(), slot, m_live_state.data_reg, m_live_state.crc);
// The id_field is an array of indexes into the chip registers.
// Thus we get the values properly assigned to the registers.
@@ -2198,7 +2198,7 @@ void hdc92x4_device::live_run_until(attotime limit)
case SEARCH_DAM:
if (TRACE_LIVE && m_last_live_state != SEARCH_DAM)
{
- logerror("%s: [%s live] SEARCH_DAM\n", tag().c_str(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] SEARCH_DAM\n", tag(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2207,21 +2207,21 @@ void hdc92x4_device::live_run_until(attotime limit)
if(read_one_bit(limit))
return;
- if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
+ if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
get_data_from_encoding(m_live_state.shift_reg), m_live_state.bit_counter);
if (!fm_mode())
{ // MFM
if(m_live_state.bit_counter > 43*16)
{
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
if (m_live_state.bit_counter >= 28*16 && m_live_state.shift_reg == 0x4489)
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
m_live_state.crc = 0x443b;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2232,14 +2232,14 @@ void hdc92x4_device::live_run_until(attotime limit)
{ // FM
if (m_live_state.bit_counter > 23*16)
{
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
if (m_live_state.bit_counter >= 11*16 && (m_live_state.shift_reg == 0xf56a || m_live_state.shift_reg == 0xf56b ||
m_live_state.shift_reg == 0xf56e || m_live_state.shift_reg == 0xf56f)) {
- if (TRACE_LIVE) logerror("%s: SEARCH_DAM: found DAM = %04x\n", tag().c_str(), m_live_state.shift_reg);
+ if (TRACE_LIVE) logerror("%s: SEARCH_DAM: found DAM = %04x\n", tag(), m_live_state.shift_reg);
m_live_state.crc =
m_live_state.shift_reg == 0xf56a ? 0x8fe7 :
m_live_state.shift_reg == 0xf56b ? 0x9fc6 :
@@ -2255,14 +2255,14 @@ void hdc92x4_device::live_run_until(attotime limit)
case READ_TWO_MORE_A1_DAM: {
if (TRACE_LIVE && m_last_live_state != READ_TWO_MORE_A1_DAM)
{
- logerror("%s: [%s live] READ_TWO_MORE_A1_DAM\n", tag().c_str(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_TWO_MORE_A1_DAM\n", tag(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
if(read_one_bit(limit))
return;
- if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
+ if (TRACE_SHIFT) logerror("%s: [%s live] shift = %04x data=%02x c=%d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg,
get_data_from_encoding(m_live_state.shift_reg), m_live_state.bit_counter);
// Repeat until we have collected 16 bits
@@ -2279,23 +2279,23 @@ void hdc92x4_device::live_run_until(attotime limit)
return;
}
else
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
// Continue
break;
}
- if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag().c_str(),tts(m_live_state.time).c_str(), m_live_state.data_reg);
+ if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X\n", tag(),tts(m_live_state.time).c_str(), m_live_state.data_reg);
if ((m_live_state.data_reg & 0xff) == 0xf8)
{
- if (TRACE_LIVE) logerror("%s: Found deleted data mark F8 after DAM sync\n", tag().c_str());
+ if (TRACE_LIVE) logerror("%s: Found deleted data mark F8 after DAM sync\n", tag());
set_bits(m_register_r[CHIP_STATUS], CS_DELDATA, true);
}
else
{
if ((m_live_state.data_reg & 0xff) != 0xfb)
{
- if (TRACE_FAIL) logerror("%s: Missing FB/F8 data mark after DAM sync\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: Missing FB/F8 data mark after DAM sync\n", tag());
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
@@ -2306,7 +2306,7 @@ void hdc92x4_device::live_run_until(attotime limit)
break;
}
case SEARCH_DAM_FAILED:
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
m_live_state.state = IDLE;
return;
@@ -2314,7 +2314,7 @@ void hdc92x4_device::live_run_until(attotime limit)
{
if (TRACE_LIVE && m_last_live_state != READ_SECTOR_DATA)
{
- logerror("%s: [%s live] READ_SECTOR_DATA\n", tag().c_str(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_SECTOR_DATA\n", tag(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2339,7 +2339,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// Repeat until we have collected 16 bits
if (m_live_state.bit_counter & 15) break;
- if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X, CRC=%04x\n", tag().c_str(),tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.crc);
+ if (TRACE_LIVE) logerror("%s: [%s live] Found data value %02X, CRC=%04x\n", tag(),tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.crc);
int slot = (m_live_state.bit_counter >> 4)-1;
if (slot < calc_sector_size())
@@ -2360,7 +2360,7 @@ void hdc92x4_device::live_run_until(attotime limit)
}
else
{
- if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag().c_str(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag(),tts(m_live_state.time).c_str());
wait_for_realtime(IDLE);
}
return;
@@ -2372,14 +2372,14 @@ void hdc92x4_device::live_run_until(attotime limit)
case READ_SECTOR_DATA_CONT:
if (TRACE_LIVE && m_last_live_state != READ_SECTOR_DATA_CONT)
{
- logerror("%s: [%s live] READ_SECTOR_DATA_CONT\n", tag().c_str(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_SECTOR_DATA_CONT\n", tag(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
// Did the system CPU send the DMA ACK in the meantime?
if ((m_register_r[INT_STATUS] & ST_OVRUN)!=0)
{
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_live_state.state = IDLE;
return;
@@ -2418,13 +2418,13 @@ void hdc92x4_device::live_run_until(attotime limit)
// 5. Write the CRC bytes
if (TRACE_LIVE)
- logerror("%s: [%s live] WRITE_DAM_AND_SECTOR\n", tag().c_str(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] WRITE_DAM_AND_SECTOR\n", tag(), tts(m_live_state.time).c_str());
skip_on_track(m_gap2_size, WRITE_DAM_SYNC);
break;
case WRITE_DAM_SYNC:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag());
// Clear the overrun/underrun flag
set_bits(m_register_r[INT_STATUS], ST_OVRUN, false);
@@ -2432,12 +2432,12 @@ void hdc92x4_device::live_run_until(attotime limit)
break;
case WRITE_A1:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write three A1\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write three A1\n", tag());
write_on_track(0x4489, 3, WRITE_DATAMARK);
break;
case WRITE_DATAMARK:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark and sector contents\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark and sector contents\n", tag());
if (fm_mode())
{
// Init the CRC for the DAM and sector
@@ -2515,7 +2515,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// byte in two iterations to get both
if (m_live_state.byte_counter > 0)
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag());
m_live_state.byte_counter--;
write_on_track(encode((m_live_state.crc >> 8) & 0xff), 1, WRITE_DATA_CRC);
}
@@ -2529,7 +2529,7 @@ void hdc92x4_device::live_run_until(attotime limit)
case WRITE_DONE:
if (m_substate == DATA_TRANSFER_WRITE)
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag());
m_pll.stop_writing(m_floppy, m_live_state.time);
m_live_state.state = IDLE;
return;
@@ -2560,19 +2560,19 @@ void hdc92x4_device::live_run_until(attotime limit)
// ==================================================
case FORMAT_TRACK:
- if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag().c_str());
+ if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag());
m_live_state.state = WRITE_GAP0;
m_pll.start_writing(m_live_state.time);
break;
case WRITE_GAP0:
// GAP0 length is in DMA7_0 (negated, 2s comp)
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP0\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP0\n", tag());
write_on_track(encode(fm_mode()? 0xff : 0x4e), m_gap0_size, WRITE_IXAM_SYNC);
break;
case WRITE_IXAM_SYNC:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM sync\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM sync\n", tag());
write_on_track(encode(0x00), m_sync_size, WRITE_IXAM);
break;
@@ -2580,7 +2580,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// FM: FC with clock D7 = 1111 -111 -111 1010
// MFM: C2 = 11000010
// 0101 0010 -010 0100
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IXAM\n", tag());
if (fm_mode())
write_on_track(0xf77a, 1, WRITE_GAP1);
else
@@ -2595,7 +2595,7 @@ void hdc92x4_device::live_run_until(attotime limit)
case WRITE_GAP1:
// GAP1 length is in DMA15_8
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP1\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP1\n", tag());
write_on_track(encode(fm_mode()? 0xff : 0x4e), m_gap1_size, WRITE_IDAM_SYNC);
break;
@@ -2604,7 +2604,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// We assume it reads the bytes and writes them directly on the disk
case WRITE_IDAM_SYNC:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM sync\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM sync\n", tag());
write_on_track(encode(0x00), m_sync_size, WRITE_IDAM);
break;
@@ -2613,7 +2613,7 @@ void hdc92x4_device::live_run_until(attotime limit)
set_bits(m_register_r[INT_STATUS], ST_OVRUN, true);
m_out_dmarq(ASSERT_LINE);
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM and header\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing IDAM and header\n", tag());
if (fm_mode())
{
write_on_track(0xf57e, 1, WRITE_HEADER);
@@ -2657,7 +2657,7 @@ void hdc92x4_device::live_run_until(attotime limit)
if (m_live_state.byte_counter > 0)
{
UINT8 crct = (m_live_state.crc >> 8) & 0xff;
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC byte %02x\n", tag().c_str(), crct);
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC byte %02x\n", tag(), crct);
m_live_state.byte_counter--;
write_on_track(encode(crct), 1, WRITE_HEADER_CRC);
}
@@ -2667,13 +2667,13 @@ void hdc92x4_device::live_run_until(attotime limit)
break;
case WRITE_GAP2:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP2\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP2\n", tag());
write_on_track(encode(fm_mode()? 0xff : 0x4e), m_gap2_size, WRITE_DAM_SYNC);
break;
case WRITE_GAP3:
m_sector_count--;
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP3\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Writing GAP3\n", tag());
write_on_track(encode(fm_mode()? 0xff : 0x4e), m_gap3_size, (m_sector_count>0)? WRITE_IDAM_SYNC : WRITE_GAP4);
break;
@@ -2682,7 +2682,7 @@ void hdc92x4_device::live_run_until(attotime limit)
wait_line(INDEX_LINE, ASSERT_LINE, TRACKDONE, true);
if (TRACE_WRITE && TRACE_DETAIL && m_last_live_state != WRITE_GAP4)
{
- logerror("%s: Writing GAP4\n", tag().c_str());
+ logerror("%s: Writing GAP4\n", tag());
m_last_live_state = WRITE_GAP4;
}
// Write a single byte; when the index hole shows up, the live run will be aborted
@@ -2697,7 +2697,7 @@ void hdc92x4_device::live_run_until(attotime limit)
// Quite simple. Read the next ID fields, then the sector contents.
// Continue until the next index hole shows up (live_abort).
case READ_TRACK:
- if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag().c_str());
+ if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag());
m_live_state.state = READ_TRACK_ID;
break;
@@ -2711,12 +2711,12 @@ void hdc92x4_device::live_run_until(attotime limit)
case READ_TRACK_ID_DONE:
if ((m_register_r[INT_STATUS] & ST_OVRUN)!=0)
{
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_live_state.state = IDLE;
return;
}
- if (TRACE_LIVE) logerror("%s: READ_TRACK1\n", tag().c_str());
+ if (TRACE_LIVE) logerror("%s: READ_TRACK1\n", tag());
m_out_dip(ASSERT_LINE);
@@ -2737,14 +2737,14 @@ void hdc92x4_device::live_run_until(attotime limit)
// The pause is implemented by doing dummy reads on the floppy
if (read_one_bit(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str());
return;
}
// Repeat until we have collected 16 bits
if ((m_live_state.bit_counter & 15)==0)
{
- if (TRACE_READ && TRACE_DETAIL) logerror("%s: [%s live] Read byte %02x, repeat = %d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.repeat);
+ if (TRACE_READ && TRACE_DETAIL) logerror("%s: [%s live] Read byte %02x, repeat = %d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.repeat);
wait_for_realtime(READ_TRACK_NEXT_BYTE);
return;
}
@@ -2790,14 +2790,14 @@ void hdc92x4_device::live_run_until(attotime limit)
break;
case NO_DMA_ACK:
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer underrun\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer underrun\n", tag());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_pll.stop_writing(m_floppy, m_live_state.time);
m_live_state.state = IDLE;
return;
default:
- logerror("%s: Unknown live state: %02x\n", tag().c_str(), m_live_state.state);
+ logerror("%s: Unknown live state: %02x\n", tag(), m_live_state.state);
m_last_live_state = m_live_state.state;
return;
}
@@ -2820,7 +2820,7 @@ void hdc92x4_device::live_run_until(attotime limit)
void hdc92x4_device::live_run_hd_until(attotime limit)
{
int slot = 0;
- if (TRACE_LIVE) logerror("%s: live_run_hd\n", tag().c_str());
+ if (TRACE_LIVE) logerror("%s: live_run_hd\n", tag());
if (m_live_state.state == IDLE || m_live_state.next_state != -1)
return;
@@ -2828,16 +2828,16 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (TRACE_LIVE)
{
if (limit == attotime::never)
- logerror("%s: [%s live] live_run_hd, live_state=%02x, mode=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
+ logerror("%s: [%s live] live_run_hd, live_state=%02x, mode=%s\n", tag(), tts(m_live_state.time).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
else
- logerror("%s: [%s live] live_run_hd until %s, live_state=%02x, mode=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
+ logerror("%s: [%s live] live_run_hd until %s, live_state=%02x, mode=%s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str(), m_live_state.state, fm_mode()? "FM":"MFM");
}
// We did not specify an upper time bound, so we take the next index pulse
if (limit == attotime::never && m_harddisk != nullptr)
{
limit = m_harddisk->track_end_time();
- if (TRACE_LIVE) logerror("%s: [%s live] live_run_hd new limit %s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] live_run_hd new limit %s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str());
}
while (true)
@@ -2847,7 +2847,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case SEARCH_IDAM:
if (TRACE_LIVE && m_last_live_state != SEARCH_IDAM)
{
- logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag().c_str(),tts(m_live_state.time).c_str(), tts(limit).c_str());
+ logerror("%s: [%s live] SEARCH_IDAM [limit %s]\n", tag(),tts(m_live_state.time).c_str(), tts(limit).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2856,12 +2856,12 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (read_from_mfmhd(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] SEARCH_IDAM limit reached\n", tag(), tts(m_live_state.time).c_str());
return;
}
if (TRACE_LIVE)
- if ((m_live_state.bit_counter & 0x000f)==0) logerror("%s: [%s live] Read %04x\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
+ if ((m_live_state.bit_counter & 0x000f)==0) logerror("%s: [%s live] Read %04x\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
// [1] p. 9: The ID field sync mark must be found within 33,792 byte times
if (m_live_state.bit_count_total > 33792*16)
@@ -2876,7 +2876,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (found_mark(SEARCH_IDAM))
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(), tts(m_live_state.time).c_str());
m_live_state.crc = 0x443b;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2907,9 +2907,9 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (TRACE_LIVE)
{
if (m_live_state.data_reg == 0xf8 || m_live_state.data_reg == 0xfb)
- logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag().c_str(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] Looks like a DAM; continue to next mark\n", tag(), tts(m_live_state.time).c_str());
else
- logerror("%s: [%s live] Missing ident data after A1, and it was not DAM; format corrupt?\n", tag().c_str(), tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] Missing ident data after A1, and it was not DAM; format corrupt?\n", tag(), tts(m_live_state.time).c_str());
}
m_live_state.state = SEARCH_IDAM;
}
@@ -2924,7 +2924,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case READ_ID_FIELDS_INTO_REGS:
if (TRACE_LIVE && m_last_live_state != READ_ID_FIELDS_INTO_REGS)
{
- logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag().c_str(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_ID_FIELDS_INTO_REGS\n", tag(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -2933,7 +2933,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Repeat until we have collected 16 bits
if (m_live_state.bit_counter & 15) break;
- if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag().c_str(), slot, m_live_state.data_reg, m_live_state.crc);
+ if (TRACE_LIVE) logerror("%s: slot %d = %02x, crc=%04x\n", tag(), slot, m_live_state.data_reg, m_live_state.crc);
m_register_r[id_field[slot++]] = m_live_state.data_reg;
if(slot > 5)
@@ -2952,7 +2952,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case SEARCH_DAM:
if (TRACE_LIVE && m_last_live_state != SEARCH_DAM)
{
- logerror("%s: [%s live] SEARCH_DAM\n", tag().c_str(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] SEARCH_DAM\n", tag(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
set_bits(m_register_r[CHIP_STATUS], CS_DELDATA, false);
@@ -2960,18 +2960,18 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (read_from_mfmhd(limit)) return;
if (TRACE_LIVE)
- if ((m_live_state.bit_counter & 15)==0) logerror("%s: [%s live] Read %04x\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
+ if ((m_live_state.bit_counter & 15)==0) logerror("%s: [%s live] Read %04x\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
if (m_live_state.bit_counter > 30*16)
{
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
if (found_mark(SEARCH_DAM))
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag().c_str(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found an A1 mark\n", tag(),tts(m_live_state.time).c_str());
m_live_state.crc = 0x443b;
m_live_state.data_separator_phase = false;
m_live_state.bit_counter = 0;
@@ -2986,14 +2986,14 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if ((m_live_state.data_reg & 0xff) == 0xf8)
{
- if (TRACE_LIVE) logerror("%s: [%s live] Found deleted data mark F8 after DAM sync\n", tag().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Found deleted data mark F8 after DAM sync\n", tag(), tts(m_live_state.time).c_str());
set_bits(m_register_r[CHIP_STATUS], CS_DELDATA, true);
}
else
{
if ((m_live_state.data_reg & 0xff) != 0xfb)
{
- if (TRACE_FAIL) logerror("%s: [%s live] Missing FB/F8 data mark after DAM sync; found %04x\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
+ if (TRACE_FAIL) logerror("%s: [%s live] Missing FB/F8 data mark after DAM sync; found %04x\n", tag(), tts(m_live_state.time).c_str(), m_live_state.shift_reg);
wait_for_realtime(SEARCH_DAM_FAILED);
return;
}
@@ -3003,14 +3003,14 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
break;
case SEARCH_DAM_FAILED:
- if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: SEARCH_DAM failed\n", tag());
m_live_state.state = IDLE;
return;
case READ_SECTOR_DATA:
if (TRACE_LIVE && m_last_live_state != READ_SECTOR_DATA)
{
- logerror("%s: [%s live] READ_SECTOR_DATA\n", tag().c_str(),tts(m_live_state.time).c_str());
+ logerror("%s: [%s live] READ_SECTOR_DATA\n", tag(),tts(m_live_state.time).c_str());
m_last_live_state = m_live_state.state;
}
@@ -3030,7 +3030,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if (m_live_state.bit_counter & 15) break;
slot = (m_live_state.bit_counter >> 4)-1;
- if (TRACE_LIVE) logerror("%s: [%s live] Found data value [%d/%d] = %02X, CRC=%04x\n", tag().c_str(),tts(m_live_state.time).c_str(), slot, calc_sector_size(), m_live_state.data_reg, m_live_state.crc);
+ if (TRACE_LIVE) logerror("%s: [%s live] Found data value [%d/%d] = %02X, CRC=%04x\n", tag(),tts(m_live_state.time).c_str(), slot, calc_sector_size(), m_live_state.data_reg, m_live_state.crc);
if (slot < calc_sector_size())
{
@@ -3058,7 +3058,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
}
else
{
- if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag().c_str(),tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Sector read completed\n", tag(),tts(m_live_state.time).c_str());
wait_for_realtime(IDLE);
}
return;
@@ -3071,7 +3071,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Did the system CPU send the DMA ACK in the meantime?
if ((m_register_r[INT_STATUS] & ST_OVRUN)!=0)
{
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_live_state.state = IDLE;
return;
@@ -3085,7 +3085,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
m_out_dip(ASSERT_LINE);
m_out_dma(0, m_register_r[DATA], 0xff);
- if (TRACE_LIVE) logerror("%s: [%s live] Byte %02x sent via DMA\n", tag().c_str(),tts(m_live_state.time).c_str(), m_register_r[DATA] & 0xff);
+ if (TRACE_LIVE) logerror("%s: [%s live] Byte %02x sent via DMA\n", tag(),tts(m_live_state.time).c_str(), m_register_r[DATA] & 0xff);
}
m_live_state.state = READ_SECTOR_DATA;
break;
@@ -3096,14 +3096,14 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// The pause is implemented by doing dummy reads on the hard disk
if (read_from_mfmhd(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag().c_str(), tts(m_live_state.time).c_str(), tts(limit).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] return; limit=%s\n", tag(), tts(m_live_state.time).c_str(), tts(limit).c_str());
return;
}
// Repeat until we have collected 16 bits
if ((m_live_state.bit_counter & 15)==0)
{
- if (TRACE_READ && TRACE_DETAIL) logerror("%s: [%s live] Read byte %02x, repeat = %d\n", tag().c_str(), tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.repeat);
+ if (TRACE_READ && TRACE_DETAIL) logerror("%s: [%s live] Read byte %02x, repeat = %d\n", tag(), tts(m_live_state.time).c_str(), m_live_state.data_reg, m_live_state.repeat);
wait_for_realtime(READ_TRACK_NEXT_BYTE);
return;
}
@@ -3123,7 +3123,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case WRITE_TRACK_BYTE:
if (write_to_mfmhd(limit))
{
- if (TRACE_LIVE) logerror("%s: [%s live] write limit reached\n", tag().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] write limit reached\n", tag(), tts(m_live_state.time).c_str());
return;
}
@@ -3154,13 +3154,13 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// ======= HD sector write =====================================
case WRITE_DAM_AND_SECTOR:
- if (TRACE_LIVE) logerror("%s: [%s live] Skipping GAP2\n", tag().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s live] Skipping GAP2\n", tag(), tts(m_live_state.time).c_str());
skip_on_track(m_gap2_size, WRITE_DAM_SYNC);
break;
case WRITE_DAM_SYNC:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sync zeros\n", tag());
// Clear the overrun/underrun flag
set_bits(m_register_r[INT_STATUS], ST_OVRUN, false);
@@ -3168,12 +3168,12 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
break;
case WRITE_A1:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write one A1\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write one A1\n", tag());
write_on_track(encode_a1_hd(), 1, WRITE_DATAMARK);
break;
case WRITE_DATAMARK:
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write data mark\n", tag());
// Init the CRC for the ident byte and sector
m_live_state.crc = 0x443b; // value for 1*A1
@@ -3202,7 +3202,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
}
else
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector byte, %d to go\n", tag().c_str(), m_live_state.byte_counter);
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector byte, %d to go\n", tag(), m_live_state.byte_counter);
// For floppies, set this for each byte; for hard disk, set it only at the beginning
if (m_live_state.byte_counter == calc_sector_size())
@@ -3241,7 +3241,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case WRITE_DATA_CRC:
if (m_live_state.byte_counter > 0)
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write CRC\n", tag());
m_live_state.byte_counter--;
write_on_track(encode_hd((m_live_state.crc >> 8) & 0xff), 1, WRITE_DATA_CRC);
}
@@ -3254,7 +3254,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
case WRITE_DONE:
if (m_substate == DATA_TRANSFER_WRITE)
{
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag().c_str());
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: Write sector complete\n", tag());
m_live_state.state = IDLE;
return;
}
@@ -3272,7 +3272,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Read the next ID fields, then the sector contents.
// Continue until the next index hole shows up (live_abort).
case READ_TRACK:
- if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag().c_str());
+ if (TRACE_LIVE) logerror("%s: READ_TRACK\n", tag());
m_live_state.state = READ_TRACK_ID;
break;
@@ -3287,12 +3287,12 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
if ((m_register_r[INT_STATUS] & ST_OVRUN)!=0)
{
// We need an ACK right now, or the header bytes will be lost
- if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag().c_str());
+ if (TRACE_FAIL) logerror("%s: No DMA ACK - buffer overrun\n", tag());
set_bits(m_register_r[INT_STATUS], TC_DATAERR, true);
m_live_state.state = IDLE;
return;
}
- if (TRACE_LIVE) logerror("%s: READ_TRACK_ID_DONE\n", tag().c_str());
+ if (TRACE_LIVE) logerror("%s: READ_TRACK_ID_DONE\n", tag());
m_out_dip(ASSERT_LINE);
// Write the header via DMA
@@ -3319,18 +3319,18 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Write GAP4 until the next pulse
// ==================================================
case FORMAT_TRACK:
- if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag().c_str());
+ if (TRACE_LIVE) logerror("%s: FORMAT_TRACK\n", tag());
m_live_state.state = WRITE_GAP1;
break;
case WRITE_GAP1:
// GAP1 length is in DMA15_8
- if (TRACE_GAPS) logerror("%s: Writing GAP1; size=%d\n", tag().c_str(), m_gap1_size);
+ if (TRACE_GAPS) logerror("%s: Writing GAP1; size=%d\n", tag(), m_gap1_size);
write_on_track(encode_hd(0x4e), m_gap1_size, WRITE_IDAM_SYNC);
break;
case WRITE_IDAM_SYNC:
- if (TRACE_GAPS) logerror("%s: Writing IDAM sync, size=%d\n", tag().c_str(), m_sync_size);
+ if (TRACE_GAPS) logerror("%s: Writing IDAM sync, size=%d\n", tag(), m_sync_size);
write_on_track(encode_hd(0x00), m_sync_size, WRITE_IDAM);
break;
@@ -3338,7 +3338,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// Set the over/underrun flag and hope that it will be cleared before we enter the next state (after writing)
set_bits(m_register_r[INT_STATUS], ST_OVRUN, true);
m_out_dmarq(ASSERT_LINE);
- if (TRACE_HEADER) logerror("%s: Writing IDAM and header: ", tag().c_str());
+ if (TRACE_HEADER) logerror("%s: Writing IDAM and header: ", tag());
write_on_track(encode_a1_hd(), 1, WRITE_HEADER);
m_live_state.byte_counter = 5; // TODO: Check this for AT mode
m_live_state.crc = 0xffff;
@@ -3382,13 +3382,13 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
break;
case WRITE_GAP2:
- if (TRACE_GAPS) logerror("%s: Writing GAP2, size=%d\n", tag().c_str(), m_gap2_size);
+ if (TRACE_GAPS) logerror("%s: Writing GAP2, size=%d\n", tag(), m_gap2_size);
write_on_track(encode_hd(0x4e), m_gap2_size, WRITE_DAM_SYNC);
break;
case WRITE_GAP3:
m_sector_count--;
- if (TRACE_GAPS) logerror("%s: Writing GAP3, size=%d\n", tag().c_str(), m_gap3_size);
+ if (TRACE_GAPS) logerror("%s: Writing GAP3, size=%d\n", tag(), m_gap3_size);
write_on_track(encode_hd(0x4e), m_gap3_size, (m_sector_count>0)? WRITE_IDAM_SYNC : WRITE_GAP4);
break;
@@ -3397,7 +3397,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
wait_line(INDEX_LINE, ASSERT_LINE, TRACKDONE, true);
if (TRACE_GAPS && m_last_live_state != WRITE_GAP4)
{
- logerror("%s: Writing GAP4\n", tag().c_str());
+ logerror("%s: Writing GAP4\n", tag());
m_last_live_state = WRITE_GAP4;
}
// Write a single byte; when the index hole shows up, the live run will be aborted
@@ -3406,7 +3406,7 @@ void hdc92x4_device::live_run_hd_until(attotime limit)
// --------------------------------------------------------
default:
- if (TRACE_LIVE) logerror("%s: Unknown state: %02x\n", tag().c_str(), m_live_state.state);
+ if (TRACE_LIVE) logerror("%s: Unknown state: %02x\n", tag(), m_live_state.state);
break;
}
}
@@ -3427,7 +3427,7 @@ void hdc92x4_device::live_sync()
if(m_live_state.time > machine().time())
{
// If so, we must roll back to the last checkpoint
- if (TRACE_SYNC) logerror("%s: [%s] Rolling back and replaying [%s live]\n", tag().c_str(), ttsn().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_SYNC) logerror("%s: [%s] Rolling back and replaying [%s live]\n", tag(), ttsn().c_str(), tts(m_live_state.time).c_str());
rollback();
// and replay until we reach the machine time
@@ -3447,7 +3447,7 @@ void hdc92x4_device::live_sync()
{
// We are behind machine time, so we will never get back to that
// time, thus we can commit that position
- if (TRACE_SYNC) logerror("%s: [%s] Committing [%s live]\n", tag().c_str(), ttsn().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_SYNC) logerror("%s: [%s] Committing [%s live]\n", tag(), ttsn().c_str(), tts(m_live_state.time).c_str());
// Commit bits from pll buffer to disk until live time (if there is something to write)
if (using_floppy())
@@ -3474,7 +3474,7 @@ void hdc92x4_device::live_abort()
{
if (!m_live_state.time.is_never() && m_live_state.time > machine().time())
{
- if (TRACE_LIVE) logerror("%s: [%s] Abort; rolling back and replaying [%s live]\n", tag().c_str(), ttsn().c_str(), tts(m_live_state.time).c_str());
+ if (TRACE_LIVE) logerror("%s: [%s] Abort; rolling back and replaying [%s live]\n", tag(), ttsn().c_str(), tts(m_live_state.time).c_str());
rollback();
live_run_until(machine().time());
}
@@ -3541,7 +3541,7 @@ void hdc92x4_device::wait_for_realtime(int state)
{
m_live_state.next_state = state;
m_timer->adjust(m_live_state.time - machine().time());
- if (TRACE_LIVE) logerror("%s: [%s live] Waiting for real time [%s] to catch up; next state = %02x\n", tag().c_str(), tts(m_live_state.time).c_str(), ttsn().c_str(), state);
+ if (TRACE_LIVE) logerror("%s: [%s live] Waiting for real time [%s] to catch up; next state = %02x\n", tag(), tts(m_live_state.time).c_str(), ttsn().c_str(), state);
}
/*
@@ -3666,7 +3666,7 @@ void hdc92x4_device::encode_raw(UINT16 raw)
m_live_state.bit_counter = 16;
m_live_state.shift_reg = m_live_state.shift_reg_save = raw;
m_live_state.last_data_bit = raw & 1;
- if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: [%s live] Write %02x (%04x)\n", tag().c_str(), tts(m_live_state.time).c_str(), get_data_from_encoding(raw), raw);
+ if (TRACE_WRITE && TRACE_DETAIL) logerror("%s: [%s live] Write %02x (%04x)\n", tag(), tts(m_live_state.time).c_str(), get_data_from_encoding(raw), raw);
checkpoint();
}
@@ -3923,7 +3923,7 @@ READ8_MEMBER( hdc92x4_device::read )
{
// Data register
reply = m_register_r[m_register_pointer];
- if (TRACE_READREG) logerror("%s: Read register[%d] -> %02x\n", tag().c_str(), m_register_pointer, reply);
+ if (TRACE_READREG) logerror("%s: Read register[%d] -> %02x\n", tag(), m_register_pointer, reply);
// Autoincrement until DATA is reached.
if (m_register_pointer < DATA) m_register_pointer++;
@@ -3935,7 +3935,7 @@ READ8_MEMBER( hdc92x4_device::read )
// "The interrupt pin is reset to its inactive state
// when the UDC interrupt status register is read." [1] (p.3)
- if (TRACE_READREG) logerror("%s: Read interrupt status register -> %02x\n", tag().c_str(), reply);
+ if (TRACE_READREG) logerror("%s: Read interrupt status register -> %02x\n", tag(), reply);
set_interrupt(CLEAR_LINE);
// Clear the bits due to interrupt status register read.
@@ -3955,8 +3955,8 @@ WRITE8_MEMBER( hdc92x4_device::write )
{
if ((offset & 1) == 0)
{
- if (TRACE_COMMAND) logerror("%s: New register write access %02x\n", tag().c_str(), data & 0xff);
- if (m_executing) logerror("%s: Error - previous command %02x not completed; register access ignored\n", tag().c_str(), current_command());
+ if (TRACE_COMMAND) logerror("%s: New register write access %02x\n", tag(), data & 0xff);
+ if (m_executing) logerror("%s: Error - previous command %02x not completed; register access ignored\n", tag(), current_command());
else
{
m_regvalue = data & 0xff;
@@ -3965,8 +3965,8 @@ WRITE8_MEMBER( hdc92x4_device::write )
}
else
{
- if (TRACE_COMMAND) logerror("%s: New incoming command %02x\n", tag().c_str(), data);
- if (m_executing) logerror("%s: Error - previous command %02x not completed; new command %02x ignored\n", tag().c_str(), current_command(), data);
+ if (TRACE_COMMAND) logerror("%s: New incoming command %02x\n", tag(), data);
+ if (m_executing) logerror("%s: Error - previous command %02x not completed; new command %02x ignored\n", tag(), current_command(), data);
else
{
m_register_w[COMMAND] = data;
@@ -3987,9 +3987,9 @@ void hdc92x4_device::process_command()
if (TRACE_SETREG)
{
if (m_register_pointer == INT_COMM_TERM)
- logerror("%s: Setting interrupt trigger DONE=%d READY=%d\n", tag().c_str(), (m_regvalue & TC_INTDONE)? 1:0, (m_regvalue & TC_INTRDCH)? 1:0);
+ logerror("%s: Setting interrupt trigger DONE=%d READY=%d\n", tag(), (m_regvalue & TC_INTDONE)? 1:0, (m_regvalue & TC_INTRDCH)? 1:0);
else
- logerror("%s: register[%d] <- %02x\n", tag().c_str(), m_register_pointer, m_regvalue);
+ logerror("%s: register[%d] <- %02x\n", tag(), m_register_pointer, m_regvalue);
}
m_register_w[m_register_pointer] = m_regvalue;
@@ -4032,7 +4032,7 @@ void hdc92x4_device::process_command()
}
if (!found)
{
- logerror("%s: Command %02x not defined\n", tag().c_str(), m_register_w[COMMAND]);
+ logerror("%s: Command %02x not defined\n", tag(), m_register_w[COMMAND]);
}
}
auxbus_out();
@@ -4040,7 +4040,7 @@ void hdc92x4_device::process_command()
void hdc92x4_device::reenter_command_processing()
{
- if (TRACE_DELAY) logerror("%s: Re-enter command processing; live state = %02x\n", tag().c_str(), m_live_state.state);
+ if (TRACE_DELAY) logerror("%s: Re-enter command processing; live state = %02x\n", tag(), m_live_state.state);
// Do we have a live run on the track?
if (m_live_state.state != IDLE)
{
@@ -4052,7 +4052,7 @@ void hdc92x4_device::reenter_command_processing()
// We're here when there is no live_run anymore
// Where were we last time?
// Take care not to restart commands because of the index callback
- if (TRACE_DELAY) logerror("%s: Continue with substate %02x\n", tag().c_str(), m_substate);
+ if (TRACE_DELAY) logerror("%s: Continue with substate %02x\n", tag(), m_substate);
if (m_executing && m_substate != UNDEF) (this->*m_command)();
auxbus_out();
}
@@ -4071,15 +4071,15 @@ void hdc92x4_device::set_command_done(int flags)
{
set_bits(m_register_r[INT_STATUS], ST_TERMCOD, false); // clear the previously set flags
m_register_r[INT_STATUS] |= flags;
- if (TRACE_DONE) logerror("%s: command %02x done, flags=%02x\n", tag().c_str(), current_command(), flags);
+ if (TRACE_DONE) logerror("%s: command %02x done, flags=%02x\n", tag(), current_command(), flags);
}
else
{
- if (TRACE_DONE) logerror("%s: command %02x done\n", tag().c_str(), current_command());
+ if (TRACE_DONE) logerror("%s: command %02x done\n", tag(), current_command());
}
// [1], p. 6
- if (TRACE_INT) logerror("%s: Raise interrupt DONE\n", tag().c_str());
+ if (TRACE_INT) logerror("%s: Raise interrupt DONE\n", tag());
set_interrupt(ASSERT_LINE);
m_substate = UNDEF;
@@ -4147,7 +4147,7 @@ void hdc92x4_device::auxbus_in(UINT8 data)
return;
if (TRACE_AUXBUS) logerror("%s: Got value %02x via auxbus: ecc=%d index=%d seek_comp=%d tr00=%d user=%d writeprot=%d ready=%d fault=%d\n",
- tag().c_str(), data,
+ tag(), data,
(data&HDC_DS_ECCERR)? 1:0, (data&HDC_DS_INDEX)? 1:0,
(data&HDC_DS_SKCOM)? 1:0, (data&HDC_DS_TRK00)? 1:0,
(data&HDC_DS_UDEF)? 1:0, (data&HDC_DS_WRPROT)? 1:0,
@@ -4181,20 +4181,20 @@ bool hdc92x4_device::waiting_for_other_line(int line)
void hdc92x4_device::index_handler()
{
int level = index_hole()? ASSERT_LINE : CLEAR_LINE;
- if (TRACE_LINES) logerror("%s: [%s] Index handler; level=%d\n", tag().c_str(), ttsn().c_str(), level);
+ if (TRACE_LINES) logerror("%s: [%s] Index handler; level=%d\n", tag(), ttsn().c_str(), level);
// Synchronize our position on the track
live_sync();
if (level==ASSERT_LINE)
{
- if (TRACE_INDEX) logerror("%s: Index pulse\n", tag().c_str());
+ if (TRACE_INDEX) logerror("%s: Index pulse\n", tag());
if (m_wait_for_index) m_stop_after_index = true;
}
if (waiting_for_line(INDEX_LINE, level))
{
- if (TRACE_LINES) logerror("%s: [%s] Index pulse level=%d triggers event\n", tag().c_str(), ttsn().c_str(), level);
+ if (TRACE_LINES) logerror("%s: [%s] Index pulse level=%d triggers event\n", tag(), ttsn().c_str(), level);
m_substate = m_state_after_line;
m_state_after_line = UNDEF;
if (m_stopwrite)
@@ -4216,7 +4216,7 @@ void hdc92x4_device::index_handler()
void hdc92x4_device::ready_handler()
{
int level = drive_ready()? ASSERT_LINE : CLEAR_LINE;
- if (TRACE_LINES) logerror("%s: [%s] Ready handler; level=%d\n", tag().c_str(), ttsn().c_str(), level);
+ if (TRACE_LINES) logerror("%s: [%s] Ready handler; level=%d\n", tag(), ttsn().c_str(), level);
// Set the interrupt status flag
set_bits(m_register_r[INT_STATUS], ST_RDYCHNG, true);
@@ -4227,7 +4227,7 @@ void hdc92x4_device::ready_handler()
// Raise an interrupt if desired
if (m_register_w[INT_COMM_TERM] & TC_INTRDCH)
{
- if (TRACE_INT) logerror("%s: Raise interrupt READY change\n", tag().c_str());
+ if (TRACE_INT) logerror("%s: Raise interrupt READY change\n", tag());
set_interrupt(ASSERT_LINE);
}
@@ -4243,7 +4243,7 @@ void hdc92x4_device::ready_handler()
void hdc92x4_device::seek_complete_handler()
{
int level = seek_complete()? ASSERT_LINE : CLEAR_LINE;
- if (TRACE_LINES) logerror("%s: [%s] Seek complete handler; level=%d\n", tag().c_str(), ttsn().c_str(), level);
+ if (TRACE_LINES) logerror("%s: [%s] Seek complete handler; level=%d\n", tag(), ttsn().c_str(), level);
// Synchronize our position on the track
live_sync();
@@ -4290,7 +4290,7 @@ void hdc92x4_device::auxbus_out()
m_output2 = (m_output2 & 0xb0) | desired_head();
if (m_reduced_write_current) m_output2 |= OUT2_REDWRT;
- if (TRACE_AUXBUS) logerror("%s: [%s] Setting OUTPUT1=%02x, OUTPUT2=%02x\n", tag().c_str(), ttsn().c_str(), m_output1, m_output2);
+ if (TRACE_AUXBUS) logerror("%s: [%s] Setting OUTPUT1=%02x, OUTPUT2=%02x\n", tag(), ttsn().c_str(), m_output1, m_output2);
if (m_output1 != m_output1_old || m_output2 != m_output2_old)
{
@@ -4304,7 +4304,7 @@ void hdc92x4_device::auxbus_out()
void hdc92x4_device::dma_address_out(UINT8 addrub, UINT8 addrhb, UINT8 addrlb)
{
- if (TRACE_DMA) logerror("%s: Setting DMA address %06x\n", tag().c_str(), (addrub<<16 | addrhb<<8 | addrlb)&0xffffff);
+ if (TRACE_DMA) logerror("%s: Setting DMA address %06x\n", tag(), (addrub<<16 | addrhb<<8 | addrlb)&0xffffff);
m_out_auxbus((offs_t)HDC_OUTPUT_DMA_ADDR, addrub);
m_out_auxbus((offs_t)HDC_OUTPUT_DMA_ADDR, addrhb);
m_out_auxbus((offs_t)HDC_OUTPUT_DMA_ADDR, addrlb);
@@ -4344,7 +4344,7 @@ WRITE_LINE_MEMBER( hdc92x4_device::dmaack )
{
if (state==ASSERT_LINE)
{
- if (TRACE_DMA) logerror("%s: [%s] DMA acknowledged\n", tag().c_str(), ttsn().c_str());
+ if (TRACE_DMA) logerror("%s: [%s] DMA acknowledged\n", tag(), ttsn().c_str());
set_bits(m_register_r[INT_STATUS], ST_OVRUN, false);
}
}
@@ -4365,7 +4365,7 @@ void hdc92x4_device::connect_hard_drive(mfm_harddisk_device* harddisk)
{
m_harddisk = harddisk;
m_hd_encoding = m_harddisk->get_encoding();
- if (TRACE_SELECT && TRACE_DETAIL) logerror("%s: HD encoding = %d\n", tag().c_str(), m_hd_encoding);
+ if (TRACE_SELECT && TRACE_DETAIL) logerror("%s: HD encoding = %d\n", tag(), m_hd_encoding);
}
/*
@@ -4405,7 +4405,7 @@ WRITE_LINE_MEMBER( hdc92x4_device::reset )
{
if (state == ASSERT_LINE)
{
- if (TRACE_LINES) logerror("%s: Reset via RST line\n", tag().c_str());
+ if (TRACE_LINES) logerror("%s: Reset via RST line\n", tag());
device_reset();
}
}
diff --git a/src/devices/machine/hdc92x4.h b/src/devices/machine/hdc92x4.h
index e15fc72230e..fccf23666d7 100644
--- a/src/devices/machine/hdc92x4.h
+++ b/src/devices/machine/hdc92x4.h
@@ -79,7 +79,7 @@ enum
class hdc92x4_device : public device_t
{
public:
- hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ hdc92x4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// Accesors from the CPU side
DECLARE_READ8_MEMBER( read );
@@ -475,13 +475,13 @@ protected:
class hdc9224_device : public hdc92x4_device
{
public:
- hdc9224_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hdc9224_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class hdc9234_device : public hdc92x4_device
{
public:
- hdc9234_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ hdc9234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
#endif
diff --git a/src/devices/machine/i2cmem.cpp b/src/devices/machine/i2cmem.cpp
index b345dd3817b..d77e12ef4be 100644
--- a/src/devices/machine/i2cmem.cpp
+++ b/src/devices/machine/i2cmem.cpp
@@ -49,7 +49,7 @@ static inline void ATTR_PRINTF( 3, 4 ) verboselog( device_t *device, int n_level
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- device->logerror( "%s: I2CMEM(%s) %s", device->machine().describe_context( ), device->tag().c_str(), buf );
+ device->logerror( "%s: I2CMEM(%s) %s", device->machine().describe_context( ), device->tag(), buf );
}
}
@@ -74,7 +74,7 @@ ADDRESS_MAP_END
// i2cmem_device - constructor
//-------------------------------------------------
-i2cmem_device::i2cmem_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+i2cmem_device::i2cmem_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: device_t(mconfig, I2CMEM, "I2C Memory", tag, owner, clock, "i2cmem", __FILE__),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -183,12 +183,12 @@ void i2cmem_device::nvram_default()
{
if( m_region->bytes() != i2cmem_bytes )
{
- fatalerror( "i2cmem region '%s' wrong size (expected size = 0x%X)\n", tag().c_str(), i2cmem_bytes );
+ fatalerror( "i2cmem region '%s' wrong size (expected size = 0x%X)\n", tag(), i2cmem_bytes );
}
if( m_region->bytewidth() != 1 )
{
- fatalerror( "i2cmem region '%s' needs to be an 8-bit region\n", tag().c_str() );
+ fatalerror( "i2cmem region '%s' needs to be an 8-bit region\n", tag() );
}
UINT8 *default_data = m_region->base();
diff --git a/src/devices/machine/i2cmem.h b/src/devices/machine/i2cmem.h
index 167ea117348..d17d6f2f277 100644
--- a/src/devices/machine/i2cmem.h
+++ b/src/devices/machine/i2cmem.h
@@ -90,7 +90,7 @@ class i2cmem_device :
{
public:
// construction/destruction
- i2cmem_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
+ i2cmem_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
static void set_address(device_t &device, int address) { downcast<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 538a36340d6..ec7ca934d31 100644
--- a/src/devices/machine/i6300esb.cpp
+++ b/src/devices/machine/i6300esb.cpp
@@ -8,7 +8,7 @@ const device_type I6300ESB_LPC = &device_creator<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, std::string tag, device_t *owner, UINT32 clock)
+i6300esb_watchdog_device::i6300esb_watchdog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I6300ESB_WATCHDOG, "i6300ESB southbridge watchdog", tag, owner, clock, "i6300esb_watchdog", __FILE__)
{
}
@@ -86,7 +86,7 @@ DEVICE_ADDRESS_MAP_START(internal_io_map, 32, i6300esb_lpc_device)
ADDRESS_MAP_END
-i6300esb_lpc_device::i6300esb_lpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i6300esb_lpc_device::i6300esb_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I6300ESB_LPC, "i6300ESB southbridge ISA/LPC bridge", tag, owner, clock, "i6300esb_lpc", __FILE__),
acpi(*this, "acpi"),
rtc (*this, "rtc"),
@@ -156,7 +156,7 @@ WRITE32_MEMBER(i6300esb_lpc_device::pmbase_w)
{
COMBINE_DATA(&pmbase);
pmbase &= 0x0000ff80;
- logerror("%s: pmbase = %08x\n", tag().c_str(), pmbase);
+ logerror("%s: pmbase = %08x\n", tag(), pmbase);
remap_cb();
}
@@ -168,7 +168,7 @@ READ8_MEMBER (i6300esb_lpc_device::acpi_cntl_r)
WRITE8_MEMBER(i6300esb_lpc_device::acpi_cntl_w)
{
acpi_cntl = data;
- logerror("%s: acpi_cntl = %08x\n", tag().c_str(), acpi_cntl);
+ logerror("%s: acpi_cntl = %08x\n", tag(), acpi_cntl);
remap_cb();
}
@@ -180,7 +180,7 @@ READ16_MEMBER (i6300esb_lpc_device::bios_cntl_r)
WRITE16_MEMBER(i6300esb_lpc_device::bios_cntl_w)
{
COMBINE_DATA(&bios_cntl);
- logerror("%s: bios_cntl = %08x\n", tag().c_str(), bios_cntl);
+ logerror("%s: bios_cntl = %08x\n", tag(), bios_cntl);
remap_cb();
}
@@ -192,7 +192,7 @@ READ8_MEMBER (i6300esb_lpc_device::tco_cntl_r)
WRITE8_MEMBER (i6300esb_lpc_device::tco_cntl_w)
{
tco_cntl = data;
- logerror("%s: tco_cntl = %02x\n", tag().c_str(), tco_cntl);
+ logerror("%s: tco_cntl = %02x\n", tag(), tco_cntl);
}
READ32_MEMBER (i6300esb_lpc_device::gpio_base_r)
@@ -204,7 +204,7 @@ WRITE32_MEMBER(i6300esb_lpc_device::gpio_base_w)
{
COMBINE_DATA(&gpio_base);
gpio_base &= 0x0000ffc0;
- logerror("%s: gpio_base = %08x\n", tag().c_str(), gpio_base);
+ logerror("%s: gpio_base = %08x\n", tag(), gpio_base);
remap_cb();
}
@@ -216,7 +216,7 @@ READ8_MEMBER (i6300esb_lpc_device::gpio_cntl_r)
WRITE8_MEMBER (i6300esb_lpc_device::gpio_cntl_w)
{
gpio_cntl = data;
- logerror("%s: gpio_cntl = %02x\n", tag().c_str(), gpio_cntl);
+ logerror("%s: gpio_cntl = %02x\n", tag(), gpio_cntl);
remap_cb();
}
@@ -228,7 +228,7 @@ READ8_MEMBER (i6300esb_lpc_device::pirq_rout_r)
WRITE8_MEMBER (i6300esb_lpc_device::pirq_rout_w)
{
pirq_rout[offset] = data;
- logerror("%s: pirq_rout[%d] = %02x\n", tag().c_str(), offset, pirq_rout[offset]);
+ logerror("%s: pirq_rout[%d] = %02x\n", tag(), offset, pirq_rout[offset]);
}
READ8_MEMBER (i6300esb_lpc_device::serirq_cntl_r)
@@ -239,7 +239,7 @@ READ8_MEMBER (i6300esb_lpc_device::serirq_cntl_r)
WRITE8_MEMBER (i6300esb_lpc_device::serirq_cntl_w)
{
serirq_cntl = data;
- logerror("%s: serirq_cntl = %02x\n", tag().c_str(), serirq_cntl);
+ logerror("%s: serirq_cntl = %02x\n", tag(), serirq_cntl);
}
READ8_MEMBER (i6300esb_lpc_device::pirq2_rout_r)
@@ -260,7 +260,7 @@ READ8_MEMBER (i6300esb_lpc_device::d31_err_cfg_r)
WRITE8_MEMBER (i6300esb_lpc_device::d31_err_cfg_w)
{
d31_err_cfg = data;
- logerror("%s: d31_err_cfg = %02x\n", tag().c_str(), d31_err_cfg);
+ logerror("%s: d31_err_cfg = %02x\n", tag(), d31_err_cfg);
}
READ8_MEMBER (i6300esb_lpc_device::d31_err_sts_r)
@@ -271,7 +271,7 @@ READ8_MEMBER (i6300esb_lpc_device::d31_err_sts_r)
WRITE8_MEMBER (i6300esb_lpc_device::d31_err_sts_w)
{
d31_err_sts &= ~data;
- logerror("%s: d31_err_sts = %02x\n", tag().c_str(), d31_err_sts);
+ logerror("%s: d31_err_sts = %02x\n", tag(), d31_err_sts);
}
READ16_MEMBER (i6300esb_lpc_device::pci_dma_cfg_r)
@@ -282,7 +282,7 @@ READ16_MEMBER (i6300esb_lpc_device::pci_dma_cfg_r)
WRITE16_MEMBER(i6300esb_lpc_device::pci_dma_cfg_w)
{
COMBINE_DATA(&pci_dma_cfg);
- logerror("%s: pci_dma_cfg = %04x\n", tag().c_str(), pci_dma_cfg);
+ logerror("%s: pci_dma_cfg = %04x\n", tag(), pci_dma_cfg);
}
READ16_MEMBER (i6300esb_lpc_device::gen_pmcon_1_r)
@@ -293,7 +293,7 @@ READ16_MEMBER (i6300esb_lpc_device::gen_pmcon_1_r)
WRITE16_MEMBER(i6300esb_lpc_device::gen_pmcon_1_w)
{
COMBINE_DATA(&gen_pmcon_1);
- logerror("%s: gen_pmcon_1 = %04x\n", tag().c_str(), gen_pmcon_1);
+ logerror("%s: gen_pmcon_1 = %04x\n", tag(), gen_pmcon_1);
}
READ8_MEMBER (i6300esb_lpc_device::gen_pmcon_2_r)
@@ -304,7 +304,7 @@ READ8_MEMBER (i6300esb_lpc_device::gen_pmcon_2_r)
WRITE8_MEMBER (i6300esb_lpc_device::gen_pmcon_2_w)
{
gen_pmcon_2 = data;
- logerror("%s: gen_pmcon_2 = %02x\n", tag().c_str(), gen_pmcon_2);
+ logerror("%s: gen_pmcon_2 = %02x\n", tag(), gen_pmcon_2);
}
READ8_MEMBER (i6300esb_lpc_device::gen_pmcon_3_r)
@@ -315,7 +315,7 @@ READ8_MEMBER (i6300esb_lpc_device::gen_pmcon_3_r)
WRITE8_MEMBER (i6300esb_lpc_device::gen_pmcon_3_w)
{
gen_pmcon_3 = data;
- logerror("%s: gen_pmcon_3 = %02x\n", tag().c_str(), gen_pmcon_3);
+ logerror("%s: gen_pmcon_3 = %02x\n", tag(), gen_pmcon_3);
}
READ32_MEMBER (i6300esb_lpc_device::rst_cnt2_r)
@@ -326,7 +326,7 @@ READ32_MEMBER (i6300esb_lpc_device::rst_cnt2_r)
WRITE32_MEMBER(i6300esb_lpc_device::rst_cnt2_w)
{
COMBINE_DATA(&rst_cnt2);
- logerror("%s: rst_cnt2 = %08x\n", tag().c_str(), rst_cnt2);
+ logerror("%s: rst_cnt2 = %08x\n", tag(), rst_cnt2);
}
READ8_MEMBER (i6300esb_lpc_device::apm_cnt_r)
@@ -337,7 +337,7 @@ READ8_MEMBER (i6300esb_lpc_device::apm_cnt_r)
WRITE8_MEMBER (i6300esb_lpc_device::apm_cnt_w)
{
apm_cnt = data;
- logerror("%s: apm_cnt = %02x\n", tag().c_str(), apm_cnt);
+ logerror("%s: apm_cnt = %02x\n", tag(), apm_cnt);
}
READ8_MEMBER (i6300esb_lpc_device::apm_sts_r)
@@ -348,7 +348,7 @@ READ8_MEMBER (i6300esb_lpc_device::apm_sts_r)
WRITE8_MEMBER (i6300esb_lpc_device::apm_sts_w)
{
apm_sts = data;
- logerror("%s: apm_sts = %02x\n", tag().c_str(), apm_sts);
+ logerror("%s: apm_sts = %02x\n", tag(), apm_sts);
}
READ32_MEMBER (i6300esb_lpc_device::gpi_rout_r)
@@ -359,7 +359,7 @@ READ32_MEMBER (i6300esb_lpc_device::gpi_rout_r)
WRITE32_MEMBER(i6300esb_lpc_device::gpi_rout_w)
{
COMBINE_DATA(&gpi_rout);
- logerror("%s: gpi_rout = %08x\n", tag().c_str(), gpi_rout);
+ logerror("%s: gpi_rout = %08x\n", tag(), gpi_rout);
}
READ8_MEMBER (i6300esb_lpc_device::mon_fwd_en_r)
@@ -370,7 +370,7 @@ READ8_MEMBER (i6300esb_lpc_device::mon_fwd_en_r)
WRITE8_MEMBER (i6300esb_lpc_device::mon_fwd_en_w)
{
mon_fwd_en = data;
- logerror("%s: mon_fwd_en = %02x\n", tag().c_str(), mon_fwd_en);
+ logerror("%s: mon_fwd_en = %02x\n", tag(), mon_fwd_en);
}
READ16_MEMBER (i6300esb_lpc_device::mon_trp_rng_r)
@@ -381,7 +381,7 @@ READ16_MEMBER (i6300esb_lpc_device::mon_trp_rng_r)
WRITE16_MEMBER(i6300esb_lpc_device::mon_trp_rng_w)
{
COMBINE_DATA(&mon_trp_rng[offset]);
- logerror("%s: mon_trp_rng[%d] = %04x\n", tag().c_str(), 4+offset, mon_trp_rng[offset]);
+ logerror("%s: mon_trp_rng[%d] = %04x\n", tag(), 4+offset, mon_trp_rng[offset]);
}
READ16_MEMBER (i6300esb_lpc_device::mon_trp_msk_r)
@@ -392,7 +392,7 @@ READ16_MEMBER (i6300esb_lpc_device::mon_trp_msk_r)
WRITE16_MEMBER(i6300esb_lpc_device::mon_trp_msk_w)
{
COMBINE_DATA(&mon_trp_msk);
- logerror("%s: mon_trp_msk = %04x\n", tag().c_str(), mon_trp_msk);
+ logerror("%s: mon_trp_msk = %04x\n", tag(), mon_trp_msk);
}
READ32_MEMBER (i6300esb_lpc_device::gen_cntl_r)
@@ -403,7 +403,7 @@ READ32_MEMBER (i6300esb_lpc_device::gen_cntl_r)
WRITE32_MEMBER(i6300esb_lpc_device::gen_cntl_w)
{
COMBINE_DATA(&gen_cntl);
- logerror("%s: gen_cntl = %08x\n", tag().c_str(), gen_cntl);
+ logerror("%s: gen_cntl = %08x\n", tag(), gen_cntl);
}
READ8_MEMBER (i6300esb_lpc_device::gen_sta_r)
@@ -414,7 +414,7 @@ READ8_MEMBER (i6300esb_lpc_device::gen_sta_r)
WRITE8_MEMBER (i6300esb_lpc_device::gen_sta_w)
{
gen_sta = data;
- logerror("%s: gen_sta = %02x\n", tag().c_str(), gen_sta);
+ logerror("%s: gen_sta = %02x\n", tag(), gen_sta);
}
READ8_MEMBER (i6300esb_lpc_device::back_cntl_r)
@@ -425,7 +425,7 @@ READ8_MEMBER (i6300esb_lpc_device::back_cntl_r)
WRITE8_MEMBER (i6300esb_lpc_device::back_cntl_w)
{
back_cntl = data;
- logerror("%s: back_cntl = %02x\n", tag().c_str(), back_cntl);
+ logerror("%s: back_cntl = %02x\n", tag(), back_cntl);
remap_cb();
}
@@ -437,7 +437,7 @@ READ8_MEMBER (i6300esb_lpc_device::rtc_conf_r)
WRITE8_MEMBER (i6300esb_lpc_device::rtc_conf_w)
{
rtc_conf = data;
- logerror("%s: rtc_conf = %02x\n", tag().c_str(), rtc_conf);
+ logerror("%s: rtc_conf = %02x\n", tag(), rtc_conf);
remap_cb();
}
@@ -449,7 +449,7 @@ READ8_MEMBER (i6300esb_lpc_device::lpc_if_com_range_r)
WRITE8_MEMBER (i6300esb_lpc_device::lpc_if_com_range_w)
{
lpc_if_com_range = data;
- logerror("%s: lpc_if_com_range = %02x\n", tag().c_str(), lpc_if_com_range);
+ logerror("%s: lpc_if_com_range = %02x\n", tag(), lpc_if_com_range);
remap_cb();
}
@@ -461,7 +461,7 @@ READ8_MEMBER (i6300esb_lpc_device::lpc_if_fdd_lpt_range_r)
WRITE8_MEMBER (i6300esb_lpc_device::lpc_if_fdd_lpt_range_w)
{
COMBINE_DATA(&lpc_if_fdd_lpt_range);
- logerror("%s: lpc_if_fdd_lpt_range = %02x\n", tag().c_str(), lpc_if_fdd_lpt_range);
+ logerror("%s: lpc_if_fdd_lpt_range = %02x\n", tag(), lpc_if_fdd_lpt_range);
remap_cb();
}
@@ -473,7 +473,7 @@ READ8_MEMBER (i6300esb_lpc_device::lpc_if_sound_range_r)
WRITE8_MEMBER (i6300esb_lpc_device::lpc_if_sound_range_w)
{
COMBINE_DATA(&lpc_if_sound_range);
- logerror("%s: lpc_if_sound_range = %02x\n", tag().c_str(), lpc_if_sound_range);
+ logerror("%s: lpc_if_sound_range = %02x\n", tag(), lpc_if_sound_range);
remap_cb();
}
@@ -485,7 +485,7 @@ READ8_MEMBER (i6300esb_lpc_device::fwh_dec_en1_r)
WRITE8_MEMBER (i6300esb_lpc_device::fwh_dec_en1_w)
{
fwh_dec_en1 = data | 0x80;
- logerror("%s: fwh_dec_en1 = %02x\n", tag().c_str(), fwh_dec_en1);
+ logerror("%s: fwh_dec_en1 = %02x\n", tag(), fwh_dec_en1);
remap_cb();
}
@@ -497,7 +497,7 @@ READ16_MEMBER (i6300esb_lpc_device::gen1_dec_r)
WRITE16_MEMBER(i6300esb_lpc_device::gen1_dec_w)
{
COMBINE_DATA(&gen1_dec);
- logerror("%s: gen1_dec = %04x\n", tag().c_str(), gen1_dec);
+ logerror("%s: gen1_dec = %04x\n", tag(), gen1_dec);
remap_cb();
}
@@ -509,7 +509,7 @@ READ16_MEMBER (i6300esb_lpc_device::lpc_en_r)
WRITE16_MEMBER(i6300esb_lpc_device::lpc_en_w)
{
COMBINE_DATA(&lpc_en);
- logerror("%s: lpc_en = %04x\n", tag().c_str(), lpc_en);
+ logerror("%s: lpc_en = %04x\n", tag(), lpc_en);
remap_cb();
}
@@ -521,7 +521,7 @@ READ32_MEMBER (i6300esb_lpc_device::fwh_sel1_r)
WRITE32_MEMBER(i6300esb_lpc_device::fwh_sel1_w)
{
COMBINE_DATA(&fwh_sel1);
- logerror("%s: fwh_sel1 = %08x\n", tag().c_str(), fwh_sel1);
+ logerror("%s: fwh_sel1 = %08x\n", tag(), fwh_sel1);
remap_cb();
}
@@ -533,7 +533,7 @@ READ16_MEMBER (i6300esb_lpc_device::gen2_dec_r)
WRITE16_MEMBER(i6300esb_lpc_device::gen2_dec_w)
{
COMBINE_DATA(&gen2_dec);
- logerror("%s: gen2_dec = %04x\n", tag().c_str(), gen2_dec);
+ logerror("%s: gen2_dec = %04x\n", tag(), gen2_dec);
remap_cb();
}
@@ -545,7 +545,7 @@ READ16_MEMBER (i6300esb_lpc_device::fwh_sel2_r)
WRITE16_MEMBER(i6300esb_lpc_device::fwh_sel2_w)
{
COMBINE_DATA(&fwh_sel2);
- logerror("%s: fwh_sel2 = %04x\n", tag().c_str(), fwh_sel2);
+ logerror("%s: fwh_sel2 = %04x\n", tag(), fwh_sel2);
remap_cb();
}
@@ -557,7 +557,7 @@ READ8_MEMBER (i6300esb_lpc_device::fwh_dec_en2_r)
WRITE8_MEMBER (i6300esb_lpc_device::fwh_dec_en2_w)
{
fwh_dec_en2 = data;
- logerror("%s: fwh_dec_en2 = %02x\n", tag().c_str(), fwh_dec_en2);
+ logerror("%s: fwh_dec_en2 = %02x\n", tag(), fwh_dec_en2);
remap_cb();
}
@@ -569,7 +569,7 @@ READ16_MEMBER (i6300esb_lpc_device::func_dis_r)
WRITE16_MEMBER(i6300esb_lpc_device::func_dis_w)
{
COMBINE_DATA(&func_dis);
- logerror("%s: func_dis = %04x\n", tag().c_str(), func_dis);
+ logerror("%s: func_dis = %04x\n", tag(), func_dis);
}
READ32_MEMBER (i6300esb_lpc_device::etr1_r)
@@ -580,7 +580,7 @@ READ32_MEMBER (i6300esb_lpc_device::etr1_r)
WRITE32_MEMBER(i6300esb_lpc_device::etr1_w)
{
COMBINE_DATA(&etr1);
- logerror("%s: etr1 = %08x\n", tag().c_str(), etr1);
+ logerror("%s: etr1 = %08x\n", tag(), etr1);
}
READ32_MEMBER (i6300esb_lpc_device::mfid_r)
@@ -590,13 +590,13 @@ READ32_MEMBER (i6300esb_lpc_device::mfid_r)
READ32_MEMBER (i6300esb_lpc_device::unk_fc_r)
{
- logerror("%s: read undocumented config reg fc\n", tag().c_str());
+ logerror("%s: read undocumented config reg fc\n", tag());
return 0;
}
WRITE32_MEMBER(i6300esb_lpc_device::unk_fc_w)
{
- logerror("%s: write undocumented config reg fc (%08x)\n", tag().c_str(), data);
+ logerror("%s: write undocumented config reg fc (%08x)\n", tag(), data);
}
@@ -616,7 +616,7 @@ WRITE8_MEMBER (i6300esb_lpc_device::siu_config_port_w)
case 1:
siu_config_state = data == 0x86 ? 2 : data == 0x80 ? 1 : 0;
if(siu_config_state == 2)
- logerror("%s: siu configuration active\n", tag().c_str());
+ logerror("%s: siu configuration active\n", tag());
break;
case 2:
siu_config_state = data == 0x68 ? 3 : 2;
@@ -624,24 +624,24 @@ WRITE8_MEMBER (i6300esb_lpc_device::siu_config_port_w)
case 3:
siu_config_state = data == 0x08 ? 0 : data == 0x68 ? 3 : 2;
if(!siu_config_state)
- logerror("%s: siu configuration disabled\n", tag().c_str());
+ logerror("%s: siu configuration disabled\n", tag());
break;
}
}
READ8_MEMBER (i6300esb_lpc_device::siu_data_port_r)
{
- logerror("%s: siu config read port %02x\n", tag().c_str(), siu_config_port);
+ logerror("%s: siu config read port %02x\n", tag(), siu_config_port);
return 0xff;
}
WRITE8_MEMBER (i6300esb_lpc_device::siu_data_port_w)
{
if(siu_config_state < 2) {
- logerror("%s: siu config write port with config disabled (port=%02x, data=%02x)\n", tag().c_str(), siu_config_port, data);
+ logerror("%s: siu config write port with config disabled (port=%02x, data=%02x)\n", tag(), siu_config_port, data);
return;
}
- logerror("%s: siu config write port %02x, %02x\n", tag().c_str(), siu_config_port, data);
+ logerror("%s: siu config write port %02x, %02x\n", tag(), siu_config_port, data);
}
READ8_MEMBER (i6300esb_lpc_device::nmi_sc_r)
@@ -653,7 +653,7 @@ READ8_MEMBER (i6300esb_lpc_device::nmi_sc_r)
WRITE8_MEMBER (i6300esb_lpc_device::nmi_sc_w)
{
nmi_sc = data;
- logerror("%s: nmi_sc = %02x\n", tag().c_str(), nmi_sc);
+ logerror("%s: nmi_sc = %02x\n", tag(), nmi_sc);
}
@@ -710,44 +710,44 @@ void i6300esb_lpc_device::map_extra(UINT64 memory_window_start, UINT64 memory_wi
if(acpi_cntl & 0x10)
acpi->map_device(memory_window_start, memory_window_end, 0, memory_space, io_window_start, io_window_end, pmbase, io_space);
if(gpio_cntl & 0x10)
- logerror("%s: Warning: gpio range enabled at %04x-%04x\n", tag().c_str(), gpio_base, gpio_base+63);
+ logerror("%s: Warning: gpio range enabled at %04x-%04x\n", tag(), gpio_base, gpio_base+63);
UINT32 hpet = 0xfed00000 + ((gen_cntl & 0x00018000) >> 3);
- logerror("%s: Warning: hpet at %08x-%08x\n", tag().c_str(), hpet, hpet+0x3ff);
+ logerror("%s: Warning: hpet at %08x-%08x\n", tag(), hpet, hpet+0x3ff);
if(lpc_en & 0x1000)
- logerror("%s: Warning: superio at 2e-2f\n", tag().c_str());
+ logerror("%s: Warning: superio at 2e-2f\n", tag());
if(lpc_en & 0x0800)
- logerror("%s: Warning: mcu at 62/66\n", tag().c_str());
+ logerror("%s: Warning: mcu at 62/66\n", tag());
if(lpc_en & 0x0400)
- logerror("%s: Warning: mcu at 60/64\n", tag().c_str());
+ logerror("%s: Warning: mcu at 60/64\n", tag());
if(lpc_en & 0x0200)
- logerror("%s: Warning: gameport at 208-20f\n", tag().c_str());
+ logerror("%s: Warning: gameport at 208-20f\n", tag());
if(lpc_en & 0x0100)
- logerror("%s: Warning: gameport at 200-207\n", tag().c_str());
+ logerror("%s: Warning: gameport at 200-207\n", tag());
if(lpc_en & 0x0008) {
UINT16 fdc = lpc_if_fdd_lpt_range & 0x10 ? 0x370 : 0x3f0;
- logerror("%s: Warning: floppy at %04x-%04x\n", tag().c_str(), fdc, fdc+7);
+ logerror("%s: Warning: floppy at %04x-%04x\n", tag(), fdc, fdc+7);
}
if(lpc_en & 0x0004) {
static const UINT16 lpt_pos[4] = { 0x378, 0x278, 0x3bc, 0x000 };
UINT16 lpt = lpt_pos[lpc_if_fdd_lpt_range & 3];
if(lpt)
- logerror("%s: Warning: lpt at %04x-%04x %04x-%04x\n", tag().c_str(), lpt, lpt+7, lpt+0x400, lpt+0x407);
+ logerror("%s: Warning: lpt at %04x-%04x %04x-%04x\n", tag(), lpt, lpt+7, lpt+0x400, lpt+0x407);
}
static const UINT16 com_pos[8] = { 0x3f8, 0x2f8, 0x220, 0x228, 0x238, 0x2e8, 0x338, 0x3e8 };
if(lpc_en & 0x0002) {
UINT16 comb = com_pos[(lpc_if_com_range >> 4) & 7];
- logerror("%s: Warning: comb at %04x-%04x\n", tag().c_str(), comb, comb+7);
+ logerror("%s: Warning: comb at %04x-%04x\n", tag(), comb, comb+7);
}
if(lpc_en & 0x0001) {
UINT16 coma = com_pos[lpc_if_com_range & 7];
- logerror("%s: Warning: coma at %04x-%04x\n", tag().c_str(), coma, coma+7);
+ logerror("%s: Warning: coma at %04x-%04x\n", tag(), coma, coma+7);
}
rtc->map_device(memory_window_start, memory_window_end, 0, memory_space, io_window_start, io_window_end, 0, io_space);
diff --git a/src/devices/machine/i6300esb.h b/src/devices/machine/i6300esb.h
index e82a16bbfc7..325e768dbba 100644
--- a/src/devices/machine/i6300esb.h
+++ b/src/devices/machine/i6300esb.h
@@ -18,7 +18,7 @@
class i6300esb_lpc_device : public pci_device {
public:
- i6300esb_lpc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i6300esb_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual void reset_all_mappings() override;
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
@@ -144,7 +144,7 @@ private:
class i6300esb_watchdog_device : public pci_device {
public:
- i6300esb_watchdog_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i6300esb_watchdog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/i80130.cpp b/src/devices/machine/i80130.cpp
index 186551710fb..fb419a06090 100644
--- a/src/devices/machine/i80130.cpp
+++ b/src/devices/machine/i80130.cpp
@@ -130,7 +130,7 @@ machine_config_constructor i80130_device::device_mconfig_additions() const
// i80130_device - constructor
//-------------------------------------------------
-i80130_device::i80130_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i80130_device::i80130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I80130, "I80130", tag, owner, clock, "i80130", __FILE__),
m_pic(*this, "pic"),
m_pit(*this, "pit"),
diff --git a/src/devices/machine/i80130.h b/src/devices/machine/i80130.h
index 0002e8e3201..1625fd8fc45 100644
--- a/src/devices/machine/i80130.h
+++ b/src/devices/machine/i80130.h
@@ -51,7 +51,7 @@ class i80130_device : public device_t
{
public:
// construction/destruction
- i80130_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i80130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 1b0edf51f93..b3d4098398a 100644
--- a/src/devices/machine/i8155.cpp
+++ b/src/devices/machine/i8155.cpp
@@ -117,7 +117,7 @@ inline void i8155_device::timer_output()
{
m_out_to_cb(m_to);
- if (LOG) logerror("8155 '%s' Timer Output: %u\n", tag().c_str(), m_to);
+ if (LOG) logerror("8155 '%s' Timer Output: %u\n", tag(), m_to);
}
inline void i8155_device::pulse_timer_output()
@@ -170,7 +170,7 @@ inline UINT8 i8155_device::read_port(int port)
default:
// strobed mode not implemented yet
- logerror("8155 '%s' Unsupported Port C mode!\n", tag().c_str());
+ logerror("8155 '%s' Unsupported Port C mode!\n", tag());
break;
}
@@ -202,7 +202,7 @@ inline void i8155_device::write_port(int port, UINT8 data)
// i8155_device - constructor
//-------------------------------------------------
-i8155_device::i8155_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i8155_device::i8155_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8155, "8155 RIOT", tag, owner, clock, "i8155", __FILE__),
device_memory_interface(mconfig, *this),
m_in_pa_cb(*this),
@@ -292,7 +292,7 @@ void i8155_device::device_timer(emu_timer &timer, device_timer_id id, int param,
if (m_counter == 0)
{
- if (LOG) logerror("8155 '%s' Timer Count Reached\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Timer Count Reached\n", tag());
switch (m_command & COMMAND_TM_MASK)
{
@@ -300,7 +300,7 @@ void i8155_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// stop timer
m_timer->enable(0);
- if (LOG) logerror("8155 '%s' Timer Stopped\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Timer Stopped\n", tag());
break;
}
@@ -399,28 +399,28 @@ void i8155_device::register_w(int offset, UINT8 data)
case REGISTER_COMMAND:
m_command = data;
- if (LOG) logerror("8155 '%s' Port A Mode: %s\n", tag().c_str(), (data & COMMAND_PA) ? "output" : "input");
- if (LOG) logerror("8155 '%s' Port B Mode: %s\n", tag().c_str(), (data & COMMAND_PB) ? "output" : "input");
+ if (LOG) logerror("8155 '%s' Port A Mode: %s\n", tag(), (data & COMMAND_PA) ? "output" : "input");
+ if (LOG) logerror("8155 '%s' Port B Mode: %s\n", tag(), (data & COMMAND_PB) ? "output" : "input");
- if (LOG) logerror("8155 '%s' Port A Interrupt: %s\n", tag().c_str(), (data & COMMAND_IEA) ? "enabled" : "disabled");
- if (LOG) logerror("8155 '%s' Port B Interrupt: %s\n", tag().c_str(), (data & COMMAND_IEB) ? "enabled" : "disabled");
+ if (LOG) logerror("8155 '%s' Port A Interrupt: %s\n", tag(), (data & COMMAND_IEA) ? "enabled" : "disabled");
+ if (LOG) logerror("8155 '%s' Port B Interrupt: %s\n", tag(), (data & COMMAND_IEB) ? "enabled" : "disabled");
switch (data & COMMAND_PC_MASK)
{
case COMMAND_PC_ALT_1:
- if (LOG) logerror("8155 '%s' Port C Mode: Alt 1\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Port C Mode: Alt 1\n", tag());
break;
case COMMAND_PC_ALT_2:
- if (LOG) logerror("8155 '%s' Port C Mode: Alt 2\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Port C Mode: Alt 2\n", tag());
break;
case COMMAND_PC_ALT_3:
- if (LOG) logerror("8155 '%s' Port C Mode: Alt 3\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Port C Mode: Alt 3\n", tag());
break;
case COMMAND_PC_ALT_4:
- if (LOG) logerror("8155 '%s' Port C Mode: Alt 4\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Port C Mode: Alt 4\n", tag());
break;
}
@@ -432,7 +432,7 @@ void i8155_device::register_w(int offset, UINT8 data)
case COMMAND_TM_STOP:
// NOP if timer has not started, stop counting if the timer is running
- if (LOG) logerror("8155 '%s' Timer Command: Stop\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Timer Command: Stop\n", tag());
m_to = 1;
timer_output();
m_timer->enable(0);
@@ -440,11 +440,11 @@ void i8155_device::register_w(int offset, UINT8 data)
case COMMAND_TM_STOP_AFTER_TC:
// stop immediately after present TC is reached (NOP if timer has not started)
- if (LOG) logerror("8155 '%s' Timer Command: Stop after TC\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Timer Command: Stop after TC\n", tag());
break;
case COMMAND_TM_START:
- if (LOG) logerror("8155 '%s' Timer Command: Start\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Timer Command: Start\n", tag());
if (m_timer->enabled())
{
@@ -474,33 +474,33 @@ void i8155_device::register_w(int offset, UINT8 data)
case REGISTER_TIMER_LOW:
m_count_length = (m_count_length & 0xff00) | data;
- if (LOG) logerror("8155 '%s' Count Length Low: %04x\n", tag().c_str(), m_count_length);
+ if (LOG) logerror("8155 '%s' Count Length Low: %04x\n", tag(), m_count_length);
break;
case REGISTER_TIMER_HIGH:
m_count_length = (data << 8) | (m_count_length & 0xff);
- if (LOG) logerror("8155 '%s' Count Length High: %04x\n", tag().c_str(), m_count_length);
+ if (LOG) logerror("8155 '%s' Count Length High: %04x\n", tag(), m_count_length);
switch (data & TIMER_MODE_MASK)
{
case TIMER_MODE_LOW:
// puts out LOW during second half of count
- if (LOG) logerror("8155 '%s' Timer Mode: LOW\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Timer Mode: LOW\n", tag());
break;
case TIMER_MODE_SQUARE_WAVE:
// square wave, i.e. the period of the square wave equals the count length programmed with automatic reload at terminal count
- if (LOG) logerror("8155 '%s' Timer Mode: Square wave\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Timer Mode: Square wave\n", tag());
break;
case TIMER_MODE_SINGLE_PULSE:
// single pulse upon TC being reached
- if (LOG) logerror("8155 '%s' Timer Mode: Single pulse\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Timer Mode: Single pulse\n", tag());
break;
case TIMER_MODE_AUTOMATIC_RELOAD:
// automatic reload, i.e. single pulse every time TC is reached
- if (LOG) logerror("8155 '%s' Timer Mode: Automatic reload\n", tag().c_str());
+ if (LOG) logerror("8155 '%s' Timer Mode: Automatic reload\n", tag());
break;
}
break;
diff --git a/src/devices/machine/i8155.h b/src/devices/machine/i8155.h
index aaab2e0d067..085ffe15196 100644
--- a/src/devices/machine/i8155.h
+++ b/src/devices/machine/i8155.h
@@ -75,7 +75,7 @@ class i8155_device : public device_t,
{
public:
// construction/destruction
- i8155_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8155_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 14c1f28483d..0ece5f05c1c 100644
--- a/src/devices/machine/i8212.cpp
+++ b/src/devices/machine/i8212.cpp
@@ -30,7 +30,7 @@ const device_type I8212 = &device_creator<i8212_device>;
// i8212_device - constructor
//-------------------------------------------------
-i8212_device::i8212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+i8212_device::i8212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, I8212, "I8212", tag, owner, clock, "i8212", __FILE__),
m_write_irq(*this),
m_read_di(*this),
@@ -84,7 +84,7 @@ READ8_MEMBER( i8212_device::read )
// clear interrupt line
m_write_irq(CLEAR_LINE);
- if (LOG) logerror("I8212 '%s' INT: %u\n", tag().c_str(), CLEAR_LINE);
+ if (LOG) logerror("I8212 '%s' INT: %u\n", tag(), CLEAR_LINE);
return m_data;
}
@@ -110,7 +110,7 @@ WRITE8_MEMBER( i8212_device::write )
WRITE_LINE_MEMBER( i8212_device::md_w )
{
- if (LOG) logerror("I8212 '%s' Mode: %s\n", tag().c_str(), state ? "output" : "input");
+ if (LOG) logerror("I8212 '%s' Mode: %s\n", tag(), state ? "output" : "input");
m_md = state;
}
@@ -122,7 +122,7 @@ WRITE_LINE_MEMBER( i8212_device::md_w )
WRITE_LINE_MEMBER( i8212_device::stb_w )
{
- if (LOG) logerror("I8212 '%s' STB: %u\n", tag().c_str(), state);
+ if (LOG) logerror("I8212 '%s' STB: %u\n", tag(), state);
if (m_md == I8212_MODE_INPUT)
{
@@ -134,7 +134,7 @@ WRITE_LINE_MEMBER( i8212_device::stb_w )
// assert interrupt line
m_write_irq(ASSERT_LINE);
- if (LOG) logerror("I8212 '%s' INT: %u\n", tag().c_str(), ASSERT_LINE);
+ if (LOG) logerror("I8212 '%s' INT: %u\n", tag(), ASSERT_LINE);
}
}
diff --git a/src/devices/machine/i8212.h b/src/devices/machine/i8212.h
index 110c6adfd40..ea62ce9eefb 100644
--- a/src/devices/machine/i8212.h
+++ b/src/devices/machine/i8212.h
@@ -67,7 +67,7 @@ class i8212_device : public device_t
{
public:
// construction/destruction
- i8212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 a786728e2f4..9a7cf9ecd1c 100644
--- a/src/devices/machine/i8214.cpp
+++ b/src/devices/machine/i8214.cpp
@@ -33,7 +33,7 @@ const device_type I8214 = &device_creator<i8214_device>;
inline void i8214_device::trigger_interrupt(int level)
{
- if (LOG) logerror("I8214 '%s' Interrupt Level %u\n", tag().c_str(), level);
+ if (LOG) logerror("I8214 '%s' Interrupt Level %u\n", tag(), level);
m_a = level;
@@ -88,7 +88,7 @@ inline void i8214_device::check_interrupt()
// i8214_device - constructor
//-------------------------------------------------
-i8214_device::i8214_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+i8214_device::i8214_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, I8214, "I8214", tag, owner, clock, "i8214", __FILE__),
m_write_irq(*this),
m_write_enlg(*this)
@@ -127,7 +127,7 @@ UINT8 i8214_device::a_r()
{
UINT8 a = m_a & 0x07;
- if (LOG) logerror("I8214 '%s' A: %01x\n", tag().c_str(), a);
+ if (LOG) logerror("I8214 '%s' A: %01x\n", tag(), a);
return a;
}
@@ -141,7 +141,7 @@ void i8214_device::b_w(UINT8 data)
{
m_b = data & 0x07;
- if (LOG) logerror("I8214 '%s' B: %01x\n", tag().c_str(), m_b);
+ if (LOG) logerror("I8214 '%s' B: %01x\n", tag(), m_b);
// enable interrupts
m_int_dis = 0;
@@ -159,7 +159,7 @@ void i8214_device::b_w(UINT8 data)
void i8214_device::r_w(UINT8 data)
{
- if (LOG) logerror("I8214 '%s' R: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("I8214 '%s' R: %02x\n", tag(), data);
m_r = data;
@@ -173,7 +173,7 @@ void i8214_device::r_w(UINT8 data)
WRITE_LINE_MEMBER( i8214_device::sgs_w )
{
- if (LOG) logerror("I8214 '%s' SGS: %u\n", tag().c_str(), state);
+ if (LOG) logerror("I8214 '%s' SGS: %u\n", tag(), state);
m_sgs = state;
@@ -187,7 +187,7 @@ WRITE_LINE_MEMBER( i8214_device::sgs_w )
WRITE_LINE_MEMBER( i8214_device::etlg_w )
{
- if (LOG) logerror("I8214 '%s' ETLG: %u\n", tag().c_str(), state);
+ if (LOG) logerror("I8214 '%s' ETLG: %u\n", tag(), state);
m_etlg = state;
}
@@ -199,7 +199,7 @@ WRITE_LINE_MEMBER( i8214_device::etlg_w )
WRITE_LINE_MEMBER( i8214_device::inte_w )
{
- if (LOG) logerror("I8214 '%s' INTE: %u\n", tag().c_str(), state);
+ if (LOG) logerror("I8214 '%s' INTE: %u\n", tag(), state);
m_inte = state;
}
diff --git a/src/devices/machine/i8214.h b/src/devices/machine/i8214.h
index d54726b83c9..8a9c631bc76 100644
--- a/src/devices/machine/i8214.h
+++ b/src/devices/machine/i8214.h
@@ -52,7 +52,7 @@ class i8214_device : public device_t
{
public:
// construction/destruction
- i8214_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8214_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 72288c4d673..f63159b5739 100644
--- a/src/devices/machine/i8243.cpp
+++ b/src/devices/machine/i8243.cpp
@@ -22,7 +22,7 @@ const device_type I8243 = &device_creator<i8243_device>;
// i8243_device - constructor
//-------------------------------------------------
-i8243_device::i8243_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i8243_device::i8243_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8243, "8243 I/O Expander", tag, owner, clock, "i8243", __FILE__), m_p2out(0), m_p2(0), m_opcode(0), m_prog(0),
m_readhandler(*this),
m_writehandler(*this)
diff --git a/src/devices/machine/i8243.h b/src/devices/machine/i8243.h
index 169564f1d27..5157056491d 100644
--- a/src/devices/machine/i8243.h
+++ b/src/devices/machine/i8243.h
@@ -41,7 +41,7 @@ class i8243_device : public device_t
{
public:
// construction/destruction
- i8243_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8243_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<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 f43c5fb2cab..8baf4bc57ec 100644
--- a/src/devices/machine/i8251.cpp
+++ b/src/devices/machine/i8251.cpp
@@ -37,7 +37,7 @@ const device_type V53_SCU = &device_creator<v53_scu_device>;
// i8251_device - constructor
//-------------------------------------------------
-i8251_device::i8251_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
+i8251_device::i8251_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_serial_interface(mconfig, *this),
m_txd_handler(*this),
@@ -55,7 +55,7 @@ i8251_device::i8251_device(const machine_config &mconfig, device_type type, cons
{
}
-i8251_device::i8251_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i8251_device::i8251_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8251, "8251 USART", tag, owner, clock, "i8251", __FILE__),
device_serial_interface(mconfig, *this),
m_txd_handler(*this),
@@ -73,7 +73,7 @@ i8251_device::i8251_device(const machine_config &mconfig, std::string tag, devic
{
}
-v53_scu_device::v53_scu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+v53_scu_device::v53_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: i8251_device(mconfig, V53_SCU, "V53 SCU", tag, owner, clock, "v53_scu")
{
}
diff --git a/src/devices/machine/i8251.h b/src/devices/machine/i8251.h
index c1f650a9db6..7a2f7ec55fd 100644
--- a/src/devices/machine/i8251.h
+++ b/src/devices/machine/i8251.h
@@ -42,8 +42,8 @@ class i8251_device : public device_t,
{
public:
// construction/destruction
- i8251_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
- i8251_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8251_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ i8251_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<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, std::string tag, device_t *owner, UINT32 clock);
+ v53_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/machine/i82541.cpp b/src/devices/machine/i82541.cpp
index eb114c170db..8e5a1467183 100644
--- a/src/devices/machine/i82541.cpp
+++ b/src/devices/machine/i82541.cpp
@@ -13,7 +13,7 @@ ADDRESS_MAP_END
DEVICE_ADDRESS_MAP_START(registers_io_map, 32, i82541_device)
ADDRESS_MAP_END
-i82541_device::i82541_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i82541_device::i82541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I82541, "I82541 ethernet controller", tag, owner, clock, "i82541", __FILE__)
{
}
diff --git a/src/devices/machine/i82541.h b/src/devices/machine/i82541.h
index 02bc66fc459..475a94dc2be 100644
--- a/src/devices/machine/i82541.h
+++ b/src/devices/machine/i82541.h
@@ -12,7 +12,7 @@
class i82541_device : public pci_device {
public:
- i82541_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i82541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/i8255.cpp b/src/devices/machine/i8255.cpp
index df807a54a98..7e6a769f904 100644
--- a/src/devices/machine/i8255.cpp
+++ b/src/devices/machine/i8255.cpp
@@ -104,7 +104,7 @@ inline void i8255_device::check_interrupt(int port)
inline void i8255_device::set_ibf(int port, int state)
{
- if (LOG) logerror("I8255 '%s' Port %c IBF: %u\n", tag().c_str(), 'A' + port, state);
+ if (LOG) logerror("I8255 '%s' Port %c IBF: %u\n", tag(), 'A' + port, state);
m_ibf[port] = state;
@@ -118,7 +118,7 @@ inline void i8255_device::set_ibf(int port, int state)
inline void i8255_device::set_obf(int port, int state)
{
- if (LOG) logerror("I8255 '%s' Port %c OBF: %u\n", tag().c_str(), 'A' + port, state);
+ if (LOG) logerror("I8255 '%s' Port %c OBF: %u\n", tag(), 'A' + port, state);
m_obf[port] = state;
@@ -132,7 +132,7 @@ inline void i8255_device::set_obf(int port, int state)
inline void i8255_device::set_inte(int port, int state)
{
- if (LOG) logerror("I8255 '%s' Port %c INTE: %u\n", tag().c_str(), 'A' + port, state);
+ if (LOG) logerror("I8255 '%s' Port %c INTE: %u\n", tag(), 'A' + port, state);
m_inte[port] = state;
@@ -146,7 +146,7 @@ inline void i8255_device::set_inte(int port, int state)
inline void i8255_device::set_inte1(int state)
{
- if (LOG) logerror("I8255 '%s' Port A INTE1: %u\n", tag().c_str(), state);
+ if (LOG) logerror("I8255 '%s' Port A INTE1: %u\n", tag(), state);
m_inte1 = state;
@@ -160,7 +160,7 @@ inline void i8255_device::set_inte1(int state)
inline void i8255_device::set_inte2(int state)
{
- if (LOG) logerror("I8255 '%s' Port A INTE2: %u\n", tag().c_str(), state);
+ if (LOG) logerror("I8255 '%s' Port A INTE2: %u\n", tag(), state);
m_inte2 = state;
@@ -174,7 +174,7 @@ inline void i8255_device::set_inte2(int state)
inline void i8255_device::set_intr(int port, int state)
{
- if (LOG) logerror("I8255 '%s' Port %c INTR: %u\n", tag().c_str(), 'A' + port, state);
+ if (LOG) logerror("I8255 '%s' Port %c INTR: %u\n", tag(), 'A' + port, state);
m_intr[port] = state;
@@ -257,7 +257,7 @@ inline int i8255_device::port_c_upper_mode()
// i8255_device - constructor
//-------------------------------------------------
-i8255_device::i8255_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i8255_device::i8255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8255, "8255 PPI", tag, owner, clock, "i8255", __FILE__),
m_in_pa_cb(*this),
m_in_pb_cb(*this),
@@ -660,12 +660,12 @@ void i8255_device::set_mode(UINT8 data)
if (LOG)
{
- logerror("I8255 '%s' Group A Mode: %u\n", tag().c_str(), group_mode(GROUP_A));
- logerror("I8255 '%s' Port A Mode: %s\n", tag().c_str(), (port_mode(PORT_A) == MODE_OUTPUT) ? "output" : "input");
- logerror("I8255 '%s' Port C Upper Mode: %s\n", tag().c_str(), (port_c_upper_mode() == MODE_OUTPUT) ? "output" : "input");
- logerror("I8255 '%s' Group B Mode: %u\n", tag().c_str(), group_mode(GROUP_B));
- logerror("I8255 '%s' Port B Mode: %s\n", tag().c_str(), (port_mode(PORT_B) == MODE_OUTPUT) ? "output" : "input");
- logerror("I8255 '%s' Port C Lower Mode: %s\n", tag().c_str(), (port_c_lower_mode() == MODE_OUTPUT) ? "output" : "input");
+ logerror("I8255 '%s' Group A Mode: %u\n", tag(), group_mode(GROUP_A));
+ logerror("I8255 '%s' Port A Mode: %s\n", tag(), (port_mode(PORT_A) == MODE_OUTPUT) ? "output" : "input");
+ logerror("I8255 '%s' Port C Upper Mode: %s\n", tag(), (port_c_upper_mode() == MODE_OUTPUT) ? "output" : "input");
+ logerror("I8255 '%s' Group B Mode: %u\n", tag(), group_mode(GROUP_B));
+ logerror("I8255 '%s' Port B Mode: %s\n", tag(), (port_mode(PORT_B) == MODE_OUTPUT) ? "output" : "input");
+ logerror("I8255 '%s' Port C Lower Mode: %s\n", tag(), (port_c_lower_mode() == MODE_OUTPUT) ? "output" : "input");
}
// group B
@@ -777,7 +777,7 @@ READ8_MEMBER( i8255_device::read )
case MODE_1: data = read_mode1(PORT_A); break;
case MODE_2: data = read_mode2(); break;
}
- if (LOG) logerror("I8255 '%s' Port A Read: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("I8255 '%s' Port A Read: %02x\n", tag(), data);
break;
case PORT_B:
@@ -786,17 +786,17 @@ READ8_MEMBER( i8255_device::read )
case MODE_0: data = read_mode0(PORT_B); break;
case MODE_1: data = read_mode1(PORT_B); break;
}
- if (LOG) logerror("I8255 '%s' Port B Read: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("I8255 '%s' Port B Read: %02x\n", tag(), data);
break;
case PORT_C:
data = read_pc();
- if (LOG) logerror("I8255 '%s' Port C Read: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("I8255 '%s' Port C Read: %02x\n", tag(), data);
break;
case CONTROL:
data = m_control;
- if (LOG) logerror("I8255 '%s' Mode Control Word Read: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("I8255 '%s' Mode Control Word Read: %02x\n", tag(), data);
break;
}
@@ -813,7 +813,7 @@ WRITE8_MEMBER( i8255_device::write )
switch (offset & 0x03)
{
case PORT_A:
- if (LOG) logerror("I8255 '%s' Port A Write: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("I8255 '%s' Port A Write: %02x\n", tag(), data);
switch (group_mode(GROUP_A))
{
@@ -824,7 +824,7 @@ WRITE8_MEMBER( i8255_device::write )
break;
case PORT_B:
- if (LOG) logerror("I8255 '%s' Port B Write: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("I8255 '%s' Port B Write: %02x\n", tag(), data);
switch (group_mode(GROUP_B))
{
@@ -834,7 +834,7 @@ WRITE8_MEMBER( i8255_device::write )
break;
case PORT_C:
- if (LOG) logerror("I8255 '%s' Port C Write: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("I8255 '%s' Port C Write: %02x\n", tag(), data);
m_output[PORT_C] = data;
output_pc();
@@ -843,7 +843,7 @@ WRITE8_MEMBER( i8255_device::write )
case CONTROL:
if (data & CONTROL_MODE_SET)
{
- if (LOG) logerror("I8255 '%s' Mode Control Word: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("I8255 '%s' Mode Control Word: %02x\n", tag(), data);
set_mode(data);
}
@@ -852,7 +852,7 @@ WRITE8_MEMBER( i8255_device::write )
int bit = (data >> 1) & 0x07;
int state = BIT(data, 0);
- if (LOG) logerror("I8255 '%s' %s Port C Bit %u\n", tag().c_str(), state ? "Set" : "Reset", bit);
+ if (LOG) logerror("I8255 '%s' %s Port C Bit %u\n", tag(), state ? "Set" : "Reset", bit);
set_pc_bit(bit, state);
}
@@ -928,7 +928,7 @@ WRITE_LINE_MEMBER( i8255_device::pc2_w )
// port B acknowledge
if (!m_obf[PORT_B] && !state)
{
- if (LOG) logerror("I8255 '%s' Port B Acknowledge\n", tag().c_str());
+ if (LOG) logerror("I8255 '%s' Port B Acknowledge\n", tag());
// clear output buffer flag
set_obf(PORT_B, 1);
@@ -939,7 +939,7 @@ WRITE_LINE_MEMBER( i8255_device::pc2_w )
// port B strobe
if (!m_ibf[PORT_B] && !state)
{
- if (LOG) logerror("I8255 '%s' Port B Strobe\n", tag().c_str());
+ if (LOG) logerror("I8255 '%s' Port B Strobe\n", tag());
// read port into latch
m_input[PORT_B] = m_in_pb_cb(0);
@@ -963,7 +963,7 @@ WRITE_LINE_MEMBER( i8255_device::pc4_w )
// port A strobe
if (!m_ibf[PORT_A] && !state)
{
- if (LOG) logerror("I8255 '%s' Port A Strobe\n", tag().c_str());
+ if (LOG) logerror("I8255 '%s' Port A Strobe\n", tag());
// read port into latch
m_input[PORT_A] = m_in_pa_cb(0);
@@ -986,7 +986,7 @@ WRITE_LINE_MEMBER( i8255_device::pc6_w )
// port A acknowledge
if (!m_obf[PORT_A] && !state)
{
- if (LOG) logerror("I8255 '%s' Port A Acknowledge\n", tag().c_str());
+ if (LOG) logerror("I8255 '%s' Port A Acknowledge\n", tag());
// clear output buffer flag
set_obf(PORT_A, 1);
diff --git a/src/devices/machine/i8255.h b/src/devices/machine/i8255.h
index 3ea41d61cc0..1fa41e727a5 100644
--- a/src/devices/machine/i8255.h
+++ b/src/devices/machine/i8255.h
@@ -68,7 +68,7 @@ class i8255_device : public device_t
{
public:
// construction/destruction
- i8255_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 1a8ab36ad85..a54d21697cc 100644
--- a/src/devices/machine/i8257.cpp
+++ b/src/devices/machine/i8257.cpp
@@ -68,7 +68,7 @@ enum
inline void i8257_device::dma_request(int channel, int state)
{
- if (LOG) logerror("I8257 '%s' Channel %u DMA Request: %u\n", tag().c_str(), channel, state);
+ if (LOG) logerror("I8257 '%s' Channel %u DMA Request: %u\n", tag(), channel, state);
if (state)
{
@@ -183,7 +183,7 @@ inline void i8257_device::dma_write()
case MODE_TRANSFER_VERIFY: {
UINT8 v1 = m_in_memr_cb(offset);
if(0 && m_temp != v1)
- logerror("%s: verify error %02x vs. %02x\n", tag().c_str(), m_temp, v1);
+ logerror("%s: verify error %02x vs. %02x\n", tag(), m_temp, v1);
break;
}
@@ -257,7 +257,7 @@ inline void i8257_device::advance()
// i8257_device - constructor
//-------------------------------------------------
-i8257_device::i8257_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i8257_device::i8257_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8257, "Intel 8257", tag, owner, clock, "i8257", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
@@ -597,7 +597,7 @@ WRITE8_MEMBER( i8257_device::write )
{
m_transfer_mode = data;
- if (LOG) logerror("I8257 '%s' Command Register: %02x\n", tag().c_str(), m_transfer_mode);
+ if (LOG) logerror("I8257 '%s' Command Register: %02x\n", tag(), m_transfer_mode);
}
trigger(1);
}
@@ -609,7 +609,7 @@ WRITE8_MEMBER( i8257_device::write )
WRITE_LINE_MEMBER( i8257_device::hlda_w )
{
- if (LOG) logerror("I8257 '%s' Hold Acknowledge: %u\n", tag().c_str(), state);
+ if (LOG) logerror("I8257 '%s' Hold Acknowledge: %u\n", tag(), state);
m_hack = state;
trigger(1);
@@ -622,7 +622,7 @@ WRITE_LINE_MEMBER( i8257_device::hlda_w )
WRITE_LINE_MEMBER( i8257_device::ready_w )
{
- if (LOG) logerror("I8257 '%s' Ready: %u\n", tag().c_str(), state);
+ if (LOG) logerror("I8257 '%s' Ready: %u\n", tag(), state);
m_ready = state;
}
diff --git a/src/devices/machine/i8257.h b/src/devices/machine/i8257.h
index 1d313d935d2..ad02ece924e 100644
--- a/src/devices/machine/i8257.h
+++ b/src/devices/machine/i8257.h
@@ -101,7 +101,7 @@ class i8257_device : public device_t,
{
public:
// construction/destruction
- i8257_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8257_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/i8271.cpp b/src/devices/machine/i8271.cpp
index 71753101b7c..cd8c0faf5bf 100644
--- a/src/devices/machine/i8271.cpp
+++ b/src/devices/machine/i8271.cpp
@@ -5,7 +5,7 @@
const device_type I8271 = &device_creator<i8271_device>;
-i8271_device::i8271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i8271_device::i8271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8271, "Intel 8271", tag, owner, clock, "i8271", __FILE__), ready_connected(false), mode(0), main_phase(0),
intrq_cb(*this),
drq_cb(*this),
@@ -763,7 +763,7 @@ void i8271_device::start_command(int cmd)
}
case C_SPECIFY:
logerror("%s: command specify %02x %02x %02x %02x\n",
- tag().c_str(), command[1],
+ tag(), command[1],
command[2], command[3], command[4]);
switch(command[1]) {
case 0x0d:
@@ -885,7 +885,7 @@ void i8271_device::start_command(int cmd)
void i8271_device::command_end(floppy_info &fi, bool data_completion)
{
- logerror("%s: command done (%s) - %02x\n", tag().c_str(), data_completion ? "data" : "seek", rr);
+ logerror("%s: command done (%s) - %02x\n", tag(), data_completion ? "data" : "seek", rr);
fi.main_state = fi.sub_state = IDLE;
main_phase = PHASE_RESULT;
set_irq(true);
@@ -893,7 +893,7 @@ void i8271_device::command_end(floppy_info &fi, bool data_completion)
void i8271_device::recalibrate_start(floppy_info &fi)
{
- logerror("%s: command recalibrate\n", tag().c_str());
+ logerror("%s: command recalibrate\n", tag());
fi.main_state = RECALIBRATE;
fi.sub_state = SEEK_WAIT_STEP_TIME_DONE;
fi.dir = 1;
@@ -903,7 +903,7 @@ void i8271_device::recalibrate_start(floppy_info &fi)
void i8271_device::seek_start(floppy_info &fi)
{
- logerror("%s: command seek %d\n", tag().c_str(), command[1]);
+ logerror("%s: command seek %d\n", tag(), command[1]);
fi.main_state = SEEK;
fi.sub_state = SEEK_WAIT_STEP_TIME_DONE;
fi.dir = fi.pcn > command[1] ? 1 : 0;
@@ -984,7 +984,7 @@ void i8271_device::read_data_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command read%s data%s cmd=%02x crn=(%d, %d, %d) len=%02x rate=%d\n",
- tag().c_str(),
+ tag(),
command[0] & 0x04 ? " deleted" : "",
command[0] & 0x01 ? " multi" : "",
command[0],
@@ -1013,7 +1013,7 @@ void i8271_device::scan_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command scan%s data%s cmd=%02x crn=(%d, %d, %d) len=%02x rate=%d\n",
- tag().c_str(),
+ tag(),
command[0] & 0x04 ? " deleted" : "",
command[0] & 0x01 ? " multi" : "",
command[0],
@@ -1044,7 +1044,7 @@ void i8271_device::verify_data_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command verify%s data%s cmd=%02x crn=(%d, %d, %d) len=%02x rate=%d\n",
- tag().c_str(),
+ tag(),
command[0] & 0x04 ? " deleted" : "",
command[0] & 0x01 ? " multi" : "",
command[0],
@@ -1129,7 +1129,7 @@ void i8271_device::read_data_continue(floppy_info &fi)
return;
}
logerror("%s: reading sector %02x %02x %02x %02x\n",
- tag().c_str(),
+ tag(),
cur_live.idbuf[0],
cur_live.idbuf[1],
cur_live.idbuf[2],
@@ -1183,7 +1183,7 @@ void i8271_device::write_data_start(floppy_info &fi)
fi.main_state = WRITE_DATA;
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command write%s data%s cmd=%02x crn=(%d, %d, %d) len=%02x rate=%d\n",
- tag().c_str(),
+ tag(),
command[0] & 0x04 ? " deleted" : "",
command[0] & 0x01 ? " multi" : "",
command[0],
@@ -1314,7 +1314,7 @@ void i8271_device::format_track_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command format track c=%02x n=%02x sc=%02x gap3=%02x gap5=%02x gap1=%02x\n",
- tag().c_str(),
+ tag(),
command[1], command[3] >> 5, command[3] & 0x1f, command[2], command[4], command[5]);
rr = ERR_NONE;
@@ -1381,7 +1381,7 @@ void i8271_device::format_track_continue(floppy_info &fi)
return;
case WAIT_INDEX_DONE:
- logerror("%s: index found, writing track\n", tag().c_str());
+ logerror("%s: index found, writing track\n", tag());
fi.sub_state = TRACK_DONE;
cur_live.pll.start_writing(machine().time());
set_drq(true);
@@ -1405,7 +1405,7 @@ void i8271_device::read_id_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
logerror("%s: command read id, rate=%d\n",
- tag().c_str(),
+ tag(),
cur_rate);
rr = ERR_NONE;
@@ -1688,7 +1688,7 @@ void i8271_device::live_write_fm(UINT8 fm)
bool i8271_device::sector_matches() const
{
if(0)
- logerror("%s: matching %02x %02x %02x - %02x %02x %02x\n", tag().c_str(),
+ logerror("%s: matching %02x %02x %02x - %02x %02x %02x\n", tag(),
cur_live.idbuf[0], cur_live.idbuf[2], cur_live.idbuf[3],
command[1], command[2], command[3] >> 5);
return
diff --git a/src/devices/machine/i8271.h b/src/devices/machine/i8271.h
index eff03849a42..e4409bed389 100644
--- a/src/devices/machine/i8271.h
+++ b/src/devices/machine/i8271.h
@@ -26,7 +26,7 @@
class i8271_device : public device_t
{
public:
- i8271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~i8271_device() {}
template<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 99b4e7388a0..725d1aa4827 100644
--- a/src/devices/machine/i8279.cpp
+++ b/src/devices/machine/i8279.cpp
@@ -89,7 +89,7 @@ const device_type I8279 = &device_creator<i8279_device>;
// i8279_device - constructor
//-------------------------------------------------
-i8279_device::i8279_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i8279_device::i8279_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8279, "8279 KDC", tag, owner, clock, "i8279", __FILE__),
m_out_irq_cb(*this),
m_out_sl_cb(*this),
@@ -440,7 +440,7 @@ WRITE8_MEMBER( i8279_device::cmd_w )
switch (cmd)
{
case 0:
- if (LOG) logerror("I8279 '%s' kb mode %x, display mode %x\n", tag().c_str(), data & 7, (data>>3) & 3);
+ if (LOG) logerror("I8279 '%s' kb mode %x, display mode %x\n", tag(), data & 7, (data>>3) & 3);
break;
case 1:
if (data > 1)
@@ -455,7 +455,7 @@ WRITE8_MEMBER( i8279_device::cmd_w )
{
m_autoinc = BIT(data, 4);
m_s_ram_ptr = data & 7;
- if (LOG) logerror("I8279 '%s' selct sensor row %x, AI %d\n", tag().c_str(), m_s_ram_ptr, m_autoinc);
+ if (LOG) logerror("I8279 '%s' selct sensor row %x, AI %d\n", tag(), m_s_ram_ptr, m_autoinc);
}
break;
case 3:
@@ -468,7 +468,7 @@ WRITE8_MEMBER( i8279_device::cmd_w )
m_autoinc = BIT(data, 4);
break;
case 6:
- if (LOG) logerror("I8279 '%s' clear cmd %x\n", tag().c_str(), data);
+ if (LOG) logerror("I8279 '%s' clear cmd %x\n", tag(), data);
clear_display();
break;
}
diff --git a/src/devices/machine/i8279.h b/src/devices/machine/i8279.h
index 930a68bf953..3da46da3121 100644
--- a/src/devices/machine/i8279.h
+++ b/src/devices/machine/i8279.h
@@ -74,7 +74,7 @@ class i8279_device : public device_t
{
public:
// construction/destruction
- i8279_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8279_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 0cace54a7db..58f8b3264c9 100644
--- a/src/devices/machine/i82875p.cpp
+++ b/src/devices/machine/i82875p.cpp
@@ -41,12 +41,12 @@ DEVICE_ADDRESS_MAP_START(config_map, 32, i82875p_host_device)
AM_INHERIT_FROM(pci_host_device::config_map)
ADDRESS_MAP_END
-i82875p_host_device::i82875p_host_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i82875p_host_device::i82875p_host_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_host_device(mconfig, I82875P_HOST, "I82875P Northbridge", tag, owner, clock, "i82875p_host", __FILE__)
{
}
-void i82875p_host_device::set_cpu_tag(std::string _cpu_tag)
+void i82875p_host_device::set_cpu_tag(const char *_cpu_tag)
{
cpu_tag = _cpu_tag;
}
@@ -90,7 +90,7 @@ READ8_MEMBER( i82875p_host_device::agpm_r)
WRITE8_MEMBER( i82875p_host_device::agpm_w)
{
agpm = data;
- logerror("%s: agpm = %02x\n", tag().c_str(), agpm);
+ logerror("%s: agpm = %02x\n", tag(), agpm);
}
READ8_MEMBER( i82875p_host_device::gc_r)
@@ -126,7 +126,7 @@ READ8_MEMBER( i82875p_host_device::fpllcont_r)
WRITE8_MEMBER( i82875p_host_device::fpllcont_w)
{
fpllcont = data;
- logerror("%s: fpllcont = %02x\n", tag().c_str(), data);
+ logerror("%s: fpllcont = %02x\n", tag(), data);
}
READ8_MEMBER( i82875p_host_device::pam_r)
@@ -137,7 +137,7 @@ READ8_MEMBER( i82875p_host_device::pam_r)
WRITE8_MEMBER( i82875p_host_device::pam_w)
{
pam[offset] = data;
- logerror("%s: pam[%d] = %02x\n", tag().c_str(), offset, data);
+ logerror("%s: pam[%d] = %02x\n", tag(), offset, data);
remap_cb();
}
@@ -150,7 +150,7 @@ WRITE8_MEMBER( i82875p_host_device::smram_w)
{
if(!(smram & 0x10))
smram = (data & 0xfe) | 0x02;
- logerror("%s: smram = %02x\n", tag().c_str(), smram);
+ logerror("%s: smram = %02x\n", tag(), smram);
remap_cb();
}
@@ -163,7 +163,7 @@ WRITE8_MEMBER( i82875p_host_device::esmramc_w)
{
if(!(smram & 0x10))
esmramc = (data & 0x87) | 0x38;
- logerror("%s: esmramc = %02x\n", tag().c_str(), smram);
+ logerror("%s: esmramc = %02x\n", tag(), smram);
remap_cb();
}
@@ -190,7 +190,7 @@ READ32_MEMBER( i82875p_host_device::agpctrl_r)
WRITE32_MEMBER(i82875p_host_device::agpctrl_w)
{
COMBINE_DATA(&agpctrl);
- logerror("%s: agpctrl = %08x\n", tag().c_str(), agpctrl);
+ logerror("%s: agpctrl = %08x\n", tag(), agpctrl);
}
READ8_MEMBER( i82875p_host_device::apsize_r)
@@ -201,7 +201,7 @@ READ8_MEMBER( i82875p_host_device::apsize_r)
WRITE8_MEMBER( i82875p_host_device::apsize_w)
{
apsize = data;
- logerror("%s: apsize = %02x\n", tag().c_str(), apsize);
+ logerror("%s: apsize = %02x\n", tag(), apsize);
}
READ32_MEMBER( i82875p_host_device::attbase_r)
@@ -212,7 +212,7 @@ READ32_MEMBER( i82875p_host_device::attbase_r)
WRITE32_MEMBER(i82875p_host_device::attbase_w)
{
COMBINE_DATA(&attbase);
- logerror("%s: attbase = %08x\n", tag().c_str(), attbase);
+ logerror("%s: attbase = %08x\n", tag(), attbase);
}
READ8_MEMBER( i82875p_host_device::amtt_r)
@@ -244,7 +244,7 @@ WRITE16_MEMBER(i82875p_host_device::toud_w)
{
COMBINE_DATA(&toud);
toud &= ~7;
- logerror("%s: toud = %08x\n", tag().c_str(), toud << 16);
+ logerror("%s: toud = %08x\n", tag(), toud << 16);
remap_cb();
}
@@ -426,7 +426,7 @@ void i82875p_host_device::map_extra(UINT64 memory_window_start, UINT64 memory_wi
}
-i82875p_agp_device::i82875p_agp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i82875p_agp_device::i82875p_agp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: agp_bridge_device(mconfig, I82875P_AGP, "I82875P AGP Bridge", tag, owner, clock, "i82875p_agp", __FILE__)
{
}
@@ -449,7 +449,7 @@ DEVICE_ADDRESS_MAP_START(overflow_map, 32, i82875p_overflow_device)
ADDRESS_MAP_END
-i82875p_overflow_device::i82875p_overflow_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i82875p_overflow_device::i82875p_overflow_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I82875P_OVERFLOW, "I82875P Configuration Overflow", tag, owner, clock, "i82875p_overflow", __FILE__)
{
}
@@ -478,7 +478,7 @@ READ8_MEMBER (i82875p_overflow_device::dram_row_boundary_r)
WRITE8_MEMBER (i82875p_overflow_device::dram_row_boundary_w)
{
dram_row_boundary[offset] = data;
- logerror("%s: dram_row_boundary_w %d, %02x\n", tag().c_str(), offset, data);
+ logerror("%s: dram_row_boundary_w %d, %02x\n", tag(), offset, data);
}
READ8_MEMBER (i82875p_overflow_device::dram_row_attribute_r)
@@ -489,7 +489,7 @@ READ8_MEMBER (i82875p_overflow_device::dram_row_attribute_r)
WRITE8_MEMBER (i82875p_overflow_device::dram_row_attribute_w)
{
dram_row_attribute[offset] = data;
- logerror("%s: dram_row_attribute_w %d, %02x\n", tag().c_str(), offset, data);
+ logerror("%s: dram_row_attribute_w %d, %02x\n", tag(), offset, data);
}
READ32_MEMBER (i82875p_overflow_device::dram_timing_r)
@@ -500,7 +500,7 @@ READ32_MEMBER (i82875p_overflow_device::dram_timing_r)
WRITE32_MEMBER(i82875p_overflow_device::dram_timing_w)
{
COMBINE_DATA(&dram_timing);
- logerror("%s: dram_timing_w %08x\n", tag().c_str(), dram_timing);
+ logerror("%s: dram_timing_w %08x\n", tag(), dram_timing);
}
READ32_MEMBER (i82875p_overflow_device::dram_controller_mode_r)
@@ -511,5 +511,5 @@ READ32_MEMBER (i82875p_overflow_device::dram_controller_mode_r)
WRITE32_MEMBER(i82875p_overflow_device::dram_controller_mode_w)
{
COMBINE_DATA(&dram_controller_mode);
- logerror("%s: dram_controller_mode_w %08x\n", tag().c_str(), dram_controller_mode);
+ logerror("%s: dram_controller_mode_w %08x\n", tag(), dram_controller_mode);
}
diff --git a/src/devices/machine/i82875p.h b/src/devices/machine/i82875p.h
index 7b437f53d6e..4f7723e64a7 100644
--- a/src/devices/machine/i82875p.h
+++ b/src/devices/machine/i82875p.h
@@ -20,9 +20,9 @@
class i82875p_host_device : public pci_host_device {
public:
- i82875p_host_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i82875p_host_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- void set_cpu_tag(std::string tag);
+ void set_cpu_tag(const char *tag);
void set_ram_size(int ram_size);
virtual void reset_all_mappings() override;
@@ -85,7 +85,7 @@ protected:
private:
DECLARE_ADDRESS_MAP(agp_translation_map, 32);
- std::string cpu_tag;
+ const char *cpu_tag;
int ram_size;
cpu_device *cpu;
std::vector<UINT32> ram;
@@ -98,7 +98,7 @@ private:
class i82875p_agp_device : public agp_bridge_device {
public:
- i82875p_agp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i82875p_agp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -107,7 +107,7 @@ protected:
class i82875p_overflow_device : public pci_device {
public:
- i82875p_overflow_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i82875p_overflow_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER (dram_row_boundary_r);
diff --git a/src/devices/machine/i8355.cpp b/src/devices/machine/i8355.cpp
index 00b25ef09c5..cf53a098a19 100644
--- a/src/devices/machine/i8355.cpp
+++ b/src/devices/machine/i8355.cpp
@@ -92,7 +92,7 @@ inline void i8355_device::write_port(int port, UINT8 data)
// i8355_device - constructor
//-------------------------------------------------
-i8355_device::i8355_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i8355_device::i8355_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, I8355, "Intel 8355", tag, owner, clock, "i8355", __FILE__),
device_memory_interface(mconfig, *this),
m_in_pa_cb(*this),
@@ -184,14 +184,14 @@ WRITE8_MEMBER( i8355_device::io_w )
{
case REGISTER_PORT_A:
case REGISTER_PORT_B:
- if (LOG) logerror("I8355 '%s' Port %c Write %02x\n", tag().c_str(), 'A' + port, data);
+ if (LOG) logerror("I8355 '%s' Port %c Write %02x\n", tag(), 'A' + port, data);
write_port(port, data);
break;
case REGISTER_PORT_A_DDR:
case REGISTER_PORT_B_DDR:
- if (LOG) logerror("I8355 '%s' Port %c DDR: %02x\n", tag().c_str(), 'A' + port, data);
+ if (LOG) logerror("I8355 '%s' Port %c DDR: %02x\n", tag(), 'A' + port, data);
m_ddr[port] = data;
write_port(port, data);
diff --git a/src/devices/machine/i8355.h b/src/devices/machine/i8355.h
index 442275c0e31..7337fa0193d 100644
--- a/src/devices/machine/i8355.h
+++ b/src/devices/machine/i8355.h
@@ -73,7 +73,7 @@ class i8355_device : public device_t,
{
public:
// construction/destruction
- i8355_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8355_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 4539c62b0d9..5be4dcd3d5a 100644
--- a/src/devices/machine/idectrl.cpp
+++ b/src/devices/machine/idectrl.cpp
@@ -26,12 +26,12 @@
const device_type IDE_CONTROLLER = &device_creator<ide_controller_device>;
-ide_controller_device::ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+ide_controller_device::ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
ata_interface_device(mconfig, IDE_CONTROLLER, "IDE Controller", tag, owner, clock, "ide_controller", __FILE__)
{
}
-ide_controller_device::ide_controller_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ide_controller_device::ide_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
ata_interface_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -89,12 +89,12 @@ WRITE16_MEMBER( ide_controller_device::write_cs1 )
const device_type IDE_CONTROLLER_32 = &device_creator<ide_controller_32_device>;
-ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
ide_controller_device(mconfig, IDE_CONTROLLER, "IDE Controller (32 bit)", tag, owner, clock, "ide_controller32", __FILE__)
{
}
-ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ide_controller_32_device::ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
ide_controller_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -168,7 +168,7 @@ WRITE32_MEMBER(ide_controller_32_device::write_cs1)
const device_type BUS_MASTER_IDE_CONTROLLER = &device_creator<bus_master_ide_controller_device>;
-bus_master_ide_controller_device::bus_master_ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+bus_master_ide_controller_device::bus_master_ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
ide_controller_32_device(mconfig, BUS_MASTER_IDE_CONTROLLER, "Bus Master IDE Controller", tag, owner, clock, "bus_master_ide_controller", __FILE__),
m_dma_address(0),
m_dma_bytes_left(0),
@@ -191,10 +191,10 @@ void bus_master_ide_controller_device::device_start()
{
device_t *bmtarget = machine().device(m_bmcpu);
if (bmtarget == nullptr)
- throw emu_fatalerror("IDE controller '%s' bus master target '%s' doesn't exist!", tag().c_str(), m_bmcpu);
+ throw emu_fatalerror("IDE controller '%s' bus master target '%s' doesn't exist!", tag(), m_bmcpu);
device_memory_interface *memory;
if (!bmtarget->interface(memory))
- throw emu_fatalerror("IDE controller '%s' bus master target '%s' has no memory!", tag().c_str(), m_bmcpu);
+ throw emu_fatalerror("IDE controller '%s' bus master target '%s' has no memory!", tag(), m_bmcpu);
m_dma_space = &memory->space(m_bmspace);
m_dma_address_xor = (m_dma_space->endianness() == ENDIANNESS_LITTLE) ? 0 : 3;
}
diff --git a/src/devices/machine/idectrl.h b/src/devices/machine/idectrl.h
index e250f1e3071..1d5a184b809 100644
--- a/src/devices/machine/idectrl.h
+++ b/src/devices/machine/idectrl.h
@@ -30,8 +30,8 @@
class ide_controller_device : public ata_interface_device
{
public:
- ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- ide_controller_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ide_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual DECLARE_READ16_MEMBER(read_cs0) override;
virtual DECLARE_READ16_MEMBER(read_cs1) override;
@@ -53,8 +53,8 @@ extern const device_type IDE_CONTROLLER;
class ide_controller_32_device : public ide_controller_device
{
public:
- ide_controller_32_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ide_controller_32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ide_controller_32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual DECLARE_READ32_MEMBER(read_cs0);
virtual DECLARE_READ32_MEMBER(read_cs1);
@@ -85,7 +85,7 @@ extern const device_type IDE_CONTROLLER_32;
class bus_master_ide_controller_device : public ide_controller_32_device
{
public:
- bus_master_ide_controller_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ bus_master_ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_bus_master_space(device_t &device, const char *bmcpu, UINT32 bmspace) {bus_master_ide_controller_device &ide = downcast<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 396844e8b1e..c17e4258fbc 100644
--- a/src/devices/machine/idehd.cpp
+++ b/src/devices/machine/idehd.cpp
@@ -21,7 +21,7 @@
#define TIME_FULL_STROKE_SEEK (attotime::from_usec(13000))
#define TIME_AVERAGE_ROTATIONAL_LATENCY (attotime::from_usec(1300))
-ata_mass_storage_device::ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
+ata_mass_storage_device::ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source)
: ata_hle_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_can_identify_device(0),
m_num_cylinders(0),
@@ -761,13 +761,13 @@ const device_type IDE_HARDDISK = &device_creator<ide_hdd_device>;
// ide_hdd_device - constructor
//-------------------------------------------------
-ide_hdd_device::ide_hdd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ide_hdd_device::ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ata_mass_storage_device(mconfig, IDE_HARDDISK, "IDE Hard Disk", tag, owner, clock, "hdd", __FILE__),
m_image(*this, "image")
{
}
-ide_hdd_device::ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ide_hdd_device::ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: ata_mass_storage_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_image(*this, "image")
{
diff --git a/src/devices/machine/idehd.h b/src/devices/machine/idehd.h
index b05895d50d4..8acc9e14474 100644
--- a/src/devices/machine/idehd.h
+++ b/src/devices/machine/idehd.h
@@ -20,7 +20,7 @@
class ata_mass_storage_device : public ata_hle_device
{
public:
- ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
UINT16 *identify_device_buffer() { return m_identify_buffer; }
@@ -87,8 +87,8 @@ class ide_hdd_device : public ata_mass_storage_device
{
public:
// construction/destruction
- ide_hdd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ide_hdd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
// device-level overrides
diff --git a/src/devices/machine/im6402.cpp b/src/devices/machine/im6402.cpp
index 82c9bfe794d..f713a048517 100644
--- a/src/devices/machine/im6402.cpp
+++ b/src/devices/machine/im6402.cpp
@@ -75,7 +75,7 @@ inline void im6402_device::set_tre(int state)
// im6402_device - constructor
//-------------------------------------------------
-im6402_device::im6402_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+im6402_device::im6402_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, IM6402, "Intersil IM6402", tag, owner, clock, "im6402", __FILE__),
device_serial_interface(mconfig, *this),
m_write_tro(*this),
@@ -184,7 +184,7 @@ void im6402_device::tra_complete()
{
if (!m_tbre)
{
- if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag().c_str(), m_tbr);
+ if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag(), m_tbr);
transmit_register_setup(m_tbr);
@@ -212,7 +212,7 @@ void im6402_device::rcv_complete()
receive_register_extract();
m_rbr = get_received_char();
- if (LOG) logerror("IM6402 '%s' Receive Data %02x\n", tag().c_str(), m_rbr);
+ if (LOG) logerror("IM6402 '%s' Receive Data %02x\n", tag(), m_rbr);
if (m_dr)
{
@@ -229,13 +229,13 @@ void im6402_device::rcv_complete()
WRITE8_MEMBER( im6402_device::write )
{
- if (LOG) logerror("IM6402 '%s' Transmit Buffer Register %02x\n", tag().c_str(), data);
+ if (LOG) logerror("IM6402 '%s' Transmit Buffer Register %02x\n", tag(), data);
m_tbr = data;
if (is_transmit_register_empty())
{
- if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag().c_str(), m_tbr);
+ if (LOG) logerror("IM6402 '%s' Transmit Data %02x\n", tag(), m_tbr);
transmit_register_setup(m_tbr);
@@ -329,7 +329,7 @@ WRITE_LINE_MEMBER( im6402_device::crl_w )
{
if (state)
{
- if (LOG) logerror("IM6402 '%s' Control Register Load\n", tag().c_str());
+ if (LOG) logerror("IM6402 '%s' Control Register Load\n", tag());
int data_bit_count = 5 + ((m_cls2 << 1) | m_cls1);
stop_bits_t stop_bits = (m_sbs ? ((data_bit_count == 5) ? STOP_BITS_1_5 : STOP_BITS_2) : STOP_BITS_1);
@@ -350,7 +350,7 @@ WRITE_LINE_MEMBER( im6402_device::crl_w )
WRITE_LINE_MEMBER( im6402_device::pi_w )
{
- if (LOG) logerror("IM6402 '%s' Parity Inhibit %u\n", tag().c_str(), state);
+ if (LOG) logerror("IM6402 '%s' Parity Inhibit %u\n", tag(), state);
m_pi = state;
}
@@ -362,7 +362,7 @@ WRITE_LINE_MEMBER( im6402_device::pi_w )
WRITE_LINE_MEMBER( im6402_device::sbs_w )
{
- if (LOG) logerror("IM6402 '%s' Stop Bit Select %u\n", tag().c_str(), state);
+ if (LOG) logerror("IM6402 '%s' Stop Bit Select %u\n", tag(), state);
m_sbs = state;
}
@@ -374,7 +374,7 @@ WRITE_LINE_MEMBER( im6402_device::sbs_w )
WRITE_LINE_MEMBER( im6402_device::cls1_w )
{
- if (LOG) logerror("IM6402 '%s' Character Length Select 1 %u\n", tag().c_str(), state);
+ if (LOG) logerror("IM6402 '%s' Character Length Select 1 %u\n", tag(), state);
m_cls1 = state;
}
@@ -386,7 +386,7 @@ WRITE_LINE_MEMBER( im6402_device::cls1_w )
WRITE_LINE_MEMBER( im6402_device::cls2_w )
{
- if (LOG) logerror("IM6402 '%s' Character Length Select 2 %u\n", tag().c_str(), state);
+ if (LOG) logerror("IM6402 '%s' Character Length Select 2 %u\n", tag(), state);
m_cls2 = state;
}
@@ -398,7 +398,7 @@ WRITE_LINE_MEMBER( im6402_device::cls2_w )
WRITE_LINE_MEMBER( im6402_device::epe_w )
{
- if (LOG) logerror("IM6402 '%s' Even Parity Enable %u\n", tag().c_str(), state);
+ if (LOG) logerror("IM6402 '%s' Even Parity Enable %u\n", tag(), state);
m_epe = state;
}
diff --git a/src/devices/machine/im6402.h b/src/devices/machine/im6402.h
index f8cdae7946a..05f0b33861a 100644
--- a/src/devices/machine/im6402.h
+++ b/src/devices/machine/im6402.h
@@ -79,7 +79,7 @@ class im6402_device : public device_t,
{
public:
// construction/destruction
- im6402_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ im6402_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_rrc(device_t &device, int rrc) { downcast<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 f3d273c365c..7c192ac66e0 100644
--- a/src/devices/machine/ins8154.cpp
+++ b/src/devices/machine/ins8154.cpp
@@ -42,7 +42,7 @@ const device_type INS8154 = &device_creator<ins8154_device>;
// ins8154_device - constructor
//-------------------------------------------------
-ins8154_device::ins8154_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ins8154_device::ins8154_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, INS8154, "INS8154 RAM I/O", tag, owner, clock, "ins8154", __FILE__),
m_in_a_cb(*this),
m_out_a_cb(*this),
@@ -100,7 +100,7 @@ READ8_MEMBER(ins8154_device::ins8154_r)
{
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' Read from invalid offset %02x!\n", machine().describe_context(), tag().c_str(), offset);
+ logerror("%s: INS8154 '%s' Read from invalid offset %02x!\n", machine().describe_context(), tag(), offset);
}
return 0xff;
}
@@ -174,7 +174,7 @@ WRITE8_MEMBER(ins8154_device::ins8154_w)
{
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' Write %02x to invalid offset %02x!\n", machine().describe_context(), tag().c_str(), data, offset);
+ logerror("%s: INS8154 '%s' Write %02x to invalid offset %02x!\n", machine().describe_context(), tag(), data, offset);
}
return;
}
@@ -192,7 +192,7 @@ WRITE8_MEMBER(ins8154_device::ins8154_w)
case 0x22:
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' ODRA set to %02x\n", machine().describe_context(), tag().c_str(), data);
+ logerror("%s: INS8154 '%s' ODRA set to %02x\n", machine().describe_context(), tag(), data);
}
m_odra = data;
@@ -201,7 +201,7 @@ WRITE8_MEMBER(ins8154_device::ins8154_w)
case 0x23:
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' ODRB set to %02x\n", machine().describe_context(), tag().c_str(), data);
+ logerror("%s: INS8154 '%s' ODRB set to %02x\n", machine().describe_context(), tag(), data);
}
m_odrb = data;
@@ -210,7 +210,7 @@ WRITE8_MEMBER(ins8154_device::ins8154_w)
case 0x24:
if (VERBOSE)
{
- logerror("%s: INS8154 '%s' MDR set to %02x\n", machine().describe_context(), tag().c_str(), data);
+ logerror("%s: INS8154 '%s' MDR set to %02x\n", machine().describe_context(), tag(), data);
}
m_mdr = data;
diff --git a/src/devices/machine/ins8154.h b/src/devices/machine/ins8154.h
index 32f1eb27c52..6a38a840c89 100644
--- a/src/devices/machine/ins8154.h
+++ b/src/devices/machine/ins8154.h
@@ -68,7 +68,7 @@ class ins8154_device : public device_t
{
public:
// construction/destruction
- ins8154_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ins8154_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 7d6aa2a84e5..bbd0fee1584 100644
--- a/src/devices/machine/ins8250.cpp
+++ b/src/devices/machine/ins8250.cpp
@@ -91,7 +91,7 @@ const device_type NS16450 = &device_creator<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, std::string tag, device_t *owner, UINT32 clock, const char *shortname)
+ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_serial_interface(mconfig, *this),
m_out_tx_cb(*this),
@@ -109,25 +109,25 @@ ins8250_uart_device::ins8250_uart_device(const machine_config &mconfig, device_t
m_regs.ier = 0;
}
-ins8250_device::ins8250_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ins8250_device::ins8250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ins8250_uart_device(mconfig, INS8250, "National Semiconductor INS8250", tag, owner, clock, "ins8250")
{
m_device_type = TYPE_INS8250;
}
-ns16450_device::ns16450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ns16450_device::ns16450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ins8250_uart_device(mconfig, NS16450, "National Semiconductor NS16450", tag, owner, clock, "ns16450")
{
m_device_type = TYPE_NS16450;
}
-ns16550_device::ns16550_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ns16550_device::ns16550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ins8250_uart_device(mconfig, NS16550, "National Semiconductor NS16550", tag, owner, clock, "ns16550")
{
m_device_type = TYPE_NS16550;
}
-pc16552_device::pc16552_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+pc16552_device::pc16552_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PC16552D, "National Semiconductor PC16552D", tag, owner, clock, "pc16552d", __FILE__)
{
}
diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h
index af5c08dba15..547c3dea602 100644
--- a/src/devices/machine/ins8250.h
+++ b/src/devices/machine/ins8250.h
@@ -19,7 +19,7 @@ class ins8250_uart_device : public device_t,
public device_serial_interface
{
public:
- ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, std::string tag, device_t *owner, UINT32 clock, const char *shortname);
+ ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
template<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, std::string tag, device_t *owner, UINT32 clock);
+ ins8250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class ns16450_device : public ins8250_uart_device
{
public:
- ns16450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ns16450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class ns16550_device : public ins8250_uart_device
{
public:
- ns16550_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ns16550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
virtual void device_reset() override;
@@ -131,7 +131,7 @@ private:
class pc16552_device : public device_t
{
public:
- pc16552_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pc16552_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(read) { return ((offset & 8) ? m_chan1 : m_chan0)->ins8250_r(space, offset & 7, mem_mask); }
DECLARE_WRITE8_MEMBER(write) { ((offset & 8) ? m_chan1 : m_chan0)->ins8250_w(space, offset & 7, data, mem_mask); }
diff --git a/src/devices/machine/intelfsh.cpp b/src/devices/machine/intelfsh.cpp
index 55b7705bfc6..9fdc04609c1 100644
--- a/src/devices/machine/intelfsh.cpp
+++ b/src/devices/machine/intelfsh.cpp
@@ -103,7 +103,6 @@ const device_type SST_39VF020 = &device_creator<sst_39vf020_device>;
const device_type SHARP_LH28F400 = &device_creator<sharp_lh28f400_device>;
const device_type INTEL_E28F008SA = &device_creator<intel_e28f008sa_device>;
const device_type INTEL_TE28F160 = &device_creator<intel_te28f160_device>;
-const device_type INTEL_TE28F320 = &device_creator<intel_te28f320_device>;
const device_type SHARP_UNK128MBIT = &device_creator<sharp_unk128mbit_device>;
const device_type INTEL_28F320J3D = &device_creator<intel_28f320j3d_device>;
const device_type INTEL_28F320J5 = &device_creator<intel_28f320j5_device>;
@@ -161,7 +160,7 @@ ADDRESS_MAP_END
// intelfsh_device - constructor
//-------------------------------------------------
-intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -328,13 +327,6 @@ intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type
m_device_id = 0xd0;
map = ADDRESS_MAP_NAME( memory_map16_16Mb );
break;
- case FLASH_INTEL_TE28F320:
- m_bits = 16;
- m_size = 0x400000;
- m_maker_id = MFG_INTEL;
- m_device_id = 0x8896;
- map = ADDRESS_MAP_NAME( memory_map16_32Mb );
- break;
case FLASH_SHARP_UNK128MBIT:
m_bits = 16;
m_size = 0x800000;
@@ -398,97 +390,94 @@ intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type
m_space_config = address_space_config("flash", ENDIANNESS_BIG, m_bits, addrbits, (m_bits == 8) ? 0 : -1, map);
}
-intelfsh8_device::intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+intelfsh8_device::intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: intelfsh_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
-intelfsh16_device::intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+intelfsh16_device::intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: intelfsh_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
-intel_28f016s5_device::intel_28f016s5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+intel_28f016s5_device::intel_28f016s5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, INTEL_28F016S5, "Intel 28F016S5 Flash", tag, owner, clock, FLASH_INTEL_28F016S5, "intel_28f016s5", __FILE__) { }
-fujitsu_29f160t_device::fujitsu_29f160t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+fujitsu_29f160t_device::fujitsu_29f160t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29F160T, "Fujitsu 29F160 Flash", tag, owner, clock, FLASH_FUJITSU_29F160T, "fujitsu_29f160t", __FILE__) { }
-fujitsu_29f016a_device::fujitsu_29f016a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+fujitsu_29f016a_device::fujitsu_29f016a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29F016A, "Fujitsu 29F016A Flash", tag, owner, clock, FLASH_FUJITSU_29F016A, "fujitsu_29f016a", __FILE__) { }
-fujitsu_29dl16x_device::fujitsu_29dl16x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+fujitsu_29dl16x_device::fujitsu_29dl16x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29DL16X, "Fujitsu 29DL16X Flash", tag, owner, clock, FLASH_FUJITSU_29DL16X, "fujitsu_29dl16x", __FILE__) { }
-sharp_lh28f016s_device::sharp_lh28f016s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sharp_lh28f016s_device::sharp_lh28f016s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, SHARP_LH28F016S, "Sharp LH28F016S Flash", tag, owner, clock, FLASH_SHARP_LH28F016S, "sharp_lh28f016s", __FILE__) { }
-atmel_29c010_device::atmel_29c010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+atmel_29c010_device::atmel_29c010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, ATMEL_29C010, "Atmel 29C010 Flash", tag, owner, clock, FLASH_ATMEL_29C010, "atmel_29c010", __FILE__) { }
-amd_29f010_device::amd_29f010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+amd_29f010_device::amd_29f010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F010, "AMD 29F010 Flash", tag, owner, clock, FLASH_AMD_29F010, "amd_29f010", __FILE__) { }
-amd_29f040_device::amd_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+amd_29f040_device::amd_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F040, "AMD 29F040 Flash", tag, owner, clock, FLASH_AMD_29F040, "amd_29f040", __FILE__) { }
-amd_29f080_device::amd_29f080_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+amd_29f080_device::amd_29f080_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F080, "AMD 29F080 Flash", tag, owner, clock, FLASH_AMD_29F080, "amd_29f080", __FILE__) { }
-amd_29f400t_device::amd_29f400t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+amd_29f400t_device::amd_29f400t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F400T, "AMD 29F400 Flash", tag, owner, clock, FLASH_AMD_29F400T, "amd_29f400t", __FILE__) { }
-amd_29f800t_device::amd_29f800t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+amd_29f800t_device::amd_29f800t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F800T, "AMD 29F800 Flash", tag, owner, clock, FLASH_AMD_29F800T, "amd_29f800t", __FILE__) { }
-amd_29lv200t_device::amd_29lv200t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+amd_29lv200t_device::amd_29lv200t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29LV200T, "AMD 29LV200T Flash", tag, owner, clock, FLASH_AMD_29LV200T, "amd_29lv200t", __FILE__) { }
-intel_e28f008sa_device::intel_e28f008sa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+intel_e28f008sa_device::intel_e28f008sa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, INTEL_E28F008SA, "Intel E28F008SA Flash", tag, owner, clock, FLASH_INTEL_E28F008SA, "intel_e28f008sa", __FILE__) { }
-macronix_29l001mc_device::macronix_29l001mc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+macronix_29l001mc_device::macronix_29l001mc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, MACRONIX_29L001MC, "Macronix 29L001MC Flash", tag, owner, clock, FLASH_MACRONIX_29L001MC, "macronix_29l001mc", __FILE__) { }
-macronix_29lv160tmc_device::macronix_29lv160tmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+macronix_29lv160tmc_device::macronix_29lv160tmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, MACRONIX_29LV160TMC, "Macronix 29LV160TMC Flash", tag, owner, clock, FLASH_MACRONIX_29LV160TMC, "macronix_29lv160tmc", __FILE__) { }
-panasonic_mn63f805mnp_device::panasonic_mn63f805mnp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+panasonic_mn63f805mnp_device::panasonic_mn63f805mnp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, PANASONIC_MN63F805MNP, "Panasonic MN63F805MNP Flash", tag, owner, clock, FLASH_PANASONIC_MN63F805MNP, "panasonic_mn63f805mnp", __FILE__) { }
-sanyo_le26fv10n1ts_device::sanyo_le26fv10n1ts_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sanyo_le26fv10n1ts_device::sanyo_le26fv10n1ts_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, SANYO_LE26FV10N1TS, "Sanyo LE26FV10N1TS Flash", tag, owner, clock, FLASH_SANYO_LE26FV10N1TS, "sanyo_le26fv10n1ts", __FILE__) { }
-sst_28sf040_device::sst_28sf040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sst_28sf040_device::sst_28sf040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, SST_28SF040, "SST 28SF040 Flash", tag, owner, clock, FLASH_SST_28SF040, "sst_28sf040", __FILE__) { }
-sst_39vf020_device::sst_39vf020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sst_39vf020_device::sst_39vf020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, SST_39VF020, "SST 39VF020 Flash", tag, owner, clock, FLASH_SST_39VF020, "sst_39vf020", __FILE__) { }
-sharp_lh28f400_device::sharp_lh28f400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sharp_lh28f400_device::sharp_lh28f400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, SHARP_LH28F400, "Sharp LH28F400 Flash", tag, owner, clock, FLASH_SHARP_LH28F400, "sharp_lh28f400", __FILE__) { }
-intel_te28f160_device::intel_te28f160_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+intel_te28f160_device::intel_te28f160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, INTEL_TE28F160, "Intel TE28F160 Flash", tag, owner, clock, FLASH_INTEL_TE28F160, "intel_te28f160", __FILE__) { }
-intel_te28f320_device::intel_te28f320_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
- : intelfsh16_device(mconfig, INTEL_TE28F320, "Intel TE28F320 Flash", tag, owner, clock, FLASH_INTEL_TE28F320, "intel_te28f320", __FILE__) { }
-
-intel_e28f400b_device::intel_e28f400b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+intel_e28f400b_device::intel_e28f400b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, INTEL_E28F400B, "Intel E28F400B Flash", tag, owner, clock, FLASH_INTEL_E28F400B, "intel_e28f400b", __FILE__) { }
-sharp_unk128mbit_device::sharp_unk128mbit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sharp_unk128mbit_device::sharp_unk128mbit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, SHARP_UNK128MBIT, "Sharp Unknown 128Mbit Flash", tag, owner, clock, FLASH_SHARP_UNK128MBIT, "sharp_unk128mbit", __FILE__) { }
-intel_28f320j3d_device::intel_28f320j3d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+intel_28f320j3d_device::intel_28f320j3d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, INTEL_28F320J3D, "Intel 28F320J3D Flash", tag, owner, clock, FLASH_INTEL_28F320J3D, "intel_28f320j3d", __FILE__) { }
-intel_28f320j5_device::intel_28f320j5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+intel_28f320j5_device::intel_28f320j5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, INTEL_28F320J5, "Intel 28F320J3D_a Flash", tag, owner, clock, FLASH_INTEL_28F320J5, "intel_28f320j5", __FILE__) { }
-sst_39vf400a_device::sst_39vf400a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sst_39vf400a_device::sst_39vf400a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh16_device(mconfig, SST_39VF400A, "SST 39VF400A Flash", tag, owner, clock, FLASH_SST_39VF400A, "sst_39vf400a", __FILE__) { }
-tms_29f040_device::tms_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms_29f040_device::tms_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, TMS_29F040, "Texas Instruments 29F040 Flash", tag, owner, clock, FLASH_TMS_29F040, "tms_29f040", __FILE__) { }
//-------------------------------------------------
diff --git a/src/devices/machine/intelfsh.h b/src/devices/machine/intelfsh.h
index 2b2eae85dc9..d23f0a01849 100644
--- a/src/devices/machine/intelfsh.h
+++ b/src/devices/machine/intelfsh.h
@@ -147,7 +147,7 @@ public:
protected:
// construction/destruction
- intelfsh_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ intelfsh_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -196,7 +196,7 @@ class intelfsh8_device : public intelfsh_device
{
protected:
// construction/destruction
- intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
public:
// public interface
@@ -216,7 +216,7 @@ class intelfsh16_device : public intelfsh_device
{
protected:
// construction/destruction
- intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
public:
// public interface
@@ -236,134 +236,134 @@ public:
class intel_28f016s5_device : public intelfsh8_device
{
public:
- intel_28f016s5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ intel_28f016s5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class fujitsu_29f160t_device : public intelfsh8_device
{
public:
- fujitsu_29f160t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fujitsu_29f160t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class fujitsu_29f016a_device : public intelfsh8_device
{
public:
- fujitsu_29f016a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fujitsu_29f016a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class fujitsu_29dl16x_device : public intelfsh8_device
{
public:
- fujitsu_29dl16x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fujitsu_29dl16x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class atmel_29c010_device : public intelfsh8_device
{
public:
- atmel_29c010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ atmel_29c010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class amd_29f010_device : public intelfsh8_device
{
public:
- amd_29f010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ amd_29f010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class amd_29f040_device : public intelfsh8_device
{
public:
- amd_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ amd_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class amd_29f080_device : public intelfsh8_device
{
public:
- amd_29f080_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ amd_29f080_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class amd_29f400t_device : public intelfsh8_device
{
public:
- amd_29f400t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ amd_29f400t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class amd_29f800t_device : public intelfsh8_device
{
public:
- amd_29f800t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ amd_29f800t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class amd_29lv200t_device : public intelfsh8_device
{
public:
- amd_29lv200t_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ amd_29lv200t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class sharp_lh28f016s_device : public intelfsh8_device
{
public:
- sharp_lh28f016s_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sharp_lh28f016s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class intel_e28f008sa_device : public intelfsh8_device
{
public:
- intel_e28f008sa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ intel_e28f008sa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class macronix_29l001mc_device : public intelfsh8_device
{
public:
- macronix_29l001mc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ macronix_29l001mc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class macronix_29lv160tmc_device : public intelfsh8_device
{
public:
- macronix_29lv160tmc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ macronix_29lv160tmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class panasonic_mn63f805mnp_device : public intelfsh8_device
{
public:
- panasonic_mn63f805mnp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ panasonic_mn63f805mnp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class sanyo_le26fv10n1ts_device : public intelfsh8_device
{
public:
- sanyo_le26fv10n1ts_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sanyo_le26fv10n1ts_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class sst_28sf040_device : public intelfsh8_device
{
public:
- sst_28sf040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sst_28sf040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class sst_39vf020_device : public intelfsh8_device
{
public:
- sst_39vf020_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sst_39vf020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class tms_29f040_device : public intelfsh8_device
{
public:
- tms_29f040_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
// 16-bit variants
class sharp_lh28f400_device : public intelfsh16_device
{
public:
- sharp_lh28f400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sharp_lh28f400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class intel_te28f160_device : public intelfsh16_device
{
public:
- intel_te28f160_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ intel_te28f160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class intel_te28f320_device : public intelfsh16_device
@@ -375,31 +375,31 @@ public:
class intel_e28f400b_device : public intelfsh16_device
{
public:
- intel_e28f400b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ intel_e28f400b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class sharp_unk128mbit_device : public intelfsh16_device
{
public:
- sharp_unk128mbit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sharp_unk128mbit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class intel_28f320j3d_device : public intelfsh16_device
{
public:
- intel_28f320j3d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ intel_28f320j3d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class intel_28f320j5_device : public intelfsh16_device
{
public:
- intel_28f320j5_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ intel_28f320j5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class sst_39vf400a_device : public intelfsh16_device
{
public:
- sst_39vf400a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sst_39vf400a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/machine/jvsdev.cpp b/src/devices/machine/jvsdev.cpp
index e5884362f62..c70f8a9fce6 100644
--- a/src/devices/machine/jvsdev.cpp
+++ b/src/devices/machine/jvsdev.cpp
@@ -9,7 +9,7 @@ void jvs_device::static_set_jvs_host_tag(device_t &device, const char *jvs_host_
jvsdev.jvs_host_tag = jvs_host_tag;
}
-jvs_device::jvs_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+jvs_device::jvs_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source), jvs_outputs(0), jvs_address(0), jvs_reset_counter(0)
{
jvs_host_tag = nullptr;
@@ -195,7 +195,7 @@ void jvs_device::device_start()
{
jvs_host *host = machine().device<jvs_host>(jvs_host_tag);
if(!host)
- fatalerror("JVS device %s could not find JVS host %s\n", tag().c_str(), jvs_host_tag);
+ fatalerror("JVS device %s could not find JVS host %s\n", tag(), jvs_host_tag);
host->add_device(this);
save_item(NAME(jvs_address));
diff --git a/src/devices/machine/jvsdev.h b/src/devices/machine/jvsdev.h
index 70ab6e65345..22a95e2b1a7 100644
--- a/src/devices/machine/jvsdev.h
+++ b/src/devices/machine/jvsdev.h
@@ -13,7 +13,7 @@ class jvs_host;
class jvs_device : public device_t
{
public:
- jvs_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ jvs_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static void static_set_jvs_host_tag(device_t &device, const char *jvs_host_tag);
void chain(jvs_device *dev);
diff --git a/src/devices/machine/jvshost.cpp b/src/devices/machine/jvshost.cpp
index 6acb113bf5d..bca7f7c618c 100644
--- a/src/devices/machine/jvshost.cpp
+++ b/src/devices/machine/jvshost.cpp
@@ -28,7 +28,7 @@ void jvs_host::device_reset()
memset(recv_buffer, 0, sizeof(recv_buffer));
}
-jvs_host::jvs_host(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+jvs_host::jvs_host(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source), send_size(0), recv_size(0), recv_is_encoded(false)
{
first_device = nullptr;
diff --git a/src/devices/machine/jvshost.h b/src/devices/machine/jvshost.h
index 4f66e46dccc..a52c2d0fdf0 100644
--- a/src/devices/machine/jvshost.h
+++ b/src/devices/machine/jvshost.h
@@ -9,7 +9,7 @@ class jvs_device;
class jvs_host : public device_t {
public:
- jvs_host(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ jvs_host(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void add_device(jvs_device *dev);
diff --git a/src/devices/machine/k033906.cpp b/src/devices/machine/k033906.cpp
index 8ea467cb4df..bd32fef29f1 100644
--- a/src/devices/machine/k033906.cpp
+++ b/src/devices/machine/k033906.cpp
@@ -22,8 +22,8 @@ const device_type K033906 = &device_creator<k033906_device>;
// k033906_device - constructor
//-------------------------------------------------
-k033906_device::k033906_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, K033906, "K033906 PCI bridge", tag, owner, clock, "k033906", __FILE__), m_reg_set(0), m_voodoo(nullptr)
+k033906_device::k033906_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ : device_t(mconfig, K033906, "K033906 PCI bridge", tag, owner, clock, "k033906", __FILE__), m_reg_set(0), m_voodoo_tag(nullptr), m_voodoo(nullptr)
{
}
diff --git a/src/devices/machine/k033906.h b/src/devices/machine/k033906.h
index a2a51370045..aa2c685df99 100644
--- a/src/devices/machine/k033906.h
+++ b/src/devices/machine/k033906.h
@@ -33,9 +33,9 @@ class k033906_device : public device_t
{
public:
// construction/destruction
- k033906_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ k033906_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- static void set_voodoo_tag(device_t &device, std::string tag) { downcast<k033906_device &>(device).m_voodoo_tag = tag; }
+ static void set_voodoo_tag(device_t &device, const char *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
- std::string m_voodoo_tag;
+ const char *m_voodoo_tag;
device_t *m_voodoo;
UINT32 m_reg[256];
diff --git a/src/devices/machine/k053252.cpp b/src/devices/machine/k053252.cpp
index 0ac6da4c957..45020926ace 100644
--- a/src/devices/machine/k053252.cpp
+++ b/src/devices/machine/k053252.cpp
@@ -65,7 +65,7 @@ TODO:
const device_type K053252 = &device_creator<k053252_device>;
-k053252_device::k053252_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+k053252_device::k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K053252, "K053252 Timing/Interrupt", tag, owner, clock, "k053252", __FILE__),
device_video_interface(mconfig, *this),
m_int1_en_cb(*this),
@@ -76,6 +76,7 @@ k053252_device::k053252_device(const machine_config &mconfig, std::string tag, d
m_offsx(0),
m_offsy(0),
// ugly, needed to work with the rungun etc. video demux board
+ m_slave_screen_tag(nullptr),
m_slave_screen(nullptr)
{
}
@@ -103,7 +104,7 @@ void k053252_device::device_start()
save_item(NAME(m_vsw));
save_item(NAME(m_hsw));
- if (!m_slave_screen_tag.empty())
+ if (m_slave_screen_tag != nullptr)
{
// find the screen device if explicitly configured
m_slave_screen = device().siblingdevice<screen_device>(m_slave_screen_tag);
@@ -258,7 +259,7 @@ WRITE8_MEMBER( k053252_device::write )
}
-void k053252_device::static_set_slave_screen(device_t &device, std::string tag)
+void k053252_device::static_set_slave_screen(device_t &device, const char *tag)
{
k053252_device &dev = downcast<k053252_device &>(device);
dev.m_slave_screen_tag = tag;
diff --git a/src/devices/machine/k053252.h b/src/devices/machine/k053252.h
index 82056202bf6..a00743789ad 100644
--- a/src/devices/machine/k053252.h
+++ b/src/devices/machine/k053252.h
@@ -34,7 +34,7 @@ class k053252_device : public device_t,
public device_video_interface
{
public:
- k053252_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~k053252_device() {}
template<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, std::string tag);
+ static void static_set_slave_screen(device_t &device, const char *tag);
protected:
@@ -75,7 +75,7 @@ protected:
int m_offsx;
int m_offsy;
- std::string m_slave_screen_tag;
+ const char * m_slave_screen_tag;
screen_device * m_slave_screen;
};
diff --git a/src/devices/machine/k056230.cpp b/src/devices/machine/k056230.cpp
index 46e63a89124..8d750b66a8a 100644
--- a/src/devices/machine/k056230.cpp
+++ b/src/devices/machine/k056230.cpp
@@ -21,7 +21,7 @@ const device_type K056230 = &device_creator<k056230_device>;
// k056230_device - constructor
//-------------------------------------------------
-k056230_device::k056230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+k056230_device::k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K056230, "K056230 LANC", tag, owner, clock, "k056230", __FILE__),
m_is_thunderh(0),
m_cpu(*this)
diff --git a/src/devices/machine/k056230.h b/src/devices/machine/k056230.h
index 04629bce16d..5695261f4c2 100644
--- a/src/devices/machine/k056230.h
+++ b/src/devices/machine/k056230.h
@@ -36,9 +36,9 @@ class k056230_device : public device_t
{
public:
// construction/destruction
- k056230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- static void set_cpu_tag(device_t &device, std::string tag) { downcast<k056230_device &>(device).m_cpu.set_tag(tag); }
+ static void set_cpu_tag(device_t &device, const char *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 77a9900ca1d..ca5fb5e7e76 100644
--- a/src/devices/machine/kb3600.cpp
+++ b/src/devices/machine/kb3600.cpp
@@ -42,7 +42,7 @@ const device_type AY3600 = &device_creator<ay3600_device>;
// ay3600_device - constructor
//-------------------------------------------------
-ay3600_device::ay3600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ay3600_device::ay3600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, AY3600, "AY-5-3600", tag, owner, clock, "ay3600", __FILE__),
m_read_x0(*this),
m_read_x1(*this),
diff --git a/src/devices/machine/kb3600.h b/src/devices/machine/kb3600.h
index 02110a6c57f..1d0529e7a0c 100644
--- a/src/devices/machine/kb3600.h
+++ b/src/devices/machine/kb3600.h
@@ -101,7 +101,7 @@ class ay3600_device : public device_t
{
public:
// construction/destruction
- ay3600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ay3600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// public interface
UINT16 b_r();
diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp
index a7ef77d4dd7..d801bbf7dcf 100644
--- a/src/devices/machine/keyboard.cpp
+++ b/src/devices/machine/keyboard.cpp
@@ -31,7 +31,7 @@ WRITE8_MEMBER( xxx_state::kbd_put )
***************************************************************************/
-generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_io_kbd0(*this, "TERM_LINE0"),
m_io_kbd1(*this, "TERM_LINE1"),
@@ -51,7 +51,7 @@ generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig,
{
}
-generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GENERIC_KEYBOARD, "Generic Keyboard", tag, owner, clock, "generic_keyboard", __FILE__),
m_io_kbd0(*this, "TERM_LINE0"),
m_io_kbd1(*this, "TERM_LINE1"),
diff --git a/src/devices/machine/keyboard.h b/src/devices/machine/keyboard.h
index b75f342b3ac..79a91f923c9 100644
--- a/src/devices/machine/keyboard.h
+++ b/src/devices/machine/keyboard.h
@@ -21,8 +21,8 @@ INPUT_PORTS_EXTERN( generic_keyboard );
class generic_keyboard_device : public device_t
{
public:
- generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- generic_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ generic_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ generic_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 73e4eeba091..169a8b5f60d 100644
--- a/src/devices/machine/kr2376.cpp
+++ b/src/devices/machine/kr2376.cpp
@@ -66,7 +66,7 @@ static const UINT8 KR2376_KEY_CODES[3][8][11] =
const device_type KR2376 = &device_creator<kr2376_device>;
-kr2376_device::kr2376_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+kr2376_device::kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, KR2376, "SMC KR2376", tag, owner, clock, "kr2376", __FILE__),
m_write_strobe(*this)
{
diff --git a/src/devices/machine/kr2376.h b/src/devices/machine/kr2376.h
index 346c2676136..080bfec4b90 100644
--- a/src/devices/machine/kr2376.h
+++ b/src/devices/machine/kr2376.h
@@ -54,7 +54,7 @@ enum kr2376_output_pin_t
class kr2376_device : public device_t
{
public:
- kr2376_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~kr2376_device() {}
template<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 ffffc5c6cad..50e6dc09836 100644
--- a/src/devices/machine/laserdsc.cpp
+++ b/src/devices/machine/laserdsc.cpp
@@ -57,7 +57,7 @@ const UINT32 VIRTUAL_LEAD_OUT_TRACKS = LEAD_OUT_MIN_SIZE_IN_UM * 1000 / NOMINAL_
// laserdisc_device - constructor
//-------------------------------------------------
-laserdisc_device::laserdisc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+laserdisc_device::laserdisc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
device_video_interface(mconfig, *this),
@@ -296,7 +296,7 @@ void laserdisc_device::static_set_overlay_scale(device_t &device, float scalex,
// configuration
//-------------------------------------------------
-void laserdisc_device::static_set_overlay_palette(device_t &device, std::string tag)
+void laserdisc_device::static_set_overlay_palette(device_t &device, const char *tag)
{
downcast<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().c_str());
+ m_disc = machine().rom_load().get_disk_handle(tag());
// set default parameters
m_width = 720;
@@ -1156,7 +1156,7 @@ void laserdisc_device::config_load(config_type cfg_type, xml_data_node *parentno
for (xml_data_node *ldnode = xml_get_sibling(parentnode->child, "device"); ldnode != nullptr; ldnode = xml_get_sibling(ldnode->next, "device"))
{
const char *devtag = xml_get_attribute_string(ldnode, "tag", "");
- if (strcmp(devtag, tag().c_str()) == 0)
+ if (strcmp(devtag, tag()) == 0)
{
// handle the overlay node
xml_data_node *overnode = xml_get_sibling(ldnode->child, "overlay");
@@ -1189,7 +1189,7 @@ void laserdisc_device::config_save(config_type cfg_type, xml_data_node *parentno
if (ldnode != nullptr)
{
// output the basics
- xml_set_attribute(ldnode, "tag", tag().c_str());
+ xml_set_attribute(ldnode, "tag", tag());
// add an overlay node
xml_data_node *overnode = xml_add_child(ldnode, "overlay", nullptr);
diff --git a/src/devices/machine/laserdsc.h b/src/devices/machine/laserdsc.h
index ec615e512b3..c550a9f61aa 100644
--- a/src/devices/machine/laserdsc.h
+++ b/src/devices/machine/laserdsc.h
@@ -138,7 +138,7 @@ class laserdisc_device : public device_t,
{
protected:
// construction/destruction
- laserdisc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ laserdisc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual ~laserdisc_device();
public:
@@ -169,7 +169,7 @@ public:
static void static_set_overlay_clip(device_t &device, INT32 minx, INT32 maxx, INT32 miny, INT32 maxy);
static void static_set_overlay_position(device_t &device, float posx, float posy);
static void static_set_overlay_scale(device_t &device, float scalex, float scaley);
- static void static_set_overlay_palette(device_t &device, std::string tag);
+ static void static_set_overlay_palette(device_t &device, const char *tag);
protected:
// timer IDs
diff --git a/src/devices/machine/latch.cpp b/src/devices/machine/latch.cpp
index 8f70ff582ab..55aaf7dfeba 100644
--- a/src/devices/machine/latch.cpp
+++ b/src/devices/machine/latch.cpp
@@ -5,7 +5,7 @@
const device_type OUTPUT_LATCH = &device_creator<output_latch_device>;
-output_latch_device::output_latch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+output_latch_device::output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, OUTPUT_LATCH, "Output Latch", tag, owner, clock, "output_latch", __FILE__),
m_resolved(false),
m_bit0(-1),
diff --git a/src/devices/machine/latch.h b/src/devices/machine/latch.h
index 15e34737eb5..66e08614b66 100644
--- a/src/devices/machine/latch.h
+++ b/src/devices/machine/latch.h
@@ -30,7 +30,7 @@
class output_latch_device : public device_t
{
public:
- output_latch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 b454de88535..9213f8e50c6 100644
--- a/src/devices/machine/latch8.cpp
+++ b/src/devices/machine/latch8.cpp
@@ -145,7 +145,7 @@ WRITE8_MEMBER( latch8_device::bit7_w ) { bitx_w(7, offset, data); }
const device_type LATCH8 = &device_creator<latch8_device>;
-latch8_device::latch8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+latch8_device::latch8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LATCH8, "8 bit latch", tag, owner, clock, "latch8", __FILE__),
m_value(0),
m_has_write(0),
@@ -181,14 +181,14 @@ latch8_device::latch8_device(const machine_config &mconfig, std::string tag, dev
void latch8_device::device_validity_check(validity_checker &valid) const
{
- if (!m_read_0.isnull() && !m_write_0.isnull()) osd_printf_error("Device %s: Bit 0 already has a handler.\n", tag().c_str());
- if (!m_read_1.isnull() && !m_write_1.isnull()) osd_printf_error("Device %s: Bit 1 already has a handler.\n", tag().c_str());
- if (!m_read_2.isnull() && !m_write_2.isnull()) osd_printf_error("Device %s: Bit 2 already has a handler.\n", tag().c_str());
- if (!m_read_3.isnull() && !m_write_3.isnull()) osd_printf_error("Device %s: Bit 3 already has a handler.\n", tag().c_str());
- if (!m_read_4.isnull() && !m_write_4.isnull()) osd_printf_error("Device %s: Bit 4 already has a handler.\n", tag().c_str());
- if (!m_read_5.isnull() && !m_write_5.isnull()) osd_printf_error("Device %s: Bit 5 already has a handler.\n", tag().c_str());
- if (!m_read_6.isnull() && !m_write_6.isnull()) osd_printf_error("Device %s: Bit 6 already has a handler.\n", tag().c_str());
- if (!m_read_7.isnull() && !m_write_7.isnull()) osd_printf_error("Device %s: Bit 7 already has a handler.\n", tag().c_str());
+ if (!m_read_0.isnull() && !m_write_0.isnull()) osd_printf_error("Device %s: Bit 0 already has a handler.\n", tag());
+ if (!m_read_1.isnull() && !m_write_1.isnull()) osd_printf_error("Device %s: Bit 1 already has a handler.\n", tag());
+ if (!m_read_2.isnull() && !m_write_2.isnull()) osd_printf_error("Device %s: Bit 2 already has a handler.\n", tag());
+ if (!m_read_3.isnull() && !m_write_3.isnull()) osd_printf_error("Device %s: Bit 3 already has a handler.\n", tag());
+ if (!m_read_4.isnull() && !m_write_4.isnull()) osd_printf_error("Device %s: Bit 4 already has a handler.\n", tag());
+ if (!m_read_5.isnull() && !m_write_5.isnull()) osd_printf_error("Device %s: Bit 5 already has a handler.\n", tag());
+ if (!m_read_6.isnull() && !m_write_6.isnull()) osd_printf_error("Device %s: Bit 6 already has a handler.\n", tag());
+ if (!m_read_7.isnull() && !m_write_7.isnull()) osd_printf_error("Device %s: Bit 7 already has a handler.\n", tag());
}
//-------------------------------------------------
// device_start - device-specific startup
diff --git a/src/devices/machine/latch8.h b/src/devices/machine/latch8.h
index 3d2844df7fd..dce9ea6f87a 100644
--- a/src/devices/machine/latch8.h
+++ b/src/devices/machine/latch8.h
@@ -27,7 +27,7 @@
class latch8_device : public device_t
{
public:
- latch8_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ latch8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
/* write & read full byte */
diff --git a/src/devices/machine/lc89510.cpp b/src/devices/machine/lc89510.cpp
index 97adba322c4..9ad9f4cb37a 100644
--- a/src/devices/machine/lc89510.cpp
+++ b/src/devices/machine/lc89510.cpp
@@ -11,7 +11,7 @@
const device_type LC89510 = &device_creator<lc89510_device>;
-lc89510_device::lc89510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+lc89510_device::lc89510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LC89510, "lc89510_device", tag, owner, clock, "lc89510", __FILE__)
{
}
diff --git a/src/devices/machine/lc89510.h b/src/devices/machine/lc89510.h
index b3c9472d13c..0d7ebedcf71 100644
--- a/src/devices/machine/lc89510.h
+++ b/src/devices/machine/lc89510.h
@@ -6,7 +6,7 @@
class lc89510_device : public device_t
{
public:
- lc89510_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ lc89510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp
index 4382adb58af..17b02edf276 100644
--- a/src/devices/machine/ldpr8210.cpp
+++ b/src/devices/machine/ldpr8210.cpp
@@ -179,7 +179,7 @@ ROM_END
// pioneer_pr8210_device - constructor
//-------------------------------------------------
-pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PIONEER_PR8210, "Pioneer PR-8210", tag, owner, clock, "pr8210", __FILE__),
m_control(0),
m_lastcommand(0),
@@ -195,7 +195,7 @@ pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, std:
{
}
-pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+pioneer_pr8210_device::pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: laserdisc_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_control(0),
m_lastcommand(0),
@@ -889,7 +889,7 @@ ROM_END
// simutrek_special_device - constructor
//-------------------------------------------------
-simutrek_special_device::simutrek_special_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+simutrek_special_device::simutrek_special_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pioneer_pr8210_device(mconfig, SIMUTREK_SPECIAL, "Simutrek Modified PR-8210", tag, owner, clock, "simutrek", __FILE__),
m_i8748_cpu(*this, "simutrek"),
m_audio_squelch(0),
diff --git a/src/devices/machine/ldpr8210.h b/src/devices/machine/ldpr8210.h
index c149620a87e..7418df3336d 100644
--- a/src/devices/machine/ldpr8210.h
+++ b/src/devices/machine/ldpr8210.h
@@ -64,8 +64,8 @@ class pioneer_pr8210_device : public laserdisc_device
{
public:
// construction/destruction
- pioneer_pr8210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pioneer_pr8210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pioneer_pr8210_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// input and output
void control_w(UINT8 data);
@@ -139,7 +139,7 @@ class simutrek_special_device : public pioneer_pr8210_device
{
public:
// construction/destruction
- simutrek_special_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ simutrek_special_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// input and output
void data_w(UINT8 data);
diff --git a/src/devices/machine/ldstub.h b/src/devices/machine/ldstub.h
index 6641b52b28e..ee49e382583 100644
--- a/src/devices/machine/ldstub.h
+++ b/src/devices/machine/ldstub.h
@@ -49,7 +49,7 @@ class sony_ldp1450_device : public laserdisc_device
{
public:
// construction/destruction
- sony_ldp1450_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ sony_ldp1450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, SONY_LDP1450, "Sony LDP-1450", tag, owner, clock, "ldp1450", __FILE__) { }
// input/output
@@ -71,7 +71,7 @@ class pioneer_pr7820_device : public laserdisc_device
{
public:
// construction/destruction
- pioneer_pr7820_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ pioneer_pr7820_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PIONEER_PR7820, "Pioneer PR-7820", tag, owner, clock, "pr7820", __FILE__) { }
// input/output
@@ -95,7 +95,7 @@ class phillips_22vp932_device : public laserdisc_device
{
public:
// construction/destruction
- phillips_22vp932_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ phillips_22vp932_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PHILLIPS_22VP932, "Phillips 22VP932", tag, owner, clock, "22vp932", __FILE__) { }
// input/output
diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp
index bda17600155..1e6224adc0d 100644
--- a/src/devices/machine/ldv1000.cpp
+++ b/src/devices/machine/ldv1000.cpp
@@ -121,7 +121,7 @@ ROM_END
// pioneer_ldv1000_device - constructor
//-------------------------------------------------
-pioneer_ldv1000_device::pioneer_ldv1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+pioneer_ldv1000_device::pioneer_ldv1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PIONEER_LDV1000, "Pioneer LD-V1000", tag, owner, clock, "ldv1000", __FILE__),
m_z80_cpu(*this, "ldv1000"),
m_z80_ctc(*this, "ldvctc"),
diff --git a/src/devices/machine/ldv1000.h b/src/devices/machine/ldv1000.h
index b42f829160b..c2f9ead67a6 100644
--- a/src/devices/machine/ldv1000.h
+++ b/src/devices/machine/ldv1000.h
@@ -47,7 +47,7 @@ class pioneer_ldv1000_device : public laserdisc_device
{
public:
// construction/destruction
- pioneer_ldv1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pioneer_ldv1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// input and output
void data_w(UINT8 data);
diff --git a/src/devices/machine/ldvp931.cpp b/src/devices/machine/ldvp931.cpp
index 26470147197..716728b638b 100644
--- a/src/devices/machine/ldvp931.cpp
+++ b/src/devices/machine/ldvp931.cpp
@@ -86,7 +86,7 @@ ROM_END
// phillips_22vp931_device - constructor
//-------------------------------------------------
-phillips_22vp931_device::phillips_22vp931_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+phillips_22vp931_device::phillips_22vp931_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: laserdisc_device(mconfig, PHILLIPS_22VP931, "Phillips 22VP931", tag, owner, clock, "22vp931", __FILE__),
m_i8049_cpu(*this, "vp931"),
m_tracktimer(nullptr),
diff --git a/src/devices/machine/ldvp931.h b/src/devices/machine/ldvp931.h
index fc662f475a6..8acd7ebf6bd 100644
--- a/src/devices/machine/ldvp931.h
+++ b/src/devices/machine/ldvp931.h
@@ -48,7 +48,7 @@ public:
typedef delegate<void (phillips_22vp931_device &, int)> data_ready_delegate;
// construction/destruction
- phillips_22vp931_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ phillips_22vp931_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// input and output
void data_w(UINT8 data) { synchronize(TID_DEFERRED_DATA, data); }
diff --git a/src/devices/machine/legscsi.cpp b/src/devices/machine/legscsi.cpp
index 0727a0ebb21..23cc5902a29 100644
--- a/src/devices/machine/legscsi.cpp
+++ b/src/devices/machine/legscsi.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "legscsi.h"
-legacy_scsi_host_adapter::legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+legacy_scsi_host_adapter::legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_selected(0),
m_scsi_port(*this)
@@ -48,7 +48,7 @@ void legacy_scsi_host_adapter::send_command(UINT8 *data, int bytes)
}
else
{
- logerror("%s: send_command unknown SCSI id %d\n", tag().c_str(), m_selected);
+ logerror("%s: send_command unknown SCSI id %d\n", tag(), m_selected);
}
}
@@ -63,7 +63,7 @@ int legacy_scsi_host_adapter::get_length(void)
}
else
{
- logerror("%s: get_length unknown SCSI id %d\n", tag().c_str(), m_selected);
+ logerror("%s: get_length unknown SCSI id %d\n", tag(), m_selected);
return 0;
}
}
@@ -79,7 +79,7 @@ int legacy_scsi_host_adapter::get_phase(void)
}
else
{
- logerror("%s: get_phase unknown SCSI id %d\n", tag().c_str(), m_selected);
+ logerror("%s: get_phase unknown SCSI id %d\n", tag(), m_selected);
return 0;
}
}
@@ -93,7 +93,7 @@ void legacy_scsi_host_adapter::read_data(UINT8 *data, int bytes)
}
else
{
- logerror("%s: read_data unknown SCSI id %d\n", tag().c_str(), m_selected);
+ logerror("%s: read_data unknown SCSI id %d\n", tag(), m_selected);
}
}
@@ -106,7 +106,7 @@ void legacy_scsi_host_adapter::write_data(UINT8 *data, int bytes)
}
else
{
- logerror("%s: write_data unknown SCSI id %d\n", tag().c_str(), m_selected);
+ logerror("%s: write_data unknown SCSI id %d\n", tag(), m_selected);
}
}
@@ -125,7 +125,7 @@ UINT8 legacy_scsi_host_adapter::get_status()
}
else
{
- logerror("%s: get_status unknown SCSI id %d\n", tag().c_str(), m_selected);
+ logerror("%s: get_status unknown SCSI id %d\n", tag(), m_selected);
return 0;
}
}
diff --git a/src/devices/machine/legscsi.h b/src/devices/machine/legscsi.h
index 32235ee61aa..b3d8800972c 100644
--- a/src/devices/machine/legscsi.h
+++ b/src/devices/machine/legscsi.h
@@ -13,9 +13,9 @@
class legacy_scsi_host_adapter : public device_t
{
public:
- legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ legacy_scsi_host_adapter(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- static void set_scsi_port(device_t &device, std::string tag) { downcast<legacy_scsi_host_adapter &>(device).m_scsi_port.set_tag(tag); }
+ static void set_scsi_port(device_t &device, const char *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 8244fd68325..88b9b8d51c7 100644
--- a/src/devices/machine/lh5810.cpp
+++ b/src/devices/machine/lh5810.cpp
@@ -27,7 +27,7 @@ const device_type LH5810 = &device_creator<lh5810_device>;
// lh5810_device - constructor
//-------------------------------------------------
-lh5810_device::lh5810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+lh5810_device::lh5810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LH5810, "LH5810", tag, owner, clock, "lh5810", __FILE__),
m_porta_r_cb(*this),
m_porta_w_cb(*this),
diff --git a/src/devices/machine/lh5810.h b/src/devices/machine/lh5810.h
index 6a3d8fcbd38..63bff576958 100644
--- a/src/devices/machine/lh5810.h
+++ b/src/devices/machine/lh5810.h
@@ -68,7 +68,7 @@ class lh5810_device : public device_t
{
public:
// construction/destruction
- lh5810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ lh5810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 4c8a5df3b14..efc9583981b 100644
--- a/src/devices/machine/linflash.cpp
+++ b/src/devices/machine/linflash.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "linflash.h"
-linear_flash_pccard_device::linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source) :
+linear_flash_pccard_device::linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
device_slot_card_interface(mconfig, *this), m_space(nullptr)
@@ -47,7 +47,7 @@ static ADDRESS_MAP_START(linear_flash_pccard_16mb, AS_0, 16, linear_flash_pccard
AM_RANGE(0x00c00000, 0x00ffffff) AM_DEVREADWRITE8("4u", intelfsh8_device, read, write, 0xff00)
ADDRESS_MAP_END
-linear_flash_pccard_16mb_device::linear_flash_pccard_16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+linear_flash_pccard_16mb_device::linear_flash_pccard_16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
linear_flash_pccard_device(mconfig, LINEAR_FLASH_PCCARD_16MB, "Linear Flash PCCARD (16MB)", tag, owner, clock, "linearflash16mb", __FILE__)
{
m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_16mb ) );
@@ -92,7 +92,7 @@ static ADDRESS_MAP_START(linear_flash_pccard_32mb, AS_0, 16, linear_flash_pccard
AM_RANGE(0x01c00000, 0x01ffffff) AM_DEVREADWRITE8("8u", intelfsh8_device, read, write, 0xff00)
ADDRESS_MAP_END
-linear_flash_pccard_32mb_device::linear_flash_pccard_32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+linear_flash_pccard_32mb_device::linear_flash_pccard_32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
linear_flash_pccard_device(mconfig, LINEAR_FLASH_PCCARD_32MB, "Linear Flash PCCARD (32MB)", tag, owner, clock, "linearflash32mb", __FILE__)
{
m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_32mb ) );
@@ -161,7 +161,7 @@ static ADDRESS_MAP_START(linear_flash_pccard_64mb, AS_0, 16, linear_flash_pccard
AM_RANGE(0x03c00000, 0x03ffffff) AM_DEVREADWRITE8("16u", intelfsh8_device, read, write, 0xff00)
ADDRESS_MAP_END
-linear_flash_pccard_64mb_device::linear_flash_pccard_64mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+linear_flash_pccard_64mb_device::linear_flash_pccard_64mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
linear_flash_pccard_device(mconfig, LINEAR_FLASH_PCCARD_64MB, "Linear Flash PCCARD (64MB)", tag, owner, clock, "linearflash64mb", __FILE__)
{
m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_64mb ) );
diff --git a/src/devices/machine/linflash.h b/src/devices/machine/linflash.h
index c588d9bca13..e6acfcf4ef3 100644
--- a/src/devices/machine/linflash.h
+++ b/src/devices/machine/linflash.h
@@ -19,7 +19,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write_memory) override;
protected:
- linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
+ linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -37,7 +37,7 @@ extern const device_type LINEAR_FLASH_PCCARD_16MB;
class linear_flash_pccard_16mb_device : public linear_flash_pccard_device
{
public:
- linear_flash_pccard_16mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ linear_flash_pccard_16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
@@ -50,7 +50,7 @@ extern const device_type LINEAR_FLASH_PCCARD_32MB;
class linear_flash_pccard_32mb_device : public linear_flash_pccard_device
{
public:
- linear_flash_pccard_32mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ linear_flash_pccard_32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
@@ -62,7 +62,7 @@ extern const device_type LINEAR_FLASH_PCCARD_64MB;
class linear_flash_pccard_64mb_device : public linear_flash_pccard_device
{
public:
- linear_flash_pccard_64mb_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ linear_flash_pccard_64mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/machine/lpc-acpi.cpp b/src/devices/machine/lpc-acpi.cpp
index b9cd34459ff..72d066affaa 100644
--- a/src/devices/machine/lpc-acpi.cpp
+++ b/src/devices/machine/lpc-acpi.cpp
@@ -36,7 +36,7 @@ DEVICE_ADDRESS_MAP_START(map, 32, lpc_acpi_device)
AM_RANGE(0x70, 0x73) AM_READWRITE8 (sw_irq_gen_r, sw_irq_gen_w, 0x000000ff)
ADDRESS_MAP_END
-lpc_acpi_device::lpc_acpi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+lpc_acpi_device::lpc_acpi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: lpc_device(mconfig, LPC_ACPI, "LPC ACPI", tag, owner, clock, "lpc_acpi", __FILE__)
{
}
@@ -88,7 +88,7 @@ READ16_MEMBER( lpc_acpi_device::pm1_sts_r)
WRITE16_MEMBER(lpc_acpi_device::pm1_sts_w)
{
pm1_sts &= ~data;
- logerror("%s: pm1_sts = %04x\n", tag().c_str(), pm1_sts);
+ logerror("%s: pm1_sts = %04x\n", tag(), pm1_sts);
}
READ16_MEMBER( lpc_acpi_device::pm1_en_r)
@@ -99,7 +99,7 @@ READ16_MEMBER( lpc_acpi_device::pm1_en_r)
WRITE16_MEMBER(lpc_acpi_device::pm1_en_w)
{
COMBINE_DATA(&pm1_en);
- logerror("%s: pm1_en = %04x\n", tag().c_str(), pm1_en);
+ logerror("%s: pm1_en = %04x\n", tag(), pm1_en);
}
READ32_MEMBER( lpc_acpi_device::pm1_cnt_r)
@@ -110,7 +110,7 @@ READ32_MEMBER( lpc_acpi_device::pm1_cnt_r)
WRITE32_MEMBER(lpc_acpi_device::pm1_cnt_w)
{
COMBINE_DATA(&pm1_cnt);
- logerror("%s: pm1_cnt = %08x\n", tag().c_str(), pm1_cnt);
+ logerror("%s: pm1_cnt = %08x\n", tag(), pm1_cnt);
}
READ32_MEMBER(lpc_acpi_device::pm1_tmr_r)
@@ -126,7 +126,7 @@ READ32_MEMBER( lpc_acpi_device::proc_cnt_r)
WRITE32_MEMBER(lpc_acpi_device::proc_cnt_w)
{
COMBINE_DATA(&proc_cnt);
- logerror("%s: proc_cnt = %08x\n", tag().c_str(), proc_cnt);
+ logerror("%s: proc_cnt = %08x\n", tag(), proc_cnt);
}
READ8_MEMBER( lpc_acpi_device::lv2_r)
@@ -142,7 +142,7 @@ READ32_MEMBER( lpc_acpi_device::gpe0_sts_r)
WRITE32_MEMBER(lpc_acpi_device::gpe0_sts_w)
{
COMBINE_DATA(&gpe0_sts);
- logerror("%s: gpe0_sts = %08x\n", tag().c_str(), gpe0_sts);
+ logerror("%s: gpe0_sts = %08x\n", tag(), gpe0_sts);
}
READ32_MEMBER( lpc_acpi_device::gpe0_en_r)
@@ -153,7 +153,7 @@ READ32_MEMBER( lpc_acpi_device::gpe0_en_r)
WRITE32_MEMBER(lpc_acpi_device::gpe0_en_w)
{
COMBINE_DATA(&gpe0_en);
- logerror("%s: gpe0_en = %08x\n", tag().c_str(), gpe0_en);
+ logerror("%s: gpe0_en = %08x\n", tag(), gpe0_en);
}
READ32_MEMBER( lpc_acpi_device::smi_en_r)
@@ -164,7 +164,7 @@ READ32_MEMBER( lpc_acpi_device::smi_en_r)
WRITE32_MEMBER(lpc_acpi_device::smi_en_w)
{
COMBINE_DATA(&smi_en);
- logerror("%s: smi_en = %08x\n", tag().c_str(), smi_en);
+ logerror("%s: smi_en = %08x\n", tag(), smi_en);
}
READ32_MEMBER( lpc_acpi_device::smi_sts_r)
@@ -175,7 +175,7 @@ READ32_MEMBER( lpc_acpi_device::smi_sts_r)
WRITE32_MEMBER(lpc_acpi_device::smi_sts_w)
{
COMBINE_DATA(&smi_sts);
- logerror("%s: smi_sts = %08x\n", tag().c_str(), smi_sts);
+ logerror("%s: smi_sts = %08x\n", tag(), smi_sts);
}
READ16_MEMBER( lpc_acpi_device::alt_gp_smi_en_r)
@@ -186,7 +186,7 @@ READ16_MEMBER( lpc_acpi_device::alt_gp_smi_en_r)
WRITE16_MEMBER(lpc_acpi_device::alt_gp_smi_en_w)
{
COMBINE_DATA(&alt_gp_smi_en);
- logerror("%s: alt_gp_smi_en = %04x\n", tag().c_str(), alt_gp_smi_en);
+ logerror("%s: alt_gp_smi_en = %04x\n", tag(), alt_gp_smi_en);
}
READ16_MEMBER( lpc_acpi_device::alt_gp_smi_sts_r)
@@ -197,7 +197,7 @@ READ16_MEMBER( lpc_acpi_device::alt_gp_smi_sts_r)
WRITE16_MEMBER(lpc_acpi_device::alt_gp_smi_sts_w)
{
COMBINE_DATA(&alt_gp_smi_sts);
- logerror("%s: alt_gp_smi_sts = %04x\n", tag().c_str(), alt_gp_smi_sts);
+ logerror("%s: alt_gp_smi_sts = %04x\n", tag(), alt_gp_smi_sts);
}
READ16_MEMBER( lpc_acpi_device::devact_sts_r)
@@ -208,7 +208,7 @@ READ16_MEMBER( lpc_acpi_device::devact_sts_r)
WRITE16_MEMBER(lpc_acpi_device::devact_sts_w)
{
COMBINE_DATA(&devact_sts);
- logerror("%s: devact_sts = %04x\n", tag().c_str(), devact_sts);
+ logerror("%s: devact_sts = %04x\n", tag(), devact_sts);
}
READ16_MEMBER( lpc_acpi_device::devtrap_en_r)
@@ -219,18 +219,18 @@ READ16_MEMBER( lpc_acpi_device::devtrap_en_r)
WRITE16_MEMBER(lpc_acpi_device::devtrap_en_w)
{
COMBINE_DATA(&devtrap_en);
- logerror("%s: devtrap_en = %04x\n", tag().c_str(), devtrap_en);
+ logerror("%s: devtrap_en = %04x\n", tag(), devtrap_en);
}
READ16_MEMBER( lpc_acpi_device::bus_addr_track_r)
{
- logerror("%s: read bus_addr_track\n", tag().c_str());
+ logerror("%s: read bus_addr_track\n", tag());
return 0;
}
READ8_MEMBER( lpc_acpi_device::bus_cyc_track_r)
{
- logerror("%s: read bus_cyc_track\n", tag().c_str());
+ logerror("%s: read bus_cyc_track\n", tag());
return 0;
}
@@ -243,7 +243,7 @@ READ8_MEMBER( lpc_acpi_device::tco_rld_r)
WRITE8_MEMBER( lpc_acpi_device::tco_rld_w)
{
tco_rld = data;
- logerror("%s: tco_rld = %02x\n", tag().c_str(), tco_rld);
+ logerror("%s: tco_rld = %02x\n", tag(), tco_rld);
}
READ8_MEMBER( lpc_acpi_device::tco_tmr_r)
@@ -254,7 +254,7 @@ READ8_MEMBER( lpc_acpi_device::tco_tmr_r)
WRITE8_MEMBER( lpc_acpi_device::tco_tmr_w)
{
tco_tmr = data;
- logerror("%s: tco_tmr = %02x\n", tag().c_str(), tco_tmr);
+ logerror("%s: tco_tmr = %02x\n", tag(), tco_tmr);
}
READ8_MEMBER( lpc_acpi_device::tco_dat_in_r)
@@ -265,7 +265,7 @@ READ8_MEMBER( lpc_acpi_device::tco_dat_in_r)
WRITE8_MEMBER( lpc_acpi_device::tco_dat_in_w)
{
tco_dat_in = data;
- logerror("%s: tco_dat_in = %02x\n", tag().c_str(), tco_dat_in);
+ logerror("%s: tco_dat_in = %02x\n", tag(), tco_dat_in);
}
READ8_MEMBER( lpc_acpi_device::tco_dat_out_r)
@@ -276,7 +276,7 @@ READ8_MEMBER( lpc_acpi_device::tco_dat_out_r)
WRITE8_MEMBER( lpc_acpi_device::tco_dat_out_w)
{
tco_dat_out = data;
- logerror("%s: tco_dat_out = %02x\n", tag().c_str(), tco_dat_out);
+ logerror("%s: tco_dat_out = %02x\n", tag(), tco_dat_out);
}
READ16_MEMBER( lpc_acpi_device::tco1_sts_r)
@@ -287,7 +287,7 @@ READ16_MEMBER( lpc_acpi_device::tco1_sts_r)
WRITE16_MEMBER(lpc_acpi_device::tco1_sts_w)
{
COMBINE_DATA(&tco1_sts);
- logerror("%s: tco1_sts = %04x\n", tag().c_str(), tco1_sts);
+ logerror("%s: tco1_sts = %04x\n", tag(), tco1_sts);
}
READ16_MEMBER( lpc_acpi_device::tco2_sts_r)
@@ -298,7 +298,7 @@ READ16_MEMBER( lpc_acpi_device::tco2_sts_r)
WRITE16_MEMBER(lpc_acpi_device::tco2_sts_w)
{
COMBINE_DATA(&tco2_sts);
- logerror("%s: tco2_sts = %04x\n", tag().c_str(), tco2_sts);
+ logerror("%s: tco2_sts = %04x\n", tag(), tco2_sts);
}
READ16_MEMBER( lpc_acpi_device::tco1_cnt_r)
@@ -309,7 +309,7 @@ READ16_MEMBER( lpc_acpi_device::tco1_cnt_r)
WRITE16_MEMBER(lpc_acpi_device::tco1_cnt_w)
{
COMBINE_DATA(&tco1_cnt);
- logerror("%s: tco1_cnt = %04x\n", tag().c_str(), tco1_cnt);
+ logerror("%s: tco1_cnt = %04x\n", tag(), tco1_cnt);
}
READ16_MEMBER( lpc_acpi_device::tco2_cnt_r)
@@ -320,7 +320,7 @@ READ16_MEMBER( lpc_acpi_device::tco2_cnt_r)
WRITE16_MEMBER(lpc_acpi_device::tco2_cnt_w)
{
COMBINE_DATA(&tco2_cnt);
- logerror("%s: tco2_cnt = %04x\n", tag().c_str(), tco2_cnt);
+ logerror("%s: tco2_cnt = %04x\n", tag(), tco2_cnt);
}
READ8_MEMBER( lpc_acpi_device::tco_message1_r)
@@ -331,7 +331,7 @@ READ8_MEMBER( lpc_acpi_device::tco_message1_r)
WRITE8_MEMBER( lpc_acpi_device::tco_message1_w)
{
tco_message1 = data;
- logerror("%s: tco_message1 = %02x\n", tag().c_str(), tco_message1);
+ logerror("%s: tco_message1 = %02x\n", tag(), tco_message1);
}
READ8_MEMBER( lpc_acpi_device::tco_message2_r)
@@ -342,7 +342,7 @@ READ8_MEMBER( lpc_acpi_device::tco_message2_r)
WRITE8_MEMBER( lpc_acpi_device::tco_message2_w)
{
tco_message2 = data;
- logerror("%s: tco_message2 = %02x\n", tag().c_str(), tco_message2);
+ logerror("%s: tco_message2 = %02x\n", tag(), tco_message2);
}
READ8_MEMBER( lpc_acpi_device::tco_wdstatus_r)
@@ -353,7 +353,7 @@ READ8_MEMBER( lpc_acpi_device::tco_wdstatus_r)
WRITE8_MEMBER( lpc_acpi_device::tco_wdstatus_w)
{
tco_wdstatus = data;
- logerror("%s: tco_wdstatus = %02x\n", tag().c_str(), tco_wdstatus);
+ logerror("%s: tco_wdstatus = %02x\n", tag(), tco_wdstatus);
}
READ8_MEMBER( lpc_acpi_device::sw_irq_gen_r)
@@ -364,5 +364,5 @@ READ8_MEMBER( lpc_acpi_device::sw_irq_gen_r)
WRITE8_MEMBER( lpc_acpi_device::sw_irq_gen_w)
{
sw_irq_gen = data;
- logerror("%s: sw_irq_gen = %02x\n", tag().c_str(), sw_irq_gen);
+ logerror("%s: sw_irq_gen = %02x\n", tag(), sw_irq_gen);
}
diff --git a/src/devices/machine/lpc-acpi.h b/src/devices/machine/lpc-acpi.h
index bf862155e71..bde29170f04 100644
--- a/src/devices/machine/lpc-acpi.h
+++ b/src/devices/machine/lpc-acpi.h
@@ -10,7 +10,7 @@
class lpc_acpi_device : public lpc_device {
public:
- lpc_acpi_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ lpc_acpi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
diff --git a/src/devices/machine/lpc-pit.cpp b/src/devices/machine/lpc-pit.cpp
index 2bb71a600ba..19a07373ec5 100644
--- a/src/devices/machine/lpc-pit.cpp
+++ b/src/devices/machine/lpc-pit.cpp
@@ -11,7 +11,7 @@ DEVICE_ADDRESS_MAP_START(map, 32, lpc_pit_device)
AM_RANGE(0x50, 0x53) AM_WRITE8 ( control_w, 0xff000000)
ADDRESS_MAP_END
-lpc_pit_device::lpc_pit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+lpc_pit_device::lpc_pit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: lpc_device(mconfig, LPC_PIT, "LPC PIT", tag, owner, clock, "lpc_pit", __FILE__)
{
}
@@ -32,16 +32,16 @@ void lpc_pit_device::device_reset()
READ8_MEMBER( lpc_pit_device::status_r)
{
- logerror("%s: status_r %d\n", tag().c_str(), offset);
+ logerror("%s: status_r %d\n", tag(), offset);
return 0xff;
}
WRITE8_MEMBER(lpc_pit_device::access_w)
{
- logerror("%s: access_w %d, %02x\n", tag().c_str(), offset, data);
+ logerror("%s: access_w %d, %02x\n", tag(), offset, data);
}
WRITE8_MEMBER(lpc_pit_device::control_w)
{
- logerror("%s: control_w %02x\n", tag().c_str(), data);
+ logerror("%s: control_w %02x\n", tag(), data);
}
diff --git a/src/devices/machine/lpc-pit.h b/src/devices/machine/lpc-pit.h
index 5b56388e9fe..a9e96a7b401 100644
--- a/src/devices/machine/lpc-pit.h
+++ b/src/devices/machine/lpc-pit.h
@@ -10,7 +10,7 @@
class lpc_pit_device : public lpc_device {
public:
- lpc_pit_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ lpc_pit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
diff --git a/src/devices/machine/lpc-rtc.cpp b/src/devices/machine/lpc-rtc.cpp
index 60a8e61c0ce..455ab99d2fb 100644
--- a/src/devices/machine/lpc-rtc.cpp
+++ b/src/devices/machine/lpc-rtc.cpp
@@ -14,7 +14,7 @@ DEVICE_ADDRESS_MAP_START(extmap, 32, lpc_rtc_device)
AM_RANGE(0x70, 0x77) AM_READWRITE8(exttarget_r, exttarget_w, 0xff000000)
ADDRESS_MAP_END
-lpc_rtc_device::lpc_rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+lpc_rtc_device::lpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: lpc_device(mconfig, LPC_RTC, "LPC RTC", tag, owner, clock, "lpc_rtc", __FILE__), cur_index(0), cur_extindex(0)
{
}
@@ -58,7 +58,7 @@ READ8_MEMBER( lpc_rtc_device::target_r)
WRITE8_MEMBER( lpc_rtc_device::target_w)
{
ram[cur_index] = data;
- logerror("%s: ram[%02x] = %02x\n", tag().c_str(), cur_index, data);
+ logerror("%s: ram[%02x] = %02x\n", tag(), cur_index, data);
}
READ8_MEMBER( lpc_rtc_device::extindex_r)
@@ -79,5 +79,5 @@ READ8_MEMBER( lpc_rtc_device::exttarget_r)
WRITE8_MEMBER( lpc_rtc_device::exttarget_w)
{
ram[cur_extindex|128] = data;
- logerror("%s: ram[%02x] = %02x\n", tag().c_str(), cur_extindex|128, data);
+ logerror("%s: ram[%02x] = %02x\n", tag(), cur_extindex|128, data);
}
diff --git a/src/devices/machine/lpc-rtc.h b/src/devices/machine/lpc-rtc.h
index 1e8a778354c..f46a3ca2238 100644
--- a/src/devices/machine/lpc-rtc.h
+++ b/src/devices/machine/lpc-rtc.h
@@ -10,7 +10,7 @@
class lpc_rtc_device : public lpc_device {
public:
- lpc_rtc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ lpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
diff --git a/src/devices/machine/lpc.cpp b/src/devices/machine/lpc.cpp
index 3a77b09abb7..afb51435f23 100644
--- a/src/devices/machine/lpc.cpp
+++ b/src/devices/machine/lpc.cpp
@@ -2,7 +2,7 @@
// copyright-holders:Olivier Galibert
#include "lpc.h"
-lpc_device::lpc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+lpc_device::lpc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/devices/machine/lpc.h b/src/devices/machine/lpc.h
index 5b42c66976d..6ade06d03ff 100644
--- a/src/devices/machine/lpc.h
+++ b/src/devices/machine/lpc.h
@@ -7,7 +7,7 @@
class lpc_device : public device_t {
public:
- lpc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ lpc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) = 0;
diff --git a/src/devices/machine/lpci.cpp b/src/devices/machine/lpci.cpp
index 7608d40645e..d03667d5be8 100644
--- a/src/devices/machine/lpci.cpp
+++ b/src/devices/machine/lpci.cpp
@@ -89,11 +89,12 @@ const device_type PCI_BUS_LEGACY = &device_creator<pci_bus_legacy_device>;
//-------------------------------------------------
// pci_bus_legacy_device - constructor
//-------------------------------------------------
-pci_bus_legacy_device::pci_bus_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+pci_bus_legacy_device::pci_bus_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PCI_BUS_LEGACY, "PCI Bus Legacy", tag, owner, clock, "pci_bus_legacy", __FILE__),
m_father(nullptr)
{
for (int i = 0; i < ARRAY_LENGTH(m_devtag); i++) {
+ m_devtag[i]= nullptr;
m_read_callback[i] = nullptr;
m_write_callback[i] = nullptr;
}
@@ -132,7 +133,7 @@ READ32_MEMBER( pci_bus_legacy_device::read )
}
if (LOG_PCI)
- logerror("read('%s'): offset=%d result=0x%08X\n", tag().c_str(), offset, result);
+ logerror("read('%s'): offset=%d result=0x%08X\n", tag(), offset, result);
return result;
}
@@ -164,7 +165,7 @@ WRITE32_MEMBER( pci_bus_legacy_device::write )
offset %= 2;
if (LOG_PCI)
- logerror("write('%s'): offset=%d data=0x%08X\n", tag().c_str(), offset, data);
+ logerror("write('%s'): offset=%d data=0x%08X\n", tag(), offset, data);
switch (offset)
{
@@ -262,7 +263,7 @@ void pci_bus_legacy_device::device_start()
/* find all our devices */
for (int i = 0; i < ARRAY_LENGTH(m_devtag); i++)
- if (!m_devtag[i].empty())
+ if (m_devtag[i] != nullptr)
m_device[i] = machine().device(m_devtag[i]);
if (m_father != nullptr) {
diff --git a/src/devices/machine/lpci.h b/src/devices/machine/lpci.h
index 86111eba18e..849f27d206d 100644
--- a/src/devices/machine/lpci.h
+++ b/src/devices/machine/lpci.h
@@ -24,7 +24,7 @@ class pci_bus_legacy_device : public device_t
{
public:
// construction/destruction
- pci_bus_legacy_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pci_bus_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ32_MEMBER( read );
DECLARE_WRITE32_MEMBER( write );
@@ -34,7 +34,7 @@ public:
void set_busnum(int busnum) { m_busnum = busnum; }
void set_father(const char *father) { m_father = father; }
- void set_device(int num, std::string tag, pci_read_func read_func, pci_write_func write_func) {
+ void set_device(int num, const char *tag, pci_read_func read_func, pci_write_func write_func) {
m_devtag[num] = tag; m_read_callback[num] = read_func; m_write_callback[num] = write_func; }
pci_bus_legacy_device *pci_search_bustree(int busnum, int devicenum, pci_bus_legacy_device *pcibus);
@@ -48,7 +48,7 @@ protected:
private:
UINT8 m_busnum;
- std::string m_devtag[32];
+ const char * m_devtag[32];
pci_read_func m_read_callback[32];
pci_write_func m_write_callback[32];
const char * m_father;
diff --git a/src/devices/machine/m6m80011ap.cpp b/src/devices/machine/m6m80011ap.cpp
index a5ffa050560..a8dea68d6ef 100644
--- a/src/devices/machine/m6m80011ap.cpp
+++ b/src/devices/machine/m6m80011ap.cpp
@@ -27,7 +27,7 @@ const device_type M6M80011AP = &device_creator<m6m80011ap_device>;
// m6m80011ap_device - constructor
//-------------------------------------------------
-m6m80011ap_device::m6m80011ap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+m6m80011ap_device::m6m80011ap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, M6M80011AP, "M6M80011AP EEPROM", tag, owner, clock, "m6m80011ap", __FILE__),
device_nvram_interface(mconfig, *this), m_latch(0), m_reset_line(0), m_cmd_stream_pos(0), m_current_cmd(0), m_read_latch(0), m_current_addr(0), m_eeprom_we(0), m_eeprom_state()
{
diff --git a/src/devices/machine/m6m80011ap.h b/src/devices/machine/m6m80011ap.h
index b7729799035..dfea6c06c14 100644
--- a/src/devices/machine/m6m80011ap.h
+++ b/src/devices/machine/m6m80011ap.h
@@ -43,7 +43,7 @@ class m6m80011ap_device : public device_t,
{
public:
// construction/destruction
- m6m80011ap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m6m80011ap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_READ_LINE_MEMBER( read_bit );
diff --git a/src/devices/machine/mb14241.cpp b/src/devices/machine/mb14241.cpp
index 8948b28703c..44c49fb4e88 100644
--- a/src/devices/machine/mb14241.cpp
+++ b/src/devices/machine/mb14241.cpp
@@ -17,7 +17,7 @@
const device_type MB14241 = &device_creator<mb14241_device>;
-mb14241_device::mb14241_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mb14241_device::mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB14241, "MB14241 Data Shifter", tag, owner, clock, "mb14241", __FILE__), m_shift_data(0), m_shift_count(0)
{
}
diff --git a/src/devices/machine/mb14241.h b/src/devices/machine/mb14241.h
index a8849d6127d..01c2d1b0dde 100644
--- a/src/devices/machine/mb14241.h
+++ b/src/devices/machine/mb14241.h
@@ -13,7 +13,7 @@
class mb14241_device : public device_t
{
public:
- mb14241_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER ( shift_count_w );
DECLARE_WRITE8_MEMBER ( shift_data_w );
diff --git a/src/devices/machine/mb3773.cpp b/src/devices/machine/mb3773.cpp
index 65fc7a0f615..d749d8abc1a 100644
--- a/src/devices/machine/mb3773.cpp
+++ b/src/devices/machine/mb3773.cpp
@@ -27,7 +27,7 @@ const device_type MB3773 = &device_creator<mb3773_device>;
// mb3773_device - constructor
//-------------------------------------------------
-mb3773_device::mb3773_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+mb3773_device::mb3773_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: device_t(mconfig, MB3773, "MB3773 Power Supply Monitor", tag, owner, clock, "mb3773", __FILE__), m_watchdog_timer(nullptr), m_ck(0)
{
}
diff --git a/src/devices/machine/mb3773.h b/src/devices/machine/mb3773.h
index 2f607bb7044..fa6fdd583fa 100644
--- a/src/devices/machine/mb3773.h
+++ b/src/devices/machine/mb3773.h
@@ -29,7 +29,7 @@ class mb3773_device :
{
public:
// construction/destruction
- mb3773_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
+ mb3773_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
// I/O operations
WRITE_LINE_MEMBER( write_line_ck );
diff --git a/src/devices/machine/mb8421.cpp b/src/devices/machine/mb8421.cpp
index 2d4fd1525b7..0d3cb819a66 100644
--- a/src/devices/machine/mb8421.cpp
+++ b/src/devices/machine/mb8421.cpp
@@ -20,7 +20,7 @@ const device_type MB8421 = &device_creator<mb8421_device>;
// mb8421_device - constructor
//-------------------------------------------------
-mb8421_device::mb8421_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mb8421_device::mb8421_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB8421, "MB8421 DPSRAM", tag, owner, clock, "mb8421", __FILE__),
m_intl_handler(*this),
m_intr_handler(*this)
diff --git a/src/devices/machine/mb8421.h b/src/devices/machine/mb8421.h
index adefd522f04..d1d23ab0691 100644
--- a/src/devices/machine/mb8421.h
+++ b/src/devices/machine/mb8421.h
@@ -38,7 +38,7 @@
class mb8421_device : public device_t
{
public:
- mb8421_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb8421_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<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 c36585fb126..a94380456f5 100644
--- a/src/devices/machine/mb87078.cpp
+++ b/src/devices/machine/mb87078.cpp
@@ -104,7 +104,7 @@ static const int mb87078_gain_percent[66] = {
const device_type MB87078 = &device_creator<mb87078_device>;
-mb87078_device::mb87078_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mb87078_device::mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB87078, "MB87078 Volume Controller", tag, owner, clock, "mb87078", __FILE__),
m_channel_latch(0),
m_reset_comp(0),
diff --git a/src/devices/machine/mb87078.h b/src/devices/machine/mb87078.h
index 6e72b5ea05d..9eeb6c7526f 100644
--- a/src/devices/machine/mb87078.h
+++ b/src/devices/machine/mb87078.h
@@ -25,7 +25,7 @@
class mb87078_device : public device_t
{
public:
- mb87078_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~mb87078_device() {}
template<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 df6f90625e4..7f2c096023c 100644
--- a/src/devices/machine/mb8795.cpp
+++ b/src/devices/machine/mb8795.cpp
@@ -18,7 +18,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, mb8795_device)
AM_RANGE(0x8, 0xf) AM_READWRITE(mac_r, mac_w) // Mapping limitation, real is up to 0xd
ADDRESS_MAP_END
-mb8795_device::mb8795_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+mb8795_device::mb8795_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MB8795, "Fujitsu MB8795", tag, owner, clock, "mb8795", __FILE__),
device_network_interface(mconfig, *this, 10), txstat(0), txmask(0), rxstat(0), rxmask(0), txmode(0), rxmode(0), txlen(0), rxlen(0), txcount(0), drq_tx(false),
drq_rx(false), irq_tx(false), irq_rx(false), timer_tx(nullptr), timer_rx(nullptr),
@@ -81,7 +81,7 @@ void mb8795_device::recv_cb(UINT8 *buf, int len)
READ8_MEMBER(mb8795_device::txstat_r)
{
- // logerror("%s: txstat_r %02x (%08x)\n", tag().c_str(), txstat, space.device().safe_pc());
+ // logerror("%s: txstat_r %02x (%08x)\n", tag(), txstat, space.device().safe_pc());
return txstat;
}
@@ -89,12 +89,12 @@ WRITE8_MEMBER(mb8795_device::txstat_w)
{
txstat = txstat & (0xf0 | ~data);
check_irq();
- logerror("%s: txstat_w %02x (%08x)\n", tag().c_str(), txstat, space.device().safe_pc());
+ logerror("%s: txstat_w %02x (%08x)\n", tag(), txstat, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::txmask_r)
{
- logerror("%s: txmask_r %02x (%08x)\n", tag().c_str(), txmask, space.device().safe_pc());
+ logerror("%s: txmask_r %02x (%08x)\n", tag(), txmask, space.device().safe_pc());
return txmask;
}
@@ -102,12 +102,12 @@ WRITE8_MEMBER(mb8795_device::txmask_w)
{
txmask = data & 0xaf;
check_irq();
- logerror("%s: txmask_w %02x (%08x)\n", tag().c_str(), txmask, space.device().safe_pc());
+ logerror("%s: txmask_w %02x (%08x)\n", tag(), txmask, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::rxstat_r)
{
- logerror("%s: rxstat_r %02x (%08x)\n", tag().c_str(), rxstat, space.device().safe_pc());
+ logerror("%s: rxstat_r %02x (%08x)\n", tag(), rxstat, space.device().safe_pc());
return rxstat;
}
@@ -115,12 +115,12 @@ WRITE8_MEMBER(mb8795_device::rxstat_w)
{
rxstat = rxstat & (0x70 | ~data);
check_irq();
- logerror("%s: rxstat_w %02x (%08x)\n", tag().c_str(), rxstat, space.device().safe_pc());
+ logerror("%s: rxstat_w %02x (%08x)\n", tag(), rxstat, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::rxmask_r)
{
- logerror("%s: rxmask_r %02x (%08x)\n", tag().c_str(), rxmask, space.device().safe_pc());
+ logerror("%s: rxmask_r %02x (%08x)\n", tag(), rxmask, space.device().safe_pc());
return rxmask;
}
@@ -128,31 +128,31 @@ WRITE8_MEMBER(mb8795_device::rxmask_w)
{
rxmask = data & 0x9f;
check_irq();
- logerror("%s: rxmask_w %02x (%08x)\n", tag().c_str(), rxmask, space.device().safe_pc());
+ logerror("%s: rxmask_w %02x (%08x)\n", tag(), rxmask, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::txmode_r)
{
- logerror("%s: txmode_r %02x (%08x)\n", tag().c_str(), txmode, space.device().safe_pc());
+ logerror("%s: txmode_r %02x (%08x)\n", tag(), txmode, space.device().safe_pc());
return txmode;
}
WRITE8_MEMBER(mb8795_device::txmode_w)
{
txmode = data;
- logerror("%s: txmode_w %02x (%08x)\n", tag().c_str(), txmode, space.device().safe_pc());
+ logerror("%s: txmode_w %02x (%08x)\n", tag(), txmode, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::rxmode_r)
{
- logerror("%s: rxmode_r %02x (%08x)\n", tag().c_str(), rxmode, space.device().safe_pc());
+ logerror("%s: rxmode_r %02x (%08x)\n", tag(), rxmode, space.device().safe_pc());
return rxmode;
}
WRITE8_MEMBER(mb8795_device::rxmode_w)
{
rxmode = data;
- logerror("%s: rxmode_w %02x (%08x)\n", tag().c_str(), rxmode, space.device().safe_pc());
+ logerror("%s: rxmode_w %02x (%08x)\n", tag(), rxmode, space.device().safe_pc());
}
WRITE8_MEMBER(mb8795_device::reset_w)
@@ -163,7 +163,7 @@ WRITE8_MEMBER(mb8795_device::reset_w)
READ8_MEMBER(mb8795_device::tdc_lsb_r)
{
- logerror("%s: tdc_lsb_r %02x (%08x)\n", tag().c_str(), txcount & 0xff, space.device().safe_pc());
+ logerror("%s: tdc_lsb_r %02x (%08x)\n", tag(), txcount & 0xff, space.device().safe_pc());
return txcount;
}
@@ -172,7 +172,7 @@ READ8_MEMBER(mb8795_device::mac_r)
if(offset < 6)
return mac[offset];
if(offset == 7) {
- logerror("%s: tdc_msb_r %02x (%08x)\n", tag().c_str(), txcount >> 8, space.device().safe_pc());
+ logerror("%s: tdc_msb_r %02x (%08x)\n", tag(), txcount >> 8, space.device().safe_pc());
return (txcount >> 8) & 0x3f;
}
return 0;
@@ -204,7 +204,7 @@ void mb8795_device::tx_dma_w(UINT8 data, bool eof)
drq_tx_cb(drq_tx);
if(eof) {
- logerror("%s: send packet, dest=%02x.%02x.%02x.%02x.%02x.%02x len=%04x loopback=%s\n", tag().c_str(),
+ logerror("%s: send packet, dest=%02x.%02x.%02x.%02x.%02x.%02x len=%04x loopback=%s\n", tag(),
txbuf[0], txbuf[1], txbuf[2], txbuf[3], txbuf[4], txbuf[5],
txlen,
txmode & EN_TMD_LB_DISABLE ? "off" : "on");
@@ -263,7 +263,7 @@ void mb8795_device::receive()
keep = true;
break;
}
- logerror("%s: received packet for %02x.%02x.%02x.%02x.%02x.%02x len=%04x, mode=%d -> %s\n", tag().c_str(),
+ logerror("%s: received packet for %02x.%02x.%02x.%02x.%02x.%02x len=%04x, mode=%d -> %s\n", tag(),
rxbuf[0], rxbuf[1], rxbuf[2], rxbuf[3], rxbuf[4], rxbuf[5],
rxlen, rxmode & 3, keep ? "kept" : "dropped");
if(!keep)
diff --git a/src/devices/machine/mb8795.h b/src/devices/machine/mb8795.h
index b1f8b754e80..4811d38c04d 100644
--- a/src/devices/machine/mb8795.h
+++ b/src/devices/machine/mb8795.h
@@ -24,7 +24,7 @@ class mb8795_device : public device_t,
public device_network_interface
{
public:
- mb8795_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb8795_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 9335204e3ca..1b0894c2007 100644
--- a/src/devices/machine/mb89352.cpp
+++ b/src/devices/machine/mb89352.cpp
@@ -115,7 +115,7 @@ const device_type MB89352A = &device_creator<mb89352_device>;
* Device
*/
-mb89352_device::mb89352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+mb89352_device::mb89352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
legacy_scsi_host_adapter(mconfig, MB89352A, "MB89352A", tag, owner, clock, "mb89352", __FILE__),
m_irq_cb(*this),
m_drq_cb(*this)
diff --git a/src/devices/machine/mb89352.h b/src/devices/machine/mb89352.h
index 15a808f3b84..faae5c4ab3f 100644
--- a/src/devices/machine/mb89352.h
+++ b/src/devices/machine/mb89352.h
@@ -60,7 +60,7 @@ class mb89352_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- mb89352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb89352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<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 975378a11db..2e4f210a865 100644
--- a/src/devices/machine/mb89363b.cpp
+++ b/src/devices/machine/mb89363b.cpp
@@ -84,7 +84,7 @@
extern const device_type MB89363B = &device_creator<mb89363b_device>;
-mb89363b_device::mb89363b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mb89363b_device::mb89363b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB89363B, "MB89363 I/O", tag, owner, clock, "mb89363b", __FILE__),
m_i8255_a(*this, "i8255_a"),
m_i8255_b(*this, "i8255_b"),
diff --git a/src/devices/machine/mb89363b.h b/src/devices/machine/mb89363b.h
index bf03320df25..85b1913e6d1 100644
--- a/src/devices/machine/mb89363b.h
+++ b/src/devices/machine/mb89363b.h
@@ -66,7 +66,7 @@ class mb89363b_device : public device_t
{
public:
// construction/destruction
- mb89363b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb89363b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/devices/machine/mb89371.cpp b/src/devices/machine/mb89371.cpp
index fd29deb94a1..1188f295725 100644
--- a/src/devices/machine/mb89371.cpp
+++ b/src/devices/machine/mb89371.cpp
@@ -12,7 +12,7 @@
const device_type MB89371 = &device_creator<mb89371_device>;
-mb89371_device::mb89371_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+mb89371_device::mb89371_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: device_t(mconfig, MB89371, "MB89371 Dual Serial UART", tag, owner, clock, "mb89371", __FILE__)
{
}
diff --git a/src/devices/machine/mb89371.h b/src/devices/machine/mb89371.h
index 5862c202f6b..f7d5c1a2bad 100644
--- a/src/devices/machine/mb89371.h
+++ b/src/devices/machine/mb89371.h
@@ -17,7 +17,7 @@ class mb89371_device : public device_t
{
public:
// construction/destruction
- mb89371_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb89371_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( read );
diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp
index dccbf078ef4..9166e189952 100644
--- a/src/devices/machine/mc146818.cpp
+++ b/src/devices/machine/mc146818.cpp
@@ -30,7 +30,7 @@ const device_type MC146818 = &device_creator<mc146818_device>;
// mc146818_device - constructor
//-------------------------------------------------
-mc146818_device::mc146818_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc146818_device::mc146818_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC146818, "MC146818 RTC", tag, owner, clock, "mc146818", __FILE__),
device_nvram_interface(mconfig, *this),
m_index(0),
@@ -45,7 +45,7 @@ mc146818_device::mc146818_device(const machine_config &mconfig, std::string tag,
{
}
-mc146818_device::mc146818_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mc146818_device::mc146818_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nvram_interface(mconfig, *this),
m_index(0),
diff --git a/src/devices/machine/mc146818.h b/src/devices/machine/mc146818.h
index c45b05ea42e..c1c30eae17e 100644
--- a/src/devices/machine/mc146818.h
+++ b/src/devices/machine/mc146818.h
@@ -57,8 +57,8 @@ class mc146818_device : public device_t,
{
public:
// construction/destruction
- mc146818_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- mc146818_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mc146818_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc146818_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// callbacks
template<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 27d2536a5f0..f93dc1b5ab1 100644
--- a/src/devices/machine/mc2661.cpp
+++ b/src/devices/machine/mc2661.cpp
@@ -94,7 +94,7 @@ enum
// mc2661_device - constructor
//-------------------------------------------------
-mc2661_device::mc2661_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+mc2661_device::mc2661_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MC2661, "MC2661", tag, owner, clock, "mc2661", __FILE__),
device_serial_interface(mconfig, *this),
m_write_txd(*this),
@@ -264,7 +264,7 @@ WRITE8_MEMBER( mc2661_device::write )
switch (offset & 0x03)
{
case REGISTER_HOLDING:
- if (LOG) logerror("MC2661 '%s' Transmit Holding Register: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("MC2661 '%s' Transmit Holding Register: %02x\n", tag(), data);
m_thr = data;
if(COMMAND_TXEN)
@@ -283,7 +283,7 @@ WRITE8_MEMBER( mc2661_device::write )
break;
case REGISTER_SYNC:
- if (LOG) logerror("MC2661 '%s' Sync Register %u: %02x\n", tag().c_str(), m_sync_index + 1, data);
+ if (LOG) logerror("MC2661 '%s' Sync Register %u: %02x\n", tag(), m_sync_index + 1, data);
m_sync[m_sync_index] = data;
@@ -292,7 +292,7 @@ WRITE8_MEMBER( mc2661_device::write )
break;
case REGISTER_MODE:
- if (LOG) logerror("MC2661 '%s' Mode Register %u: %02x\n", tag().c_str(), m_mode_index + 1, data);
+ if (LOG) logerror("MC2661 '%s' Mode Register %u: %02x\n", tag(), m_mode_index + 1, data);
m_mr[m_mode_index] = data;
@@ -383,7 +383,7 @@ WRITE8_MEMBER( mc2661_device::write )
break;
case REGISTER_COMMAND:
- if (LOG) logerror("MC2661 '%s' Command Register: %02x\n", tag().c_str(), data);
+ if (LOG) logerror("MC2661 '%s' Command Register: %02x\n", tag(), data);
m_cr = data & 0xef;
@@ -431,7 +431,7 @@ WRITE8_MEMBER( mc2661_device::write )
WRITE_LINE_MEMBER( mc2661_device::dsr_w )
{
- if (LOG) logerror("MC2661 '%s' Data Set Ready: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MC2661 '%s' Data Set Ready: %u\n", tag(), state);
if (state)
{
@@ -450,7 +450,7 @@ WRITE_LINE_MEMBER( mc2661_device::dsr_w )
WRITE_LINE_MEMBER( mc2661_device::dcd_w )
{
- if (LOG) logerror("MC2661 '%s' Data Carrier Detect: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MC2661 '%s' Data Carrier Detect: %u\n", tag(), state);
if (state)
{
@@ -469,7 +469,7 @@ WRITE_LINE_MEMBER( mc2661_device::dcd_w )
WRITE_LINE_MEMBER( mc2661_device::cts_w )
{
- if (LOG) logerror("MC2661 '%s' Clear to Send: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MC2661 '%s' Clear to Send: %u\n", tag(), state);
}
diff --git a/src/devices/machine/mc2661.h b/src/devices/machine/mc2661.h
index bcbe2157e1e..a18aa0141f1 100644
--- a/src/devices/machine/mc2661.h
+++ b/src/devices/machine/mc2661.h
@@ -79,7 +79,7 @@ class mc2661_device : public device_t,
{
public:
// construction/destruction
- mc2661_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc2661_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void static_set_rxc(device_t &device, int clock) { downcast<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 ffe47f686ac..deb73d0eaa4 100644
--- a/src/devices/machine/mc68328.cpp
+++ b/src/devices/machine/mc68328.cpp
@@ -31,7 +31,7 @@ static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, co
const device_type MC68328 = &device_creator<mc68328_device>;
-mc68328_device::mc68328_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc68328_device::mc68328_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC68328, "MC68328 (DragonBall) Integrated Processor", tag, owner, clock, "mc68328", __FILE__), m_rtc(nullptr), m_pwm(nullptr),
m_out_port_a_cb(*this),
m_out_port_b_cb(*this),
diff --git a/src/devices/machine/mc68328.h b/src/devices/machine/mc68328.h
index c11aeae5b22..c01e2ab471b 100644
--- a/src/devices/machine/mc68328.h
+++ b/src/devices/machine/mc68328.h
@@ -606,10 +606,10 @@ struct mc68328_regs_t
class mc68328_device : public device_t
{
public:
- mc68328_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc68328_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~mc68328_device() {}
- static void static_set_cpu_tag(device_t &device, std::string tag) { downcast<mc68328_device &>(device).m_cpu.set_tag(tag); }
+ static void static_set_cpu_tag(device_t &device, const char *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 3d68988d15f..04a7b6a0906 100644
--- a/src/devices/machine/mc6843.cpp
+++ b/src/devices/machine/mc6843.cpp
@@ -74,7 +74,7 @@ static const char *const mc6843_cmd[16] =
const device_type MC6843 = &device_creator<mc6843_device>;
-mc6843_device::mc6843_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc6843_device::mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC6843, "MC6843 floppy controller", tag, owner, clock, "mc6843", __FILE__),
m_write_irq(*this),
m_CTAR(0),
diff --git a/src/devices/machine/mc6843.h b/src/devices/machine/mc6843.h
index d9eb57cddfd..9dea3271e0d 100644
--- a/src/devices/machine/mc6843.h
+++ b/src/devices/machine/mc6843.h
@@ -19,7 +19,7 @@
class mc6843_device : public device_t
{
public:
- mc6843_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~mc6843_device() {}
template<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 c213dc04669..18b9f723bfb 100644
--- a/src/devices/machine/mc6846.cpp
+++ b/src/devices/machine/mc6846.cpp
@@ -45,7 +45,7 @@
const device_type MC6846 = &device_creator<mc6846_device>;
-mc6846_device::mc6846_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc6846_device::mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC6846, "MC6846 Programmable Timer", tag, owner, clock, "mc6846", __FILE__),
m_out_port_cb(*this),
m_out_cp1_cb(*this),
diff --git a/src/devices/machine/mc6846.h b/src/devices/machine/mc6846.h
index 7444980bed3..bb198ee64d7 100644
--- a/src/devices/machine/mc6846.h
+++ b/src/devices/machine/mc6846.h
@@ -34,7 +34,7 @@
class mc6846_device : public device_t
{
public:
- mc6846_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~mc6846_device() {}
template<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 6d323b35d52..b0cf1ff9ca9 100644
--- a/src/devices/machine/mc6852.cpp
+++ b/src/devices/machine/mc6852.cpp
@@ -93,7 +93,7 @@ const device_type MC6852 = &device_creator<mc6852_device>;
// mc6852_device - constructor
//-------------------------------------------------
-mc6852_device::mc6852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+mc6852_device::mc6852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MC6852, "MC6852", tag, owner, clock, "mc6852", __FILE__),
device_serial_interface(mconfig, *this),
m_write_tx_data(*this),
@@ -270,7 +270,7 @@ WRITE8_MEMBER( mc6852_device::write )
Register is set to ones.
*/
- if (LOG) logerror("MC6852 '%s' Receiver Reset\n", tag().c_str());
+ if (LOG) logerror("MC6852 '%s' Receiver Reset\n", tag());
m_status &= ~(S_RX_OVRN | S_PE | S_DCD | S_RDA);
m_rsr = 0xff;
@@ -286,15 +286,15 @@ WRITE8_MEMBER( mc6852_device::write )
and inhibits the TDRA status bit (in the one-sync-character
and two-sync-character modes).*/
- if (LOG) logerror("MC6852 '%s' Transmitter Reset\n", tag().c_str());
+ if (LOG) logerror("MC6852 '%s' Transmitter Reset\n", tag());
m_status &= ~(S_TUF | S_CTS | S_TDRA);
}
if (LOG)
{
- if (data & C1_STRIP_SYNC) logerror("MC6852 '%s' Strip Synchronization Characters\n", tag().c_str());
- if (data & C1_CLEAR_SYNC) logerror("MC6852 '%s' Clear Synchronization\n", tag().c_str());
+ if (data & C1_STRIP_SYNC) logerror("MC6852 '%s' Strip Synchronization Characters\n", tag());
+ if (data & C1_CLEAR_SYNC) logerror("MC6852 '%s' Clear Synchronization\n", tag());
}
m_cr[0] = data;
diff --git a/src/devices/machine/mc6852.h b/src/devices/machine/mc6852.h
index 6d18bdd68d2..68cd76f6126 100644
--- a/src/devices/machine/mc6852.h
+++ b/src/devices/machine/mc6852.h
@@ -66,7 +66,7 @@ class mc6852_device : public device_t,
{
public:
// construction/destruction
- mc6852_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc6852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_rx_clock(device_t &device, int clock) { downcast<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 d14a5e666c8..3461d58dde5 100644
--- a/src/devices/machine/mc6854.cpp
+++ b/src/devices/machine/mc6854.cpp
@@ -167,7 +167,7 @@ static const int word_length[4] = { 5, 6, 7, 8 };
const device_type MC6854 = &device_creator<mc6854_device>;
-mc6854_device::mc6854_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc6854_device::mc6854_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC6854, "MC6854 ADLC", tag, owner, clock, "mc6854", __FILE__),
m_out_irq_cb(*this),
m_out_txd_cb(*this),
diff --git a/src/devices/machine/mc6854.h b/src/devices/machine/mc6854.h
index 64f083addc5..9c665d0429b 100644
--- a/src/devices/machine/mc6854.h
+++ b/src/devices/machine/mc6854.h
@@ -41,7 +41,7 @@ typedef device_delegate<void (UINT8 *data, int length)> mc6854_out_frame_delegat
class mc6854_device : public device_t
{
public:
- mc6854_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc6854_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~mc6854_device() {}
template<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 eee90e35867..00b38347285 100644
--- a/src/devices/machine/mc68681.cpp
+++ b/src/devices/machine/mc68681.cpp
@@ -64,7 +64,7 @@ MACHINE_CONFIG_END
// LIVE DEVICE
//**************************************************************************
-mc68681_device::mc68681_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc68681_device::mc68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC68681, "MC68681 DUART", tag, owner, clock, "mc68681", __FILE__),
m_chanA(*this, CHANA_TAG),
m_chanB(*this, CHANB_TAG),
@@ -294,7 +294,7 @@ READ8_MEMBER( mc68681_device::read )
offset &= 0xf;
- LOG(( "Reading 68681 (%s) reg %x (%s) ", tag().c_str(), offset, duart68681_reg_read_names[offset] ));
+ LOG(( "Reading 68681 (%s) reg %x (%s) ", tag(), offset, duart68681_reg_read_names[offset] ));
switch (offset)
{
@@ -395,7 +395,7 @@ READ8_MEMBER( mc68681_device::read )
WRITE8_MEMBER( mc68681_device::write )
{
offset &= 0x0f;
- LOG(( "Writing 68681 (%s) reg %x (%s) with %04x\n", tag().c_str(), offset, duart68681_reg_write_names[offset], data ));
+ LOG(( "Writing 68681 (%s) reg %x (%s) with %04x\n", tag(), offset, duart68681_reg_write_names[offset], data ));
switch(offset)
{
case 0x00: /* MRA */
@@ -468,7 +468,7 @@ WRITE8_MEMBER( mc68681_device::write )
case 0x0d: /* OPCR */
if ((data != 0x00) && ((data & 0xc) != 0x4))
- logerror( "68681 (%s): Unhandled OPCR value: %02x\n", tag().c_str(), data);
+ logerror( "68681 (%s): Unhandled OPCR value: %02x\n", tag(), data);
OPCR = data;
break;
@@ -644,7 +644,7 @@ void mc68681_device::set_ISR_bits(int mask)
// DUART channel class stuff
-mc68681_channel::mc68681_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc68681_channel::mc68681_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC68681_CHANNEL, "MC68681 DUART CHANNEL", tag, owner, clock, "mc68681_channel", __FILE__),
device_serial_interface(mconfig, *this),
MR1(0),
@@ -702,7 +702,7 @@ void mc68681_channel::rcv_complete()
{
receive_register_extract();
-// printf("%s ch %d rcv complete\n", tag().c_str(), m_ch);
+// printf("%s ch %d rcv complete\n", tag(), m_ch);
if ( rx_enabled )
{
@@ -724,7 +724,7 @@ void mc68681_channel::rcv_complete()
void mc68681_channel::tra_complete()
{
-// printf("%s ch %d Tx complete\n", tag().c_str(), m_ch);
+// printf("%s ch %d Tx complete\n", tag(), m_ch);
tx_ready = 1;
SR |= STATUS_TRANSMITTER_READY;
@@ -761,7 +761,7 @@ void mc68681_channel::tra_callback()
if ((MR2&0xC0) != 0x80)
{
int bit = transmit_register_get_data_bit();
-// printf("%s ch %d transmit %d\n", tag().c_str(), m_ch, bit);
+// printf("%s ch %d transmit %d\n", tag(), m_ch, bit);
if (m_ch == 0)
{
m_uart->write_a_tx(bit);
@@ -948,7 +948,7 @@ void mc68681_channel::write_chan_reg(int reg, UINT8 data)
CSR = data;
tx_baud_rate = m_uart->calc_baud(m_ch, data & 0xf);
rx_baud_rate = m_uart->calc_baud(m_ch, (data>>4) & 0xf);
-// printf("%s ch %d CSR %02x Tx baud %d Rx baud %d\n", tag().c_str(), m_ch, data, tx_baud_rate, rx_baud_rate);
+// printf("%s ch %d CSR %02x Tx baud %d Rx baud %d\n", tag(), m_ch, data, tx_baud_rate, rx_baud_rate);
set_rcv_rate(rx_baud_rate);
set_tra_rate(tx_baud_rate);
break;
@@ -1033,7 +1033,7 @@ void mc68681_channel::recalc_framing()
break;
}
-// printf("%s ch %d MR1 %02x MR2 %02x => %d bits / char, %d stop bits, parity %d\n", tag().c_str(), m_ch, MR1, MR2, (MR1 & 3)+5, stopbits, parity);
+// printf("%s ch %d MR1 %02x MR2 %02x => %d bits / char, %d stop bits, parity %d\n", tag(), m_ch, MR1, MR2, (MR1 & 3)+5, stopbits, parity);
set_data_frame(1, (MR1 & 3)+5, parity, stopbits);
}
@@ -1125,7 +1125,7 @@ void mc68681_channel::write_TX(UINT8 data)
printf("Write %02x to TX when TX not ready!\n", data);
}*/
-// printf("%s ch %d Tx %02x\n", tag().c_str(), m_ch, data);
+// printf("%s ch %d Tx %02x\n", tag(), m_ch, data);
tx_ready = 0;
SR &= ~STATUS_TRANSMITTER_READY;
diff --git a/src/devices/machine/mc68681.h b/src/devices/machine/mc68681.h
index 2d55d4a8585..abae110dbac 100644
--- a/src/devices/machine/mc68681.h
+++ b/src/devices/machine/mc68681.h
@@ -38,7 +38,7 @@ class mc68681_device;
class mc68681_channel : public device_t, public device_serial_interface
{
public:
- mc68681_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc68681_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -99,7 +99,7 @@ class mc68681_device : public device_t
friend class mc68681_channel;
public:
- mc68681_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
required_device<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 975bd26dfb2..4d35d2a2c44 100644
--- a/src/devices/machine/mc68901.cpp
+++ b/src/devices/machine/mc68901.cpp
@@ -294,11 +294,11 @@ inline void mc68901_device::gpio_input(int bit, int state)
{
if (state == BIT(m_aer, bit))
{
- if (LOG) logerror("MC68901 '%s' Edge Transition Detected on GPIO%u\n", tag().c_str(), bit);
+ if (LOG) logerror("MC68901 '%s' Edge Transition Detected on GPIO%u\n", tag(), bit);
if (m_ier & INT_MASK_GPIO[bit]) // AND interrupt enabled bit is set...
{
- if (LOG) logerror("MC68901 '%s' Interrupt Pending for GPIO%u\n", tag().c_str(), bit);
+ if (LOG) logerror("MC68901 '%s' Interrupt Pending for GPIO%u\n", tag(), bit);
take_interrupt(INT_MASK_GPIO[bit]); // set interrupt pending bit
}
@@ -332,7 +332,7 @@ void mc68901_device::gpio_output()
// mc68901_device - constructor
//-------------------------------------------------
-mc68901_device::mc68901_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mc68901_device::mc68901_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC68901, "MC68901 MFP", tag, owner, clock, "mc68901", __FILE__),
device_serial_interface(mconfig, *this),
m_timer_clock(0),
@@ -596,84 +596,84 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch (offset)
{
case REGISTER_GPIP:
- if (LOG) logerror("MC68901 '%s' General Purpose I/O : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' General Purpose I/O : %x\n", tag(), data);
m_gpip = data;
gpio_output();
break;
case REGISTER_AER:
- if (LOG) logerror("MC68901 '%s' Active Edge Register : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Active Edge Register : %x\n", tag(), data);
m_aer = data;
break;
case REGISTER_DDR:
- if (LOG) logerror("MC68901 '%s' Data Direction Register : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Data Direction Register : %x\n", tag(), data);
m_ddr = data;
gpio_output();
break;
case REGISTER_IERA:
- if (LOG) logerror("MC68901 '%s' Interrupt Enable Register A : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Enable Register A : %x\n", tag(), data);
m_ier = (data << 8) | (m_ier & 0xff);
m_ipr &= m_ier;
check_interrupts();
break;
case REGISTER_IERB:
- if (LOG) logerror("MC68901 '%s' Interrupt Enable Register B : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Enable Register B : %x\n", tag(), data);
m_ier = (m_ier & 0xff00) | data;
m_ipr &= m_ier;
check_interrupts();
break;
case REGISTER_IPRA:
- if (LOG) logerror("MC68901 '%s' Interrupt Pending Register A : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Pending Register A : %x\n", tag(), data);
m_ipr &= (data << 8) | (m_ipr & 0xff);
check_interrupts();
break;
case REGISTER_IPRB:
- if (LOG) logerror("MC68901 '%s' Interrupt Pending Register B : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Pending Register B : %x\n", tag(), data);
m_ipr &= (m_ipr & 0xff00) | data;
check_interrupts();
break;
case REGISTER_ISRA:
- if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register A : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register A : %x\n", tag(), data);
m_isr &= (data << 8) | (m_isr & 0xff);
break;
case REGISTER_ISRB:
- if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register B : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt In-Service Register B : %x\n", tag(), data);
m_isr &= (m_isr & 0xff00) | data;
break;
case REGISTER_IMRA:
- if (LOG) logerror("MC68901 '%s' Interrupt Mask Register A : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Mask Register A : %x\n", tag(), data);
m_imr = (data << 8) | (m_imr & 0xff);
m_isr &= m_imr;
check_interrupts();
break;
case REGISTER_IMRB:
- if (LOG) logerror("MC68901 '%s' Interrupt Mask Register B : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Interrupt Mask Register B : %x\n", tag(), data);
m_imr = (m_imr & 0xff00) | data;
m_isr &= m_imr;
check_interrupts();
break;
case REGISTER_VR:
- if (LOG) logerror("MC68901 '%s' Interrupt Vector : %x\n", tag().c_str(), data & 0xf0);
+ if (LOG) logerror("MC68901 '%s' Interrupt Vector : %x\n", tag(), data & 0xf0);
m_vr = data & 0xf8;
if (m_vr & VR_S)
{
- if (LOG) logerror("MC68901 '%s' Software End-Of-Interrupt Mode\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Software End-Of-Interrupt Mode\n", tag());
}
else
{
- if (LOG) logerror("MC68901 '%s' Automatic End-Of-Interrupt Mode\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Automatic End-Of-Interrupt Mode\n", tag());
m_isr = 0;
}
@@ -685,7 +685,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch (m_tacr & 0x0f)
{
case TCR_TIMER_STOPPED:
- if (LOG) logerror("MC68901 '%s' Timer A Stopped\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Timer A Stopped\n", tag());
m_timer[TIMER_A]->enable(false);
break;
@@ -698,13 +698,13 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_DELAY_200:
{
int divisor = PRESCALER[m_tacr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer A Delay Mode : %u Prescale\n", tag().c_str(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer A Delay Mode : %u Prescale\n", tag(), divisor);
m_timer[TIMER_A]->adjust(attotime::from_hz(m_timer_clock / divisor), 0, attotime::from_hz(m_timer_clock / divisor));
}
break;
case TCR_TIMER_EVENT:
- if (LOG) logerror("MC68901 '%s' Timer A Event Count Mode\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Timer A Event Count Mode\n", tag());
m_timer[TIMER_A]->enable(false);
break;
@@ -717,7 +717,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_PULSE_200:
{
int divisor = PRESCALER[m_tacr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer A Pulse Width Mode : %u Prescale\n", tag().c_str(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer A Pulse Width Mode : %u Prescale\n", tag(), divisor);
m_timer[TIMER_A]->adjust(attotime::never, 0, attotime::from_hz(m_timer_clock / divisor));
m_timer[TIMER_A]->enable(false);
}
@@ -726,7 +726,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
if (m_tacr & TCR_TIMER_RESET)
{
- if (LOG) logerror("MC68901 '%s' Timer A Reset\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Timer A Reset\n", tag());
m_to[TIMER_A] = 0;
@@ -740,7 +740,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch (m_tbcr & 0x0f)
{
case TCR_TIMER_STOPPED:
- if (LOG) logerror("MC68901 '%s' Timer B Stopped\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Timer B Stopped\n", tag());
m_timer[TIMER_B]->enable(false);
break;
@@ -753,13 +753,13 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_DELAY_200:
{
int divisor = PRESCALER[m_tbcr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer B Delay Mode : %u Prescale\n", tag().c_str(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer B Delay Mode : %u Prescale\n", tag(), divisor);
m_timer[TIMER_B]->adjust(attotime::from_hz(m_timer_clock / divisor), 0, attotime::from_hz(m_timer_clock / divisor));
}
break;
case TCR_TIMER_EVENT:
- if (LOG) logerror("MC68901 '%s' Timer B Event Count Mode\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Timer B Event Count Mode\n", tag());
m_timer[TIMER_B]->enable(false);
break;
@@ -772,7 +772,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_PULSE_200:
{
int divisor = PRESCALER[m_tbcr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer B Pulse Width Mode : %u Prescale\n", tag().c_str(), DIVISOR);
+ if (LOG) logerror("MC68901 '%s' Timer B Pulse Width Mode : %u Prescale\n", tag(), DIVISOR);
m_timer[TIMER_B]->adjust(attotime::never, 0, attotime::from_hz(m_timer_clock / divisor));
m_timer[TIMER_B]->enable(false);
}
@@ -781,7 +781,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
if (m_tacr & TCR_TIMER_RESET)
{
- if (LOG) logerror("MC68901 '%s' Timer B Reset\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Timer B Reset\n", tag());
m_to[TIMER_B] = 0;
@@ -795,7 +795,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch (m_tcdcr & 0x07)
{
case TCR_TIMER_STOPPED:
- if (LOG) logerror("MC68901 '%s' Timer D Stopped\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Timer D Stopped\n", tag());
m_timer[TIMER_D]->enable(false);
break;
@@ -808,7 +808,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_DELAY_200:
{
int divisor = PRESCALER[m_tcdcr & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer D Delay Mode : %u Prescale\n", tag().c_str(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer D Delay Mode : %u Prescale\n", tag(), divisor);
m_timer[TIMER_D]->adjust(attotime::from_hz(m_timer_clock / divisor), 0, attotime::from_hz(m_timer_clock / divisor));
}
break;
@@ -817,7 +817,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
switch ((m_tcdcr >> 4) & 0x07)
{
case TCR_TIMER_STOPPED:
- if (LOG) logerror("MC68901 '%s' Timer C Stopped\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Timer C Stopped\n", tag());
m_timer[TIMER_C]->enable(false);
break;
@@ -830,7 +830,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case TCR_TIMER_DELAY_200:
{
int divisor = PRESCALER[(m_tcdcr >> 4) & 0x07];
- if (LOG) logerror("MC68901 '%s' Timer C Delay Mode : %u Prescale\n", tag().c_str(), divisor);
+ if (LOG) logerror("MC68901 '%s' Timer C Delay Mode : %u Prescale\n", tag(), divisor);
m_timer[TIMER_C]->adjust(attotime::from_hz(m_timer_clock / divisor), 0, attotime::from_hz(m_timer_clock / divisor));
}
break;
@@ -838,7 +838,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_TADR:
- if (LOG) logerror("MC68901 '%s' Timer A Data Register : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Timer A Data Register : %x\n", tag(), data);
m_tdr[TIMER_A] = data;
@@ -849,7 +849,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_TBDR:
- if (LOG) logerror("MC68901 '%s' Timer B Data Register : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Timer B Data Register : %x\n", tag(), data);
m_tdr[TIMER_B] = data;
@@ -860,7 +860,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_TCDR:
- if (LOG) logerror("MC68901 '%s' Timer C Data Register : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Timer C Data Register : %x\n", tag(), data);
m_tdr[TIMER_C] = data;
@@ -871,7 +871,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_TDDR:
- if (LOG) logerror("MC68901 '%s' Timer D Data Register : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Timer D Data Register : %x\n", tag(), data);
m_tdr[TIMER_D] = data;
@@ -882,7 +882,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_SCR:
- if (LOG) logerror("MC68901 '%s' Sync Character : %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' Sync Character : %x\n", tag(), data);
m_scr = data;
break;
@@ -905,25 +905,25 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
{
if (data & UCR_PARITY_EVEN)
{
- if (LOG) logerror("MC68901 '%s' Parity : Even\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Parity : Even\n", tag());
parity = PARITY_EVEN;
}
else
{
- if (LOG) logerror("MC68901 '%s' Parity : Odd\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Parity : Odd\n", tag());
parity = PARITY_ODD;
}
}
else
{
- if (LOG) logerror("MC68901 '%s' Parity : Disabled\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Parity : Disabled\n", tag());
parity = PARITY_NONE;
}
- if (LOG) logerror("MC68901 '%s' Word Length : %u bits\n", tag().c_str(), data_bit_count);
+ if (LOG) logerror("MC68901 '%s' Word Length : %u bits\n", tag(), data_bit_count);
int start_bits;
@@ -935,35 +935,35 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
default:
start_bits = 0;
stop_bits = STOP_BITS_0;
- if (LOG) logerror("MC68901 '%s' Start Bits : 0, Stop Bits : 0, Format : synchronous\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Start Bits : 0, Stop Bits : 0, Format : synchronous\n", tag());
break;
case UCR_START_STOP_1_1:
start_bits = 1;
stop_bits = STOP_BITS_1;
- if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1, Format : asynchronous\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1, Format : asynchronous\n", tag());
break;
case UCR_START_STOP_1_15:
start_bits = 1;
stop_bits = STOP_BITS_1_5;
- if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1.5, Format : asynchronous\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 1.5, Format : asynchronous\n", tag());
break;
case UCR_START_STOP_1_2:
start_bits = 1;
stop_bits = STOP_BITS_2;
- if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 2, Format : asynchronous\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Start Bits : 1, Stop Bits : 2, Format : asynchronous\n", tag());
break;
}
if (data & UCR_CLOCK_DIVIDE_16)
{
- if (LOG) logerror("MC68901 '%s' Rx/Tx Clock Divisor : 16\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Rx/Tx Clock Divisor : 16\n", tag());
}
else
{
- if (LOG) logerror("MC68901 '%s' Rx/Tx Clock Divisor : 1\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Rx/Tx Clock Divisor : 1\n", tag());
}
set_data_frame(start_bits, data_bit_count, parity, stop_bits);
@@ -975,24 +975,24 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
case REGISTER_RSR:
if ((data & RSR_RCV_ENABLE) == 0)
{
- if (LOG) logerror("MC68901 '%s' Receiver Disabled\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Receiver Disabled\n", tag());
m_rsr = 0;
}
else
{
- if (LOG) logerror("MC68901 '%s' Receiver Enabled\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Receiver Enabled\n", tag());
if (data & RSR_SYNC_STRIP_ENABLE)
{
- if (LOG) logerror("MC68901 '%s' Sync Strip Enabled\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Sync Strip Enabled\n", tag());
}
else
{
- if (LOG) logerror("MC68901 '%s' Sync Strip Disabled\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Sync Strip Disabled\n", tag());
}
if (data & RSR_FOUND_SEARCH)
- if (LOG) logerror("MC68901 '%s' Receiver Search Mode Enabled\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Receiver Search Mode Enabled\n", tag());
m_rsr = data & 0x0b;
}
@@ -1003,7 +1003,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
if ((data & TSR_XMIT_ENABLE) == 0)
{
- if (LOG) logerror("MC68901 '%s' Transmitter Disabled\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Transmitter Disabled\n", tag());
m_tsr &= ~TSR_UNDERRUN_ERROR;
@@ -1012,40 +1012,40 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
}
else
{
- if (LOG) logerror("MC68901 '%s' Transmitter Enabled\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Transmitter Enabled\n", tag());
switch (data & 0x06)
{
case TSR_OUTPUT_HI_Z:
- if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : Hi-Z\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : Hi-Z\n", tag());
break;
case TSR_OUTPUT_LOW:
- if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : 0\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : 0\n", tag());
break;
case TSR_OUTPUT_HIGH:
- if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : 1\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : 1\n", tag());
break;
case TSR_OUTPUT_LOOP:
- if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : Loop\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Transmitter Disabled Output State : Loop\n", tag());
break;
}
if (data & TSR_BREAK)
{
- if (LOG) logerror("MC68901 '%s' Transmitter Break Enabled\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Transmitter Break Enabled\n", tag());
}
else
{
- if (LOG) logerror("MC68901 '%s' Transmitter Break Disabled\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Transmitter Break Disabled\n", tag());
}
if (data & TSR_AUTO_TURNAROUND)
{
- if (LOG) logerror("MC68901 '%s' Transmitter Auto Turnaround Enabled\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Transmitter Auto Turnaround Enabled\n", tag());
}
else
{
- if (LOG) logerror("MC68901 '%s' Transmitter Auto Turnaround Disabled\n", tag().c_str());
+ if (LOG) logerror("MC68901 '%s' Transmitter Auto Turnaround Disabled\n", tag());
}
m_tsr &= ~TSR_END_OF_XMIT;
@@ -1060,7 +1060,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
break;
case REGISTER_UDR:
- if (LOG) logerror("MC68901 '%s' UDR %x\n", tag().c_str(), data);
+ if (LOG) logerror("MC68901 '%s' UDR %x\n", tag(), data);
m_transmit_buffer = data;
m_transmit_pending = 1;
m_tsr &= ~TSR_BUFFER_EMPTY;
diff --git a/src/devices/machine/mc68901.h b/src/devices/machine/mc68901.h
index 5177c98b38e..9bbe8ee2280 100644
--- a/src/devices/machine/mc68901.h
+++ b/src/devices/machine/mc68901.h
@@ -94,7 +94,7 @@ class mc68901_device : public device_t,
{
public:
// construction/destruction
- mc68901_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mc68901_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_timer_clock(device_t &device, int timer_clock) { downcast<mc68901_device &>(device).m_timer_clock = timer_clock; }
static void set_rx_clock(device_t &device, int rx_clock) { downcast<mc68901_device &>(device).m_rx_clock = rx_clock; }
diff --git a/src/devices/machine/mccs1850.cpp b/src/devices/machine/mccs1850.cpp
index ce10db52af1..72fb12a667a 100644
--- a/src/devices/machine/mccs1850.cpp
+++ b/src/devices/machine/mccs1850.cpp
@@ -170,7 +170,7 @@ inline UINT8 mccs1850_device::read_register(offs_t offset)
case REGISTER_TEST_KICK_START_COUNTER:
case REGISTER_TEST_PRESCALE_COUNTER:
case REGISTER_TEST_COUNTER_INCREMENT:
- logerror("MCCS1850 '%s' Unsupported read from test register %02x!\n", tag().c_str(), offset);
+ logerror("MCCS1850 '%s' Unsupported read from test register %02x!\n", tag(), offset);
break;
}
@@ -191,35 +191,35 @@ inline void mccs1850_device::write_register(offs_t offset, UINT8 data)
break;
case REGISTER_CONTROL:
- if (LOG) logerror("MCCS1850 '%s' Counter %s\n", tag().c_str(), (data & CONTROL_STR_STP) ? "Start" : "Stop");
+ if (LOG) logerror("MCCS1850 '%s' Counter %s\n", tag(), (data & CONTROL_STR_STP) ? "Start" : "Stop");
m_clock_timer->enable(data & CONTROL_STR_STP);
if (data & CONTROL_PD)
{
- if (LOG) logerror("MCCS1850 '%s' Power Down\n", tag().c_str());
+ if (LOG) logerror("MCCS1850 '%s' Power Down\n", tag());
set_pse_line(false);
}
if (data & CONTROL_AR)
{
- if (LOG) logerror("MCCS1850 '%s' Auto Restart\n", tag().c_str());
+ if (LOG) logerror("MCCS1850 '%s' Auto Restart\n", tag());
}
if (data & CONTROL_AC)
{
- if (LOG) logerror("MCCS1850 '%s' Alarm Clear\n", tag().c_str());
+ if (LOG) logerror("MCCS1850 '%s' Alarm Clear\n", tag());
m_ram[REGISTER_STATUS] &= ~STATUS_AI;
}
if (data & CONTROL_FTUC)
{
- if (LOG) logerror("MCCS1850 '%s' First Time Up Clear\n", tag().c_str());
+ if (LOG) logerror("MCCS1850 '%s' First Time Up Clear\n", tag());
m_ram[REGISTER_STATUS] &= ~STATUS_FTU;
}
if (data & CONTROL_RPCD)
{
- if (LOG) logerror("MCCS1850 '%s' Request to Power Down Clear\n", tag().c_str());
+ if (LOG) logerror("MCCS1850 '%s' Request to Power Down Clear\n", tag());
m_ram[REGISTER_STATUS] &= ~STATUS_RPD;
}
@@ -233,7 +233,7 @@ inline void mccs1850_device::write_register(offs_t offset, UINT8 data)
case REGISTER_TEST_KICK_START_COUNTER:
case REGISTER_TEST_PRESCALE_COUNTER:
case REGISTER_TEST_COUNTER_INCREMENT:
- logerror("MCCS1850 '%s' Unsupported write to test register %02x!\n", tag().c_str(), offset);
+ logerror("MCCS1850 '%s' Unsupported write to test register %02x!\n", tag(), offset);
break;
default:
@@ -279,7 +279,7 @@ inline void mccs1850_device::advance_seconds()
// mccs1850_device - constructor
//-------------------------------------------------
-mccs1850_device::mccs1850_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+mccs1850_device::mccs1850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MCCS1850, "MCCS1850", tag, owner, clock, "mccs1850", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -441,7 +441,7 @@ WRITE_LINE_MEMBER( mccs1850_device::sck_w )
if (m_bits == 8)
{
- if (LOG) logerror("MCCS1850 '%s' %s Address %02x\n", tag().c_str(), BIT(m_address, 7) ? "Write" : "Read", m_address & 0x7f);
+ if (LOG) logerror("MCCS1850 '%s' %s Address %02x\n", tag(), BIT(m_address, 7) ? "Write" : "Read", m_address & 0x7f);
m_bits = 0;
m_state = STATE_DATA;
@@ -450,7 +450,7 @@ WRITE_LINE_MEMBER( mccs1850_device::sck_w )
{
m_shift = read_register(m_address & 0x7f);
- if (LOG) logerror("MCCS1850 '%s' Data Out %02x\n", tag().c_str(), m_shift);
+ if (LOG) logerror("MCCS1850 '%s' Data Out %02x\n", tag(), m_shift);
}
}
}
@@ -466,7 +466,7 @@ WRITE_LINE_MEMBER( mccs1850_device::sck_w )
if (m_bits == 8)
{
- if (LOG) logerror("MCCS1850 '%s' Data In %02x\n", tag().c_str(), m_shift);
+ if (LOG) logerror("MCCS1850 '%s' Data In %02x\n", tag(), m_shift);
write_register(m_address & 0x7f, m_shift);
@@ -492,7 +492,7 @@ WRITE_LINE_MEMBER( mccs1850_device::sck_w )
m_address++;
m_address &= 0x7f;
m_shift = read_register(m_address & 0x7f);
- if (LOG) logerror("MCCS1850 '%s' Data Out %02x\n", tag().c_str(), m_shift);
+ if (LOG) logerror("MCCS1850 '%s' Data Out %02x\n", tag(), m_shift);
}
}
break;
@@ -571,13 +571,13 @@ WRITE_LINE_MEMBER( mccs1850_device::test_w )
{
if (state)
{
- if (LOG) logerror("MCCS1850 '%s' Test Mode\n", tag().c_str());
+ if (LOG) logerror("MCCS1850 '%s' Test Mode\n", tag());
m_ram[REGISTER_STATUS] |= STATUS_TM;
}
else
{
- if (LOG) logerror("MCCS1850 '%s' Normal Operation\n", tag().c_str());
+ if (LOG) logerror("MCCS1850 '%s' Normal Operation\n", tag());
m_ram[REGISTER_STATUS] &= ~STATUS_TM;
}
diff --git a/src/devices/machine/mccs1850.h b/src/devices/machine/mccs1850.h
index 5ed6dde0b35..e4179c47e82 100644
--- a/src/devices/machine/mccs1850.h
+++ b/src/devices/machine/mccs1850.h
@@ -53,7 +53,7 @@ class mccs1850_device : public device_t,
{
public:
// construction/destruction
- mccs1850_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mccs1850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<mccs1850_device &>(device).int_cb.set_callback(object); }
template<class _Object> static devcb_base &set_pse_wr_callback(device_t &device, _Object object) { return downcast<mccs1850_device &>(device).pse_cb.set_callback(object); }
diff --git a/src/devices/machine/mcf5206e.cpp b/src/devices/machine/mcf5206e.cpp
index b2e50350ae5..cdc1a9b6477 100644
--- a/src/devices/machine/mcf5206e.cpp
+++ b/src/devices/machine/mcf5206e.cpp
@@ -828,7 +828,7 @@ const device_type MCF5206E_PERIPHERAL = &device_creator<mcf5206e_peripheral_devi
// mcf5206e_peripheral_device - constructor
//-------------------------------------------------
-mcf5206e_peripheral_device::mcf5206e_peripheral_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mcf5206e_peripheral_device::mcf5206e_peripheral_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MCF5206E_PERIPHERAL, "MCF5206E Peripheral", tag, owner, clock, "mcf5206e_peripheral", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("coldfire_regs", ENDIANNESS_BIG, 32,10, 0, nullptr, *ADDRESS_MAP_NAME(coldfire_regs_map))
diff --git a/src/devices/machine/mcf5206e.h b/src/devices/machine/mcf5206e.h
index d8dec645ebb..fe67092c6f7 100644
--- a/src/devices/machine/mcf5206e.h
+++ b/src/devices/machine/mcf5206e.h
@@ -51,7 +51,7 @@ class mcf5206e_peripheral_device : public device_t,
{
public:
// construction/destruction
- mcf5206e_peripheral_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mcf5206e_peripheral_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void ICR_info(UINT8 ICR);
diff --git a/src/devices/machine/microtch.cpp b/src/devices/machine/microtch.cpp
index 393af0fb87e..f4cddefe26e 100644
--- a/src/devices/machine/microtch.cpp
+++ b/src/devices/machine/microtch.cpp
@@ -17,7 +17,7 @@
const device_type MICROTOUCH = &device_creator<microtouch_device>;
-microtouch_device::microtouch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+microtouch_device::microtouch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MICROTOUCH, "Microtouch Touchscreen", tag, owner, clock, "microtouch", __FILE__),
device_serial_interface(mconfig, *this), m_rx_buffer_ptr(0), m_tx_buffer_num(0), m_tx_buffer_ptr(0), m_reset_done(0), m_format(0), m_mode(0), m_last_touch_state(0),
m_last_x(0), m_last_y(0),
diff --git a/src/devices/machine/microtch.h b/src/devices/machine/microtch.h
index 05dc708bbb9..4ee60abede7 100644
--- a/src/devices/machine/microtch.h
+++ b/src/devices/machine/microtch.h
@@ -11,7 +11,7 @@ class microtouch_device :
public device_serial_interface
{
public:
- microtouch_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ microtouch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &static_set_stx_callback(device_t &device, _Object object) { return downcast<microtouch_device &>(device).m_out_stx_func.set_callback(object); }
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/machine/mm58167.cpp b/src/devices/machine/mm58167.cpp
index 59789ef6a7e..ed66df7603f 100644
--- a/src/devices/machine/mm58167.cpp
+++ b/src/devices/machine/mm58167.cpp
@@ -50,7 +50,7 @@ typedef enum
// mm58167_device - constructor
//-------------------------------------------------
-mm58167_device::mm58167_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mm58167_device::mm58167_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MM58167, "National Semiconductor MM58167", tag, owner, clock, "mm58167", __FILE__),
device_rtc_interface(mconfig, *this),
m_irq_w(*this)
diff --git a/src/devices/machine/mm58167.h b/src/devices/machine/mm58167.h
index 5dfbb5a4f46..c1a7e0b320e 100644
--- a/src/devices/machine/mm58167.h
+++ b/src/devices/machine/mm58167.h
@@ -33,7 +33,7 @@ class mm58167_device : public device_t,
{
public:
// construction/destruction
- mm58167_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mm58167_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/devices/machine/mm58274c.cpp b/src/devices/machine/mm58274c.cpp
index bc3b2f3fa4e..0690f775b5d 100644
--- a/src/devices/machine/mm58274c.cpp
+++ b/src/devices/machine/mm58274c.cpp
@@ -47,7 +47,7 @@ enum
const device_type MM58274C = &device_creator<mm58274c_device>;
-mm58274c_device::mm58274c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mm58274c_device::mm58274c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MM58274C, "National Semiconductor MM58274C", tag, owner, clock, "mm58274c", __FILE__),
m_mode24(0),
m_day1(0)
diff --git a/src/devices/machine/mm58274c.h b/src/devices/machine/mm58274c.h
index 50b6f8b723b..f92a795c6db 100644
--- a/src/devices/machine/mm58274c.h
+++ b/src/devices/machine/mm58274c.h
@@ -10,7 +10,7 @@
class mm58274c_device : public device_t
{
public:
- mm58274c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mm58274c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~mm58274c_device() {}
static void set_mode24(device_t &device, int mode) { downcast<mm58274c_device &>(device).m_mode24 = mode; }
diff --git a/src/devices/machine/mm74c922.cpp b/src/devices/machine/mm74c922.cpp
index 670cebd364e..c822c783b33 100644
--- a/src/devices/machine/mm74c922.cpp
+++ b/src/devices/machine/mm74c922.cpp
@@ -36,7 +36,7 @@ const device_type MM74C923 = &device_creator<mm74c922_device>;
// mm74c922_device - constructor
//-------------------------------------------------
-mm74c922_device::mm74c922_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+mm74c922_device::mm74c922_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MM74C922, "MM74C922", tag, owner, clock, "mm74c922", __FILE__),
m_write_da(*this),
m_read_x1(*this),
@@ -103,7 +103,7 @@ void mm74c922_device::device_timer(emu_timer &timer, device_timer_id id, int par
UINT8 mm74c922_device::read()
{
- if (LOG) logerror("MM74C922 '%s' Data Read: %02x\n", tag().c_str(), m_data);
+ if (LOG) logerror("MM74C922 '%s' Data Read: %02x\n", tag(), m_data);
return m_data;
}
@@ -119,7 +119,7 @@ void mm74c922_device::change_output_lines()
{
m_da = m_next_da;
- if (LOG) logerror("MM74C922 '%s' Data Available: %u\n", tag().c_str(), m_da);
+ if (LOG) logerror("MM74C922 '%s' Data Available: %u\n", tag(), m_da);
m_write_da(m_da);
}
@@ -166,7 +166,7 @@ void mm74c922_device::detect_keypress()
m_next_da = 0;
m_data = 0xff; // high-Z
- if (LOG) logerror("MM74C922 '%s' Key Released\n", tag().c_str());
+ if (LOG) logerror("MM74C922 '%s' Key Released\n", tag());
}
}
else
@@ -182,7 +182,7 @@ void mm74c922_device::detect_keypress()
m_data = (y << 2) | m_x;
- if (LOG) logerror("MM74C922 '%s' Key Depressed: X %u Y %u = %02x\n", tag().c_str(), m_x, y, m_data);
+ if (LOG) logerror("MM74C922 '%s' Key Depressed: X %u Y %u = %02x\n", tag(), m_x, y, m_data);
return;
}
}
diff --git a/src/devices/machine/mm74c922.h b/src/devices/machine/mm74c922.h
index f845d54482c..4cca5f6e9c3 100644
--- a/src/devices/machine/mm74c922.h
+++ b/src/devices/machine/mm74c922.h
@@ -79,7 +79,7 @@ class mm74c922_device : public device_t
{
public:
// construction/destruction
- mm74c922_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mm74c922_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void static_set_cap_osc(device_t &device, double value) { downcast<mm74c922_device &>(device).m_cap_osc = value; }
static void static_set_cap_debounce(device_t &device, double value) { downcast<mm74c922_device &>(device).m_cap_debounce = value; }
diff --git a/src/devices/machine/mos6526.cpp b/src/devices/machine/mos6526.cpp
index 79962b1e5b0..317c6b8555d 100644
--- a/src/devices/machine/mos6526.cpp
+++ b/src/devices/machine/mos6526.cpp
@@ -586,7 +586,7 @@ inline void mos6526_device::synchronize()
// mos6526_device - constructor
//-------------------------------------------------
-mos6526_device::mos6526_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+mos6526_device::mos6526_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_execute_interface(mconfig, *this),
m_icount(0),
@@ -603,7 +603,7 @@ mos6526_device::mos6526_device(const machine_config &mconfig, device_type type,
{
}
-mos6526_device::mos6526_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos6526_device::mos6526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS6526, "MOS6526", tag, owner, clock, "mos6526", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
@@ -619,13 +619,13 @@ mos6526_device::mos6526_device(const machine_config &mconfig, std::string tag, d
m_write_pb(*this)
{ }
-mos6526a_device::mos6526a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos6526a_device::mos6526a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mos6526_device(mconfig, MOS6526A, "MOS6526A", tag, owner, clock, TYPE_6526A, "mos6526a", __FILE__) { }
-mos8520_device::mos8520_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos8520_device::mos8520_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mos6526_device(mconfig, MOS8520, "MOS8520", tag, owner, clock, TYPE_8520, "mos8520", __FILE__) { }
-mos5710_device::mos5710_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos5710_device::mos5710_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mos6526_device(mconfig, MOS5710, "MOS5710", tag, owner, clock, TYPE_5710, "mos5710", __FILE__) { }
diff --git a/src/devices/machine/mos6526.h b/src/devices/machine/mos6526.h
index b2dfb5b097e..99bfab3abc3 100644
--- a/src/devices/machine/mos6526.h
+++ b/src/devices/machine/mos6526.h
@@ -108,8 +108,8 @@ class mos6526_device : public device_t,
{
public:
// construction/destruction
- mos6526_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
- mos6526_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos6526_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ mos6526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void static_set_tod_clock(device_t &device, int clock) { downcast<mos6526_device &>(device).m_tod_clock = clock; }
@@ -254,7 +254,7 @@ protected:
class mos6526a_device : public mos6526_device
{
public:
- mos6526a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos6526a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
@@ -263,7 +263,7 @@ public:
class mos8520_device : public mos6526_device
{
public:
- mos8520_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos8520_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -278,7 +278,7 @@ protected:
class mos5710_device : public mos6526_device
{
public:
- mos5710_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos5710_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
//DECLARE_READ8_MEMBER( read );
//DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/mos6529.cpp b/src/devices/machine/mos6529.cpp
index 17c64912de3..ebae2ca6f5a 100644
--- a/src/devices/machine/mos6529.cpp
+++ b/src/devices/machine/mos6529.cpp
@@ -35,7 +35,7 @@ const device_type MOS6529 = &device_creator<mos6529_device>;
// mos6529_device - constructor
//-------------------------------------------------
-mos6529_device::mos6529_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos6529_device::mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS6529, "MOS6529", tag, owner, clock, "mos6529", __FILE__),
m_input(0),
m_p0_handler(*this),
diff --git a/src/devices/machine/mos6529.h b/src/devices/machine/mos6529.h
index e27c9838cd4..fe9f8a3e063 100644
--- a/src/devices/machine/mos6529.h
+++ b/src/devices/machine/mos6529.h
@@ -67,7 +67,7 @@ class mos6529_device : public device_t
{
public:
// construction/destruction
- mos6529_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_p0_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p0_handler.set_callback(object); }
template<class _Object> static devcb_base &set_p1_handler(device_t &device, _Object object) { return downcast<mos6529_device &>(device).m_p1_handler.set_callback(object); }
diff --git a/src/devices/machine/mos6530.cpp b/src/devices/machine/mos6530.cpp
index cec08a5519f..46979b078f0 100644
--- a/src/devices/machine/mos6530.cpp
+++ b/src/devices/machine/mos6530.cpp
@@ -40,7 +40,7 @@ enum
const device_type MOS6530 = &device_creator<mos6530_device>;
-mos6530_device::mos6530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos6530_device::mos6530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS6530, "MOS6530 RRIOT", tag, owner, clock, "mos6530", __FILE__),
m_in_pa_cb(*this),
m_out_pa_cb(*this),
diff --git a/src/devices/machine/mos6530.h b/src/devices/machine/mos6530.h
index a59ca486992..c60ff759a1b 100644
--- a/src/devices/machine/mos6530.h
+++ b/src/devices/machine/mos6530.h
@@ -51,7 +51,7 @@ struct mos6530_port
class mos6530_device : public device_t
{
public:
- mos6530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos6530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~mos6530_device() {}
template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<mos6530_device &>(device).m_in_pa_cb.set_callback(object); }
diff --git a/src/devices/machine/mos6530n.cpp b/src/devices/machine/mos6530n.cpp
index 96c714c5092..31c15c65e1d 100644
--- a/src/devices/machine/mos6530n.cpp
+++ b/src/devices/machine/mos6530n.cpp
@@ -113,7 +113,7 @@ WRITE8_MEMBER(mos6532_t::io_w)
// mos6530_base_t - constructor
//-------------------------------------------------
-mos6530_base_t::mos6530_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+mos6530_base_t::mos6530_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_ram(*this),
m_irq_cb(*this),
@@ -176,7 +176,7 @@ mos6530_base_t::mos6530_base_t(const machine_config &mconfig, device_type type,
// mos6530_t - constructor
//-------------------------------------------------
-mos6530_t::mos6530_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos6530_t::mos6530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mos6530_base_t(mconfig, MOS6530n, "MOS6530n", tag, owner, clock, "mos6530n", __FILE__) { }
@@ -184,7 +184,7 @@ mos6530_t::mos6530_t(const machine_config &mconfig, std::string tag, device_t *o
// mos6532_t - constructor
//-------------------------------------------------
-mos6532_t::mos6532_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos6532_t::mos6532_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: mos6530_base_t(mconfig, MOS6532n, "MOS6532n", tag, owner, clock, "mos6532n", __FILE__) { }
@@ -460,7 +460,7 @@ void mos6530_base_t::edge_detect()
if ((m_pa7 ^ state) && (m_pa7_dir ^ state) == 0)
{
- if (LOG) logerror("%s %s '%s' edge-detect IRQ\n", machine().time().as_string(), name(), tag().c_str());
+ if (LOG) logerror("%s %s '%s' edge-detect IRQ\n", machine().time().as_string(), name(), tag());
m_irq_edge = true;
update_irq();
@@ -476,7 +476,7 @@ void mos6530_base_t::edge_detect()
void mos6530_base_t::pa_w(int bit, int state)
{
- if (LOG) logerror("%s %s %s '%s' Port A Data Bit %u State %u\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), bit, state);
+ if (LOG) logerror("%s %s %s '%s' Port A Data Bit %u State %u\n", machine().time().as_string(), machine().describe_context(), name(), tag(), bit, state);
m_pa_in &= ~(1 << bit);
m_pa_in |= (state << bit);
@@ -491,7 +491,7 @@ void mos6530_base_t::pa_w(int bit, int state)
void mos6530_base_t::pb_w(int bit, int state)
{
- if (LOG) logerror("%s %s %s '%s' Port B Data Bit %u State %u\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), bit, state);
+ if (LOG) logerror("%s %s %s '%s' Port B Data Bit %u State %u\n", machine().time().as_string(), machine().describe_context(), name(), tag(), bit, state);
m_pb_in &= ~(1 << bit);
m_pb_in |= (state << bit);
@@ -527,7 +527,7 @@ READ8_MEMBER( mos6530_base_t::pa_data_r )
UINT8 ddr_in = m_pa_ddr ^ 0xff;
UINT8 data = (out & ddr_out) | (in & ddr_in);
- if (LOG) logerror("%s %s %s '%s' Port A Data In %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data);
+ if (LOG) logerror("%s %s %s '%s' Port A Data In %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data);
return data;
}
@@ -541,7 +541,7 @@ WRITE8_MEMBER( mos6530_base_t::pa_data_w )
{
m_pa_out = data;
- if (LOG) logerror("%s %s %s '%s' Port A Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data);
+ if (LOG) logerror("%s %s %s '%s' Port A Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data);
update_pa();
edge_detect();
@@ -556,7 +556,7 @@ WRITE8_MEMBER( mos6530_base_t::pa_ddr_w )
{
m_pa_ddr = data;
- if (LOG) logerror("%s %s %s '%s' Port A DDR %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data);
+ if (LOG) logerror("%s %s %s '%s' Port A DDR %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data);
update_pa();
edge_detect();
@@ -592,7 +592,7 @@ READ8_MEMBER( mos6530_base_t::pb_data_r )
UINT8 ddr_in = m_pb_ddr ^ 0xff;
UINT8 data = (out & ddr_out) | (in & ddr_in);
- if (LOG) logerror("%s %s %s '%s' Port B Data In %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data);
+ if (LOG) logerror("%s %s %s '%s' Port B Data In %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data);
return data;
}
@@ -606,7 +606,7 @@ WRITE8_MEMBER( mos6530_base_t::pb_data_w )
{
m_pb_out = data;
- if (LOG) logerror("%s %s %s '%s' Port B Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data);
+ if (LOG) logerror("%s %s %s '%s' Port B Data Out %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data);
update_pb();
}
@@ -620,7 +620,7 @@ WRITE8_MEMBER( mos6530_base_t::pb_ddr_w )
{
m_pb_ddr = data;
- if (LOG) logerror("%s %s %s '%s' Port B DDR %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data);
+ if (LOG) logerror("%s %s %s '%s' Port B DDR %02x\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data);
update_pb();
}
@@ -660,7 +660,7 @@ UINT8 mos6530_base_t::timer_r(bool ie)
data = cur_live.value;
- if (LOG_TIMER) logerror("%s %s %s '%s' Timer read %02x IE %u\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data, m_ie_timer ? 1 : 0);
+ if (LOG_TIMER) logerror("%s %s %s '%s' Timer read %02x IE %u\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data, m_ie_timer ? 1 : 0);
checkpoint();
live_run();
@@ -721,7 +721,7 @@ void mos6530_base_t::timer_w(offs_t offset, UINT8 data, bool ie)
}
update_irq();
- if (LOG_TIMER) logerror("%s %s %s '%s' Timer value %02x prescale %u IE %u\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), data, m_prescale, m_ie_timer ? 1 : 0);
+ if (LOG_TIMER) logerror("%s %s %s '%s' Timer value %02x prescale %u IE %u\n", machine().time().as_string(), machine().describe_context(), name(), tag(), data, m_prescale, m_ie_timer ? 1 : 0);
checkpoint();
@@ -743,7 +743,7 @@ WRITE8_MEMBER( mos6530_base_t::edge_w )
m_pa7_dir = BIT(data, 0);
m_ie_edge = BIT(data, 1) ? false : true;
- if (LOG) logerror("%s %s %s '%s' %s edge-detect, %s interrupt\n", machine().time().as_string(), machine().describe_context(), name(), tag().c_str(), m_pa7_dir ? "positive" : "negative", m_ie_edge ? "enable" : "disable");
+ if (LOG) logerror("%s %s %s '%s' %s edge-detect, %s interrupt\n", machine().time().as_string(), machine().describe_context(), name(), tag(), m_pa7_dir ? "positive" : "negative", m_ie_edge ? "enable" : "disable");
}
@@ -834,7 +834,7 @@ void mos6530_base_t::live_run(const attotime &limit)
live_delay(RUNNING_SYNCPOINT);
return;
} else {
- if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name(), tag().c_str(), cur_live.value);
+ if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name(), tag(), cur_live.value);
cur_live.tm += cur_live.period;
}
@@ -842,7 +842,7 @@ void mos6530_base_t::live_run(const attotime &limit)
}
case RUNNING_SYNCPOINT: {
- if (LOG_TIMER) logerror("%s %s '%s' timer %02x interrupt\n", cur_live.tm.as_string(), name(), tag().c_str(), cur_live.value);
+ if (LOG_TIMER) logerror("%s %s '%s' timer %02x interrupt\n", cur_live.tm.as_string(), name(), tag(), cur_live.value);
cur_live.tm_irq = cur_live.tm;
m_irq_timer = true;
@@ -862,7 +862,7 @@ void mos6530_base_t::live_run(const attotime &limit)
cur_live.value--;
- if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name(), tag().c_str(), cur_live.value);
+ if (LOG_TIMER) logerror("%s %s '%s' timer %02x\n", cur_live.tm.as_string(), name(), tag(), cur_live.value);
if (!cur_live.value) {
cur_live.state = IDLE;
diff --git a/src/devices/machine/mos6530n.h b/src/devices/machine/mos6530n.h
index ded6479d475..71688040e89 100644
--- a/src/devices/machine/mos6530n.h
+++ b/src/devices/machine/mos6530n.h
@@ -188,7 +188,7 @@ class mos6530_base_t : public device_t
{
public:
// construction/destruction
- mos6530_base_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mos6530_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<mos6530_base_t &>(device).m_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast<mos6530_base_t &>(device).m_in_pa_cb.set_callback(object); }
@@ -375,7 +375,7 @@ class mos6530_t : public mos6530_base_t
{
public:
// construction/destruction
- mos6530_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos6530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(rom_map, 8);
virtual DECLARE_ADDRESS_MAP(ram_map, 8);
@@ -395,7 +395,7 @@ class mos6532_t : public mos6530_base_t
{
public:
// construction/destruction
- mos6532_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos6532_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(ram_map, 8);
virtual DECLARE_ADDRESS_MAP(io_map, 8);
diff --git a/src/devices/machine/mos6551.cpp b/src/devices/machine/mos6551.cpp
index 997903ba687..24901ee67e0 100644
--- a/src/devices/machine/mos6551.cpp
+++ b/src/devices/machine/mos6551.cpp
@@ -12,7 +12,7 @@
const device_type MOS6551 = &device_creator<mos6551_device>;
-mos6551_device::mos6551_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+mos6551_device::mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MOS6551, "MOS6551", tag, owner, clock, "mos6551", __FILE__),
m_internal_clock(*this, "clock"),
m_irq_handler(*this),
@@ -551,7 +551,7 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock)
{
if (!m_rxd && !m_dtr)
{
- if (LOG) logerror("MOS6551 '%s': RX START BIT\n", tag().c_str());
+ if (LOG) logerror("MOS6551 '%s': RX START BIT\n", tag());
}
else
{
@@ -573,7 +573,7 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock)
{
m_rx_counter = 0;
- if (LOG) logerror("MOS6551 '%s': RX FALSE START BIT\n", tag().c_str());
+ if (LOG) logerror("MOS6551 '%s': RX FALSE START BIT\n", tag());
}
}
break;
@@ -585,11 +585,11 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock)
if (m_rx_bits < m_wordlength)
{
- if (LOG) logerror("MOS6551 '%s': RX DATA BIT %d %d\n", tag().c_str(), m_rx_bits, m_rxd);
+ if (LOG) logerror("MOS6551 '%s': RX DATA BIT %d %d\n", tag(), m_rx_bits, m_rxd);
}
else
{
- if (LOG) logerror("MOS6551 '%s': RX PARITY BIT %x\n", tag().c_str(), m_rxd);
+ if (LOG) logerror("MOS6551 '%s': RX PARITY BIT %x\n", tag(), m_rxd);
}
if (m_rxd)
@@ -614,7 +614,7 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock)
{
m_rx_counter = 0;
- if (LOG) logerror("MOS6551 '%s': RX STOP BIT\n", tag().c_str());
+ if (LOG) logerror("MOS6551 '%s': RX STOP BIT\n", tag());
if (!(m_status & SR_RDRF))
{
@@ -714,11 +714,11 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
}
else if (!(m_status & SR_TDRE))
{
- if (LOG) logerror("MOS6551 '%s': TX DATA %x\n", tag().c_str(), m_tdr);
+ if (LOG) logerror("MOS6551 '%s': TX DATA %x\n", tag(), m_tdr);
m_tx_output = OUTPUT_TXD;
- if (LOG) logerror("MOS6551 '%s': TX START BIT\n", tag().c_str());
+ if (LOG) logerror("MOS6551 '%s': TX START BIT\n", tag());
m_status |= SR_TDRE;
}
@@ -726,7 +726,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
{
m_tx_output = OUTPUT_BREAK;
- if (LOG) logerror("MOS6551 '%s': TX BREAK START\n", tag().c_str());
+ if (LOG) logerror("MOS6551 '%s': TX BREAK START\n", tag());
}
else
{
@@ -756,7 +756,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
if (m_tx_output == OUTPUT_TXD)
{
- if (LOG) logerror("MOS6551 '%s': TX DATA BIT %d %d\n", tag().c_str(), m_tx_bits, m_txd);
+ if (LOG) logerror("MOS6551 '%s': TX DATA BIT %d %d\n", tag(), m_tx_bits, m_txd);
}
}
else if (m_tx_bits == m_wordlength && m_parity != PARITY_NONE)
@@ -782,7 +782,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
if (m_tx_output == OUTPUT_TXD)
{
- if (LOG) logerror("MOS6551 '%s': TX PARITY BIT %d\n", tag().c_str(), m_txd);
+ if (LOG) logerror("MOS6551 '%s': TX PARITY BIT %d\n", tag(), m_txd);
}
}
else
@@ -793,7 +793,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
if (m_tx_output == OUTPUT_TXD)
{
- if (LOG) logerror("MOS6551 '%s': TX STOP BIT\n", tag().c_str());
+ if (LOG) logerror("MOS6551 '%s': TX STOP BIT\n", tag());
}
}
}
@@ -806,7 +806,7 @@ WRITE_LINE_MEMBER(mos6551_device::transmitter_clock)
{
if (!m_brk)
{
- if (LOG) logerror("MOS6551 '%s': TX BREAK END\n", tag().c_str());
+ if (LOG) logerror("MOS6551 '%s': TX BREAK END\n", tag());
m_tx_counter = 0;
m_tx_state = STATE_STOP;
diff --git a/src/devices/machine/mos6551.h b/src/devices/machine/mos6551.h
index 8049e6affc7..9567ccc02a4 100644
--- a/src/devices/machine/mos6551.h
+++ b/src/devices/machine/mos6551.h
@@ -52,7 +52,7 @@
class mos6551_device : public device_t
{
public:
- mos6551_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
static void set_xtal(device_t &device, UINT32 xtal) { downcast<mos6551_device &>(device).set_xtal(xtal); }
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/mos6702.cpp b/src/devices/machine/mos6702.cpp
index 1814dceb933..9dc11e24af9 100644
--- a/src/devices/machine/mos6702.cpp
+++ b/src/devices/machine/mos6702.cpp
@@ -34,7 +34,7 @@ const device_type MOS6702 = &device_creator<mos6702_device>;
// mos6702_device - constructor
//-------------------------------------------------
-mos6702_device::mos6702_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos6702_device::mos6702_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS6702, "MOS6702", tag, owner, clock, "mos6702", __FILE__)
{
}
diff --git a/src/devices/machine/mos6702.h b/src/devices/machine/mos6702.h
index 511a49dbf23..191bff45bcc 100644
--- a/src/devices/machine/mos6702.h
+++ b/src/devices/machine/mos6702.h
@@ -47,7 +47,7 @@ class mos6702_device : public device_t
{
public:
// construction/destruction
- mos6702_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos6702_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/mos8706.cpp b/src/devices/machine/mos8706.cpp
index 268a4db53ed..ca07506423b 100644
--- a/src/devices/machine/mos8706.cpp
+++ b/src/devices/machine/mos8706.cpp
@@ -35,7 +35,7 @@ const device_type MOS8706 = &device_creator<mos8706_device>;
// mos8706_device - constructor
//-------------------------------------------------
-mos8706_device::mos8706_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos8706_device::mos8706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS8706, "MOS8706", tag, owner, clock, "mos8706", __FILE__)
{
}
diff --git a/src/devices/machine/mos8706.h b/src/devices/machine/mos8706.h
index 1a225d57792..2fd710e1337 100644
--- a/src/devices/machine/mos8706.h
+++ b/src/devices/machine/mos8706.h
@@ -50,7 +50,7 @@
class mos8706_device : public device_t
{
public:
- mos8706_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos8706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/mos8722.cpp b/src/devices/machine/mos8722.cpp
index 7a77aaf17ee..214a52faa21 100644
--- a/src/devices/machine/mos8722.cpp
+++ b/src/devices/machine/mos8722.cpp
@@ -68,7 +68,7 @@ static const offs_t RCR_TOP_ADDRESS[4] = { 0xf000, 0xf000, 0xe000, 0xc000 };
// mos8722_device - constructor
//-------------------------------------------------
-mos8722_device::mos8722_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+mos8722_device::mos8722_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MOS8722, "MOS8722", tag, owner, clock, "mos8722", __FILE__),
m_write_z80en(*this),
m_write_fsdir(*this),
@@ -176,7 +176,7 @@ WRITE8_MEMBER( mos8722_device::write )
if (!CR_IO && offset >= 0xd500 && offset < 0xd50c)
{
- if (LOG) logerror("MOS8722 '%s' Write %01x : %02x\n", tag().c_str(), offset & 0x0f, data);
+ if (LOG) logerror("MOS8722 '%s' Write %01x : %02x\n", tag(), offset & 0x0f, data);
switch (offset & 0x0f)
{
@@ -231,7 +231,7 @@ WRITE8_MEMBER( mos8722_device::write )
}
else if (offset >= 0xff00 && offset < 0xff05)
{
- if (LOG) logerror("MOS8722 '%s' Write %01x : %02x\n", tag().c_str(), offset & 0x0f, data);
+ if (LOG) logerror("MOS8722 '%s' Write %01x : %02x\n", tag(), offset & 0x0f, data);
switch (offset & 0x0f)
{
diff --git a/src/devices/machine/mos8722.h b/src/devices/machine/mos8722.h
index d3fd9de1245..5cbe9681da3 100644
--- a/src/devices/machine/mos8722.h
+++ b/src/devices/machine/mos8722.h
@@ -73,7 +73,7 @@ class mos8722_device : public device_t
{
public:
// construction/destruction
- mos8722_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos8722_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_z80en_wr_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_write_z80en.set_callback(object); }
template<class _Object> static devcb_base &set_fsdir_wr_callback(device_t &device, _Object object) { return downcast<mos8722_device &>(device).m_write_fsdir.set_callback(object); }
diff --git a/src/devices/machine/mos8726.cpp b/src/devices/machine/mos8726.cpp
index bcee7f60b87..eca6ada5187 100644
--- a/src/devices/machine/mos8726.cpp
+++ b/src/devices/machine/mos8726.cpp
@@ -40,7 +40,7 @@ const device_type MOS8726 = &device_creator<mos8726_device>;
// mos8726_device - constructor
//-------------------------------------------------
-mos8726_device::mos8726_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mos8726_device::mos8726_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MOS8726, "MOS8726", tag, owner, clock, "mos8726", __FILE__),
device_execute_interface(mconfig, *this),
m_icount(0),
diff --git a/src/devices/machine/mos8726.h b/src/devices/machine/mos8726.h
index 106bb0d2df8..8edc5e001d9 100644
--- a/src/devices/machine/mos8726.h
+++ b/src/devices/machine/mos8726.h
@@ -70,7 +70,7 @@ class mos8726_device : public device_t,
{
public:
// construction/destruction
- mos8726_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mos8726_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/mpu401.cpp b/src/devices/machine/mpu401.cpp
index d0633713264..98e4bb90b76 100644
--- a/src/devices/machine/mpu401.cpp
+++ b/src/devices/machine/mpu401.cpp
@@ -119,7 +119,7 @@ const rom_entry *mpu401_device::device_rom_region() const
// mpu401_device - constructor
//-------------------------------------------------
-mpu401_device::mpu401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+mpu401_device::mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, MPU401, "Roland MPU-401 I/O box", tag, owner, clock, "mpu401", __FILE__),
m_ourcpu(*this, M6801_TAG),
write_irq(*this)
diff --git a/src/devices/machine/mpu401.h b/src/devices/machine/mpu401.h
index 244968905d3..4d3b8347eda 100644
--- a/src/devices/machine/mpu401.h
+++ b/src/devices/machine/mpu401.h
@@ -23,7 +23,7 @@ class mpu401_device : public device_t
{
public:
// construction/destruction
- mpu401_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/machine/msm5832.cpp b/src/devices/machine/msm5832.cpp
index 43bb7b8d299..21fdeb3ba63 100644
--- a/src/devices/machine/msm5832.cpp
+++ b/src/devices/machine/msm5832.cpp
@@ -87,7 +87,7 @@ inline void msm5832_device::write_counter(int counter, int value)
// msm5832_device - constructor
//-------------------------------------------------
-msm5832_device::msm5832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+msm5832_device::msm5832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSM5832, "MSM5832", tag, owner, clock, "msm5832", __FILE__),
device_rtc_interface(mconfig, *this),
m_hold(0),
@@ -190,7 +190,7 @@ READ8_MEMBER( msm5832_device::data_r )
}
}
- if (LOG) logerror("MSM5832 '%s' Register Read %01x: %01x\n", tag().c_str(), m_address, data & 0x0f);
+ if (LOG) logerror("MSM5832 '%s' Register Read %01x: %01x\n", tag(), m_address, data & 0x0f);
return data & 0x0f;
}
@@ -202,7 +202,7 @@ READ8_MEMBER( msm5832_device::data_r )
WRITE8_MEMBER( msm5832_device::data_w )
{
- if (LOG) logerror("MSM5832 '%s' Register Write %01x: %01x\n", tag().c_str(), m_address, data & 0x0f);
+ if (LOG) logerror("MSM5832 '%s' Register Write %01x: %01x\n", tag(), m_address, data & 0x0f);
if (m_cs && m_write)
{
@@ -227,7 +227,7 @@ WRITE8_MEMBER( msm5832_device::data_w )
void msm5832_device::address_w(UINT8 data)
{
- if (LOG) logerror("MSM5832 '%s' Address: %01x\n", tag().c_str(), data & 0x0f);
+ if (LOG) logerror("MSM5832 '%s' Address: %01x\n", tag(), data & 0x0f);
m_address = data & 0x0f;
}
@@ -239,7 +239,7 @@ void msm5832_device::address_w(UINT8 data)
WRITE_LINE_MEMBER( msm5832_device::adj_w )
{
- if (LOG) logerror("MSM5832 '%s' 30 ADJ: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM5832 '%s' 30 ADJ: %u\n", tag(), state);
if (state)
{
@@ -254,7 +254,7 @@ WRITE_LINE_MEMBER( msm5832_device::adj_w )
WRITE_LINE_MEMBER( msm5832_device::test_w )
{
- if (LOG) logerror("MSM5832 '%s' TEST: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM5832 '%s' TEST: %u\n", tag(), state);
}
@@ -264,7 +264,7 @@ WRITE_LINE_MEMBER( msm5832_device::test_w )
WRITE_LINE_MEMBER( msm5832_device::hold_w )
{
- if (LOG) logerror("MSM5832 '%s' HOLD: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM5832 '%s' HOLD: %u\n", tag(), state);
m_hold = state;
}
@@ -276,7 +276,7 @@ WRITE_LINE_MEMBER( msm5832_device::hold_w )
WRITE_LINE_MEMBER( msm5832_device::read_w )
{
- if (LOG) logerror("MSM5832 '%s' READ: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM5832 '%s' READ: %u\n", tag(), state);
m_read = state;
}
@@ -288,7 +288,7 @@ WRITE_LINE_MEMBER( msm5832_device::read_w )
WRITE_LINE_MEMBER( msm5832_device::write_w )
{
- if (LOG) logerror("MSM5832 '%s' WR: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM5832 '%s' WR: %u\n", tag(), state);
m_write = state;
}
@@ -300,7 +300,7 @@ WRITE_LINE_MEMBER( msm5832_device::write_w )
WRITE_LINE_MEMBER( msm5832_device::cs_w )
{
- if (LOG) logerror("MSM5832 '%s' CS: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM5832 '%s' CS: %u\n", tag(), state);
m_cs = state;
}
diff --git a/src/devices/machine/msm5832.h b/src/devices/machine/msm5832.h
index 5d114ecbd7e..a437501f23b 100644
--- a/src/devices/machine/msm5832.h
+++ b/src/devices/machine/msm5832.h
@@ -47,7 +47,7 @@ class msm5832_device : public device_t,
{
public:
// construction/destruction
- msm5832_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ msm5832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( data_r );
DECLARE_WRITE8_MEMBER( data_w );
diff --git a/src/devices/machine/msm58321.cpp b/src/devices/machine/msm58321.cpp
index ddfc2631f68..7bdd77713ea 100644
--- a/src/devices/machine/msm58321.cpp
+++ b/src/devices/machine/msm58321.cpp
@@ -171,7 +171,7 @@ inline void msm58321_device::write_counter(int address, int data)
// msm58321_device - constructor
//-------------------------------------------------
-msm58321_device::msm58321_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+msm58321_device::msm58321_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSM58321, "MSM58321", tag, owner, clock, "msm58321", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -358,7 +358,7 @@ void msm58321_device::update_output()
break;
}
- if (LOG) logerror("MSM58321 '%s' Register Read %s (%01x): %01x\n", tag().c_str(), reg_name(m_address), m_address, data & 0x0f);
+ if (LOG) logerror("MSM58321 '%s' Register Read %s (%01x): %01x\n", tag(), reg_name(m_address), m_address, data & 0x0f);
}
int d0 = (data >> 0) & 1;
@@ -403,7 +403,7 @@ void msm58321_device::update_input()
if (m_address_write)
{
- if (LOG) logerror("MSM58321 '%s' Latch Address %01x\n", tag().c_str(), data);
+ if (LOG) logerror("MSM58321 '%s' Latch Address %01x\n", tag(), data);
// latch address
m_address = data;
@@ -414,7 +414,7 @@ void msm58321_device::update_input()
switch(m_address)
{
case REGISTER_RESET:
- if (LOG) logerror("MSM58321 '%s' Reset\n", tag().c_str());
+ if (LOG) logerror("MSM58321 '%s' Reset\n", tag());
if (!m_busy)
{
@@ -425,11 +425,11 @@ void msm58321_device::update_input()
case REGISTER_REF0:
case REGISTER_REF1:
- if (LOG) logerror("MSM58321 '%s' Reference Signal\n", tag().c_str());
+ if (LOG) logerror("MSM58321 '%s' Reference Signal\n", tag());
break;
default:
- if (LOG) logerror("MSM58321 '%s' Register Write %s (%01x): %01x\n", tag().c_str(), reg_name(m_address), m_address, data);
+ if (LOG) logerror("MSM58321 '%s' Register Write %s (%01x): %01x\n", tag(), reg_name(m_address), m_address, data);
switch (m_address)
{
@@ -477,7 +477,7 @@ WRITE_LINE_MEMBER( msm58321_device::cs2_w )
{
if (m_cs2 != state)
{
- if (LOG) logerror("MSM58321 '%s' CS2: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM58321 '%s' CS2: %u\n", tag(), state);
m_cs2 = state;
@@ -494,7 +494,7 @@ WRITE_LINE_MEMBER( msm58321_device::write_w )
{
if (m_write != state)
{
- if (LOG) logerror("MSM58321 '%s' WRITE: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM58321 '%s' WRITE: %u\n", tag(), state);
m_write = state;
@@ -511,7 +511,7 @@ WRITE_LINE_MEMBER( msm58321_device::read_w )
{
if (m_read != state)
{
- if (LOG) logerror("MSM58321 '%s' READ: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM58321 '%s' READ: %u\n", tag(), state);
m_read = state;
@@ -589,7 +589,7 @@ WRITE_LINE_MEMBER( msm58321_device::address_write_w )
{
if (m_address_write != state)
{
- if (LOG) logerror("MSM58321 '%s' ADDRESS WRITE: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM58321 '%s' ADDRESS WRITE: %u\n", tag(), state);
m_address_write = state;
@@ -606,7 +606,7 @@ WRITE_LINE_MEMBER( msm58321_device::stop_w )
{
if (m_stop != state)
{
- if (LOG) logerror("MSM58321 '%s' STOP: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM58321 '%s' STOP: %u\n", tag(), state);
m_stop = state;
}
@@ -621,7 +621,7 @@ WRITE_LINE_MEMBER( msm58321_device::test_w )
{
if (m_test != state)
{
- if (LOG) logerror("MSM58321 '%s' TEST: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM58321 '%s' TEST: %u\n", tag(), state);
m_test = state;
}
@@ -637,7 +637,7 @@ WRITE_LINE_MEMBER( msm58321_device::cs1_w )
{
if (m_cs1 != state)
{
- if (LOG) logerror("MSM58321 '%s' CS1: %u\n", tag().c_str(), state);
+ if (LOG) logerror("MSM58321 '%s' CS1: %u\n", tag(), state);
m_cs1 = state;
diff --git a/src/devices/machine/msm58321.h b/src/devices/machine/msm58321.h
index 8d872177827..04d174eedc2 100644
--- a/src/devices/machine/msm58321.h
+++ b/src/devices/machine/msm58321.h
@@ -59,7 +59,7 @@ class msm58321_device : public device_t,
{
public:
// construction/destruction
- msm58321_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ msm58321_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_d0_handler(device_t &device, _Object object) { return downcast<msm58321_device &>(device).m_d0_handler.set_callback(object); }
diff --git a/src/devices/machine/msm6242.cpp b/src/devices/machine/msm6242.cpp
index 0b25db4785b..a4a188cbcb6 100644
--- a/src/devices/machine/msm6242.cpp
+++ b/src/devices/machine/msm6242.cpp
@@ -65,7 +65,7 @@ const device_type MSM6242 = &device_creator<msm6242_device>;
// msm6242_device - constructor
//-------------------------------------------------
-msm6242_device::msm6242_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+msm6242_device::msm6242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MSM6242, "MSM6242 RTC", tag, owner, clock, "msm6242", __FILE__),
device_rtc_interface(mconfig, *this),
m_out_int_handler(*this)
diff --git a/src/devices/machine/msm6242.h b/src/devices/machine/msm6242.h
index 763057d2e5b..f53e4b60f01 100644
--- a/src/devices/machine/msm6242.h
+++ b/src/devices/machine/msm6242.h
@@ -25,7 +25,7 @@ class msm6242_device : public device_t,
{
public:
// construction/destruction
- msm6242_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ msm6242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_int_handler(device_t &device, _Object object) { return downcast<msm6242_device &>(device).m_out_int_handler.set_callback(object); }
diff --git a/src/devices/machine/ncr5380.cpp b/src/devices/machine/ncr5380.cpp
index eff2e777a60..fe62190d40f 100644
--- a/src/devices/machine/ncr5380.cpp
+++ b/src/devices/machine/ncr5380.cpp
@@ -78,7 +78,7 @@ const device_type NCR5380 = &device_creator<ncr5380_device>;
// ncr5380_device - constructor/destructor
//-------------------------------------------------
-ncr5380_device::ncr5380_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+ncr5380_device::ncr5380_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
legacy_scsi_host_adapter(mconfig, NCR5380, "5380 SCSI", tag, owner, clock, "ncr5380", __FILE__),
m_irq_cb(*this)
{
diff --git a/src/devices/machine/ncr5380.h b/src/devices/machine/ncr5380.h
index 24ba21e9bb3..77e8adc58b0 100644
--- a/src/devices/machine/ncr5380.h
+++ b/src/devices/machine/ncr5380.h
@@ -41,7 +41,7 @@ class ncr5380_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- ncr5380_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ncr5380_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<ncr5380_device &>(device).m_irq_cb.set_callback(object); }
diff --git a/src/devices/machine/ncr5380n.cpp b/src/devices/machine/ncr5380n.cpp
index 12daf539960..cffe173d73c 100644
--- a/src/devices/machine/ncr5380n.cpp
+++ b/src/devices/machine/ncr5380n.cpp
@@ -30,7 +30,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, ncr5380n_device)
AM_RANGE(0x7, 0x7) AM_READWRITE(resetparityirq_r, startdmainitrx_w)
ADDRESS_MAP_END
-ncr5380n_device::ncr5380n_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ncr5380n_device::ncr5380n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: nscsi_device(mconfig, NCR5380N, "5380 SCSI (new)", tag, owner, clock, "ncr5380", __FILE__), tm(nullptr), status(0), istatus(0), m_mode(0),
m_outdata(0), m_busstatus(0), m_dmalatch(0), m_icommand(0), m_tcommand(0), clock_conv(0), sync_offset(0), sync_period(0), bus_id(0), select_timeout(0),
seq(0), tcount(0), mode(0), state(0), irq(false), drq(false),
@@ -129,7 +129,7 @@ void ncr5380n_device::scsi_ctrl_changed()
}
if(ctrl & S_RST) {
- logerror("%s: scsi bus reset\n", tag().c_str());
+ logerror("%s: scsi bus reset\n", tag());
return;
}
@@ -148,7 +148,7 @@ void ncr5380n_device::step(bool timeout)
if(0)
printf("%s: state=%d.%d %s\n",
- tag().c_str(), state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT,
+ tag(), state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT,
timeout ? "timeout" : "change");
if(mode == MODE_I && !(ctrl & S_BSY)) {
@@ -230,7 +230,7 @@ void ncr5380n_device::step(bool timeout)
default:
printf("%s: step() unexpected state %d.%d\n",
- tag().c_str(),
+ tag(),
state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT);
exit(0);
}
@@ -312,7 +312,7 @@ WRITE8_MEMBER(ncr5380n_device::icmd_w)
// asserting to drive the data bus?
if ((data & IC_DBUS) && !(m_icommand & IC_DBUS))
{
-// printf("%s: driving data bus with %02x\n", tag().c_str(), m_outdata);
+// printf("%s: driving data bus with %02x\n", tag(), m_outdata);
scsi_bus->data_w(scsi_refid, m_outdata);
delay(2);
}
@@ -330,7 +330,7 @@ WRITE8_MEMBER(ncr5380n_device::icmd_w)
(data & IC_SEL ? S_SEL : 0) |
(data & IC_ATN ? S_ATN : 0);
-// printf("%s: changing control lines %04x\n", tag().c_str(), newdata);
+// printf("%s: changing control lines %04x\n", tag(), newdata);
scsi_bus->ctrl_w(scsi_refid, newdata, S_RST|S_ACK|S_BSY|S_SEL|S_ATN);
}
@@ -345,7 +345,7 @@ READ8_MEMBER(ncr5380n_device::mode_r)
WRITE8_MEMBER(ncr5380n_device::mode_w)
{
-// printf("%s: mode_w %02x (%08x)\n", tag().c_str(), data, space.device().safe_pc());
+// printf("%s: mode_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
// arbitration bit being set?
if ((data & MODE_ARBITRATE) && !(m_mode & MODE_ARBITRATE))
{
@@ -373,13 +373,13 @@ WRITE8_MEMBER(ncr5380n_device::mode_w)
READ8_MEMBER(ncr5380n_device::command_r)
{
-// logerror("%s: command_r %02x (%08x)\n", tag().c_str(), m_tcommand, space.device().safe_pc());
+// logerror("%s: command_r %02x (%08x)\n", tag(), m_tcommand, space.device().safe_pc());
return m_tcommand;
}
WRITE8_MEMBER(ncr5380n_device::command_w)
{
-// printf("%s: command_w %02x (%08x)\n", tag().c_str(), data, space.device().safe_pc());
+// printf("%s: command_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
m_tcommand = data;
// recalculate phase match
@@ -423,7 +423,7 @@ READ8_MEMBER(ncr5380n_device::status_r)
(ctrl & S_INP ? ST_IO : 0) |
(ctrl & S_SEL ? ST_SEL : 0);
-// printf("%s: status_r %02x (%08x)\n", tag().c_str(), res, space.device().safe_pc());
+// printf("%s: status_r %02x (%08x)\n", tag(), res, space.device().safe_pc());
return res;
}
@@ -438,7 +438,7 @@ READ8_MEMBER(ncr5380n_device::busandstatus_r)
(ctrl & S_ATN ? BAS_ATN : 0) |
(ctrl & S_ACK ? BAS_ACK : 0);
-// printf("%s: busandstatus_r %02x (%08x)\n", tag().c_str(), res, space.device().safe_pc());
+// printf("%s: busandstatus_r %02x (%08x)\n", tag(), res, space.device().safe_pc());
return res;
}
diff --git a/src/devices/machine/ncr5380n.h b/src/devices/machine/ncr5380n.h
index 4a54d170783..444ef1af32d 100644
--- a/src/devices/machine/ncr5380n.h
+++ b/src/devices/machine/ncr5380n.h
@@ -22,7 +22,7 @@
class ncr5380n_device : public nscsi_device
{
public:
- ncr5380n_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ncr5380n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ncr5380n_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/ncr5390.cpp b/src/devices/machine/ncr5390.cpp
index d84a57733d3..9de72de9afe 100644
--- a/src/devices/machine/ncr5390.cpp
+++ b/src/devices/machine/ncr5390.cpp
@@ -21,7 +21,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, ncr5390_device)
AM_RANGE(0x9, 0x9) AM_WRITE(clock_w)
ADDRESS_MAP_END
-ncr5390_device::ncr5390_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ncr5390_device::ncr5390_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: nscsi_device(mconfig, NCR5390, "5390 SCSI", tag, owner, clock, "ncr5390", __FILE__), tm(nullptr), config(0), status(0), istatus(0), clock_conv(0), sync_offset(0), sync_period(0), bus_id(0),
select_timeout(0), seq(0), tcount(0), mode(0), fifo_pos(0), command_pos(0), state(0), xfr_phase(0), command_length(0), dma_dir(0), irq(false), drq(false),
m_irq_handler(*this),
@@ -105,7 +105,7 @@ void ncr5390_device::scsi_ctrl_changed()
{
UINT32 ctrl = scsi_bus->ctrl_r();
if(ctrl & S_RST) {
- logerror("%s: scsi bus reset\n", tag().c_str());
+ logerror("%s: scsi bus reset\n", tag());
return;
}
@@ -125,7 +125,7 @@ void ncr5390_device::step(bool timeout)
if(0)
logerror("%s: state=%d.%d %s\n",
- tag().c_str(), state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT,
+ tag(), state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT,
timeout ? "timeout" : "change");
if(mode == MODE_I && !(ctrl & S_BSY)) {
@@ -200,10 +200,10 @@ void ncr5390_device::step(bool timeout)
scsi_bus->ctrl_w(scsi_refid, 0, S_SEL);
if(c == CD_RESELECT) {
- logerror("%s: mode switch to Target\n", tag().c_str());
+ logerror("%s: mode switch to Target\n", tag());
mode = MODE_T;
} else {
- logerror("%s: mode switch to Initiator\n", tag().c_str());
+ logerror("%s: mode switch to Initiator\n", tag());
mode = MODE_I;
}
state &= STATE_MASK;
@@ -213,7 +213,7 @@ void ncr5390_device::step(bool timeout)
case ARB_TIMEOUT_BUSY << SUB_SHIFT:
if(timeout) {
scsi_bus->data_w(scsi_refid, 0);
- logerror("%s: select timeout\n", tag().c_str());
+ logerror("%s: select timeout\n", tag());
state = (state & STATE_MASK) | (ARB_TIMEOUT_ABORT << SUB_SHIFT);
delay(1000);
} else if(ctrl & S_BSY) {
@@ -393,7 +393,7 @@ void ncr5390_device::step(bool timeout)
break;
default:
- logerror("%s: xfer on phase %d\n", tag().c_str(), scsi_bus->ctrl_r() & S_PHASE_MASK);
+ logerror("%s: xfer on phase %d\n", tag(), scsi_bus->ctrl_r() & S_PHASE_MASK);
function_complete();
break;
}
@@ -475,7 +475,7 @@ void ncr5390_device::step(bool timeout)
default:
logerror("%s: step() unexpected state %d.%d\n",
- tag().c_str(),
+ tag(),
state & STATE_MASK, (state & SUB_MASK) >> SUB_SHIFT);
exit(0);
}
@@ -545,7 +545,7 @@ void ncr5390_device::delay_cycles(int cycles)
READ8_MEMBER(ncr5390_device::tcount_lo_r)
{
- logerror("%s: tcount_lo_r %02x (%08x)\n", tag().c_str(), tcount & 0xff, space.device().safe_pc());
+ logerror("%s: tcount_lo_r %02x (%08x)\n", tag(), tcount & 0xff, space.device().safe_pc());
return tcount;
}
@@ -553,12 +553,12 @@ WRITE8_MEMBER(ncr5390_device::tcount_lo_w)
{
tcount = (tcount & 0xff00) | data;
status &= ~S_TC0;
- logerror("%s: tcount_lo_w %02x (%08x)\n", tag().c_str(), data, space.device().safe_pc());
+ logerror("%s: tcount_lo_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
}
READ8_MEMBER(ncr5390_device::tcount_hi_r)
{
- logerror("%s: tcount_hi_r %02x (%08x)\n", tag().c_str(), tcount >> 8, space.device().safe_pc());
+ logerror("%s: tcount_hi_r %02x (%08x)\n", tag(), tcount >> 8, space.device().safe_pc());
return tcount >> 8;
}
@@ -566,7 +566,7 @@ WRITE8_MEMBER(ncr5390_device::tcount_hi_w)
{
tcount = (tcount & 0x00ff) | (data << 8);
status &= ~S_TC0;
- logerror("%s: tcount_hi_w %02x (%08x)\n", tag().c_str(), data, space.device().safe_pc());
+ logerror("%s: tcount_hi_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
}
UINT8 ncr5390_device::fifo_pop()
@@ -606,13 +606,13 @@ WRITE8_MEMBER(ncr5390_device::fifo_w)
READ8_MEMBER(ncr5390_device::command_r)
{
- logerror("%s: command_r (%08x)\n", tag().c_str(), space.device().safe_pc());
+ logerror("%s: command_r (%08x)\n", tag(), space.device().safe_pc());
return command[0];
}
WRITE8_MEMBER(ncr5390_device::command_w)
{
- // logerror("%s: command_w %02x (%08x)\n", tag().c_str(), data, space.device().safe_pc());
+ // logerror("%s: command_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
if(command_pos == 2) {
status |= S_GROSS_ERROR;
check_irq();
@@ -638,7 +638,7 @@ void ncr5390_device::start_command()
{
UINT8 c = command[0] & 0x7f;
if(!check_valid_command(c)) {
- logerror("%s: invalid command %02x\n", tag().c_str(), command[0]);
+ logerror("%s: invalid command %02x\n", tag(), command[0]);
istatus |= I_ILLEGAL;
check_irq();
return;
@@ -707,7 +707,7 @@ void ncr5390_device::start_command()
break;
default:
- logerror("%s: start unimplemented command %02x\n", tag().c_str(), c);
+ logerror("%s: start unimplemented command %02x\n", tag(), c);
exit(0);
}
}
@@ -751,7 +751,7 @@ READ8_MEMBER(ncr5390_device::status_r)
{
UINT32 ctrl = scsi_bus->ctrl_r();
UINT8 res = status | (ctrl & S_MSG ? 4 : 0) | (ctrl & S_CTL ? 2 : 0) | (ctrl & S_INP ? 1 : 0);
- logerror("%s: status_r %02x (%08x)\n", tag().c_str(), res, space.device().safe_pc());
+ logerror("%s: status_r %02x (%08x)\n", tag(), res, space.device().safe_pc());
if(irq)
status &= ~(S_GROSS_ERROR|S_PARITY|S_TCC);
return res;
@@ -760,7 +760,7 @@ READ8_MEMBER(ncr5390_device::status_r)
WRITE8_MEMBER(ncr5390_device::bus_id_w)
{
bus_id = data & 7;
- logerror("%s: bus_id=%d\n", tag().c_str(), bus_id);
+ logerror("%s: bus_id=%d\n", tag(), bus_id);
}
READ8_MEMBER(ncr5390_device::istatus_r)
@@ -772,7 +772,7 @@ READ8_MEMBER(ncr5390_device::istatus_r)
if(res)
command_pop_and_chain();
- logerror("%s: istatus_r %02x (%08x)\n", tag().c_str(), res, space.device().safe_pc());
+ logerror("%s: istatus_r %02x (%08x)\n", tag(), res, space.device().safe_pc());
return res;
}
@@ -783,7 +783,7 @@ WRITE8_MEMBER(ncr5390_device::timeout_w)
READ8_MEMBER(ncr5390_device::seq_step_r)
{
- logerror("%s: seq_step_r %d (%08x)\n", tag().c_str(), seq, space.device().safe_pc());
+ logerror("%s: seq_step_r %d (%08x)\n", tag(), seq, space.device().safe_pc());
return seq;
}
diff --git a/src/devices/machine/ncr5390.h b/src/devices/machine/ncr5390.h
index 4020cee1369..7dfac6f5681 100644
--- a/src/devices/machine/ncr5390.h
+++ b/src/devices/machine/ncr5390.h
@@ -14,7 +14,7 @@
class ncr5390_device : public nscsi_device
{
public:
- ncr5390_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ncr5390_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ncr5390_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/ncr539x.cpp b/src/devices/machine/ncr539x.cpp
index 23ded806b3a..3d0a83b5246 100644
--- a/src/devices/machine/ncr539x.cpp
+++ b/src/devices/machine/ncr539x.cpp
@@ -116,7 +116,7 @@ const device_type NCR539X = &device_creator<ncr539x_device>;
// ncr539x_device - constructor/destructor
//-------------------------------------------------
-ncr539x_device::ncr539x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+ncr539x_device::ncr539x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
legacy_scsi_host_adapter(mconfig, NCR539X, "539x SCSI", tag, owner, clock, "ncr539x", __FILE__),
m_out_irq_cb(*this),
m_out_drq_cb(*this)
diff --git a/src/devices/machine/ncr539x.h b/src/devices/machine/ncr539x.h
index 42d89a65abb..95b3655228d 100644
--- a/src/devices/machine/ncr539x.h
+++ b/src/devices/machine/ncr539x.h
@@ -27,7 +27,7 @@ class ncr539x_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- ncr539x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ncr539x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<ncr539x_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<ncr539x_device &>(device).m_out_drq_cb.set_callback(object); }
diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index 2c714d0d0e6..1b8c76743bc 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -45,7 +45,7 @@ void netlist_mame_sub_interface::static_set_mult_offset(device_t &device, const
}
-netlist_mame_analog_input_t::netlist_mame_analog_input_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+netlist_mame_analog_input_t::netlist_mame_analog_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Analog Input", tag, owner, clock, "netlist_analog_input", __FILE__),
netlist_mame_sub_interface(*owner),
m_param(nullptr),
@@ -62,7 +62,7 @@ void netlist_mame_analog_input_t::static_set_name(device_t &device, const char *
void netlist_mame_analog_input_t::device_start()
{
- LOG_DEV_CALLS(("start %s\n", tag().c_str()));
+ LOG_DEV_CALLS(("start %s\n", tag()));
netlist::param_t *p = this->nl_owner().setup().find_param(m_param_name);
m_param = dynamic_cast<netlist::param_double_t *>(p);
if (m_param == nullptr)
@@ -81,7 +81,7 @@ void netlist_mame_analog_input_t::device_start()
// netlist_mame_analog_output_t
// ----------------------------------------------------------------------------------------
-netlist_mame_analog_output_t::netlist_mame_analog_output_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+netlist_mame_analog_output_t::netlist_mame_analog_output_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Analog Output", tag, owner, clock, "netlist_analog_output", __FILE__),
netlist_mame_sub_interface(*owner),
m_in("")
@@ -108,7 +108,7 @@ void netlist_mame_analog_output_t::custom_netlist_additions(netlist::setup_t &se
void netlist_mame_analog_output_t::device_start()
{
- LOG_DEV_CALLS(("start %s\n", tag().c_str()));
+ LOG_DEV_CALLS(("start %s\n", tag()));
}
@@ -116,7 +116,7 @@ void netlist_mame_analog_output_t::device_start()
// netlist_mame_logic_input_t
// ----------------------------------------------------------------------------------------
-netlist_mame_logic_input_t::netlist_mame_logic_input_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+netlist_mame_logic_input_t::netlist_mame_logic_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Logic Input", tag, owner, clock, "netlist_logic_input", __FILE__),
netlist_mame_sub_interface(*owner),
m_param(nullptr),
@@ -137,7 +137,7 @@ void netlist_mame_logic_input_t::static_set_params(device_t &device, const char
void netlist_mame_logic_input_t::device_start()
{
- LOG_DEV_CALLS(("start %s\n", tag().c_str()));
+ LOG_DEV_CALLS(("start %s\n", tag()));
netlist::param_t *p = downcast<netlist_mame_device_t *>(this->owner())->setup().find_param(m_param_name);
m_param = dynamic_cast<netlist::param_int_t *>(p);
if (m_param == nullptr)
@@ -150,7 +150,7 @@ void netlist_mame_logic_input_t::device_start()
// netlist_mame_stream_input_t
// ----------------------------------------------------------------------------------------
-netlist_mame_stream_input_t::netlist_mame_stream_input_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+netlist_mame_stream_input_t::netlist_mame_stream_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Stream Input", tag, owner, clock, "netlist_stream_input", __FILE__),
netlist_mame_sub_interface(*owner),
m_channel(0),
@@ -167,7 +167,7 @@ void netlist_mame_stream_input_t::static_set_params(device_t &device, int channe
void netlist_mame_stream_input_t::device_start()
{
- LOG_DEV_CALLS(("start %s\n", tag().c_str()));
+ LOG_DEV_CALLS(("start %s\n", tag()));
}
void netlist_mame_stream_input_t::custom_netlist_additions(netlist::setup_t &setup)
@@ -188,7 +188,7 @@ void netlist_mame_stream_input_t::custom_netlist_additions(netlist::setup_t &set
// netlist_mame_stream_output_t
// ----------------------------------------------------------------------------------------
-netlist_mame_stream_output_t::netlist_mame_stream_output_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+netlist_mame_stream_output_t::netlist_mame_stream_output_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Stream Output", tag, owner, clock, "netlist_stream_output", __FILE__),
netlist_mame_sub_interface(*owner),
m_channel(0),
@@ -205,7 +205,7 @@ void netlist_mame_stream_output_t::static_set_params(device_t &device, int chann
void netlist_mame_stream_output_t::device_start()
{
- LOG_DEV_CALLS(("start %s\n", tag().c_str()));
+ LOG_DEV_CALLS(("start %s\n", tag()));
}
void netlist_mame_stream_output_t::custom_netlist_additions(netlist::setup_t &setup)
@@ -262,7 +262,7 @@ static ADDRESS_MAP_START(program_dummy, AS_PROGRAM, 8, netlist_mame_device_t)
AM_RANGE(0x000, 0x3ff) AM_ROM
ADDRESS_MAP_END
-netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST_CORE, "Netlist core device", tag, owner, clock, "netlist_core", __FILE__),
m_icount(0),
m_old(netlist::netlist_time::zero),
@@ -272,7 +272,7 @@ netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, std:
{
}
-netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *file)
+netlist_mame_device_t::netlist_mame_device_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *file)
: device_t(mconfig, type, name, tag, owner, clock, shortname, file),
m_icount(0),
m_old(netlist::netlist_time::zero),
@@ -296,7 +296,7 @@ void netlist_mame_device_t::device_config_complete()
void netlist_mame_device_t::device_start()
{
- LOG_DEV_CALLS(("device_start %s\n", tag().c_str()));
+ LOG_DEV_CALLS(("device_start %s\n", tag()));
//printf("clock is %d\n", clock());
@@ -455,7 +455,7 @@ ATTR_COLD void netlist_mame_device_t::save_state()
// netlist_mame_cpu_device_t
// ----------------------------------------------------------------------------------------
-netlist_mame_cpu_device_t::netlist_mame_cpu_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+netlist_mame_cpu_device_t::netlist_mame_cpu_device_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: netlist_mame_device_t(mconfig, NETLIST_CPU, "Netlist CPU Device", tag, owner, clock, "netlist_cpu", __FILE__),
device_execute_interface(mconfig, *this),
device_state_interface(mconfig, *this),
@@ -470,7 +470,7 @@ void netlist_mame_cpu_device_t::device_start()
{
netlist_mame_device_t::device_start();
- LOG_DEV_CALLS(("cpu device_start %s\n", tag().c_str()));
+ LOG_DEV_CALLS(("cpu device_start %s\n", tag()));
// State support
@@ -555,7 +555,7 @@ ATTR_HOT void netlist_mame_cpu_device_t::execute_run()
// netlist_mame_sound_device_t
// ----------------------------------------------------------------------------------------
-netlist_mame_sound_device_t::netlist_mame_sound_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+netlist_mame_sound_device_t::netlist_mame_sound_device_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: netlist_mame_device_t(mconfig, NETLIST_CPU, "Netlist Sound Device", tag, owner, clock, "netlist_sound", __FILE__),
device_sound_interface(mconfig, *this)
{
@@ -565,7 +565,7 @@ void netlist_mame_sound_device_t::device_start()
{
netlist_mame_device_t::device_start();
- LOG_DEV_CALLS(("sound device_start %s\n", tag().c_str()));
+ LOG_DEV_CALLS(("sound device_start %s\n", tag()));
// Configure outputs
diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h
index af3c0a1cdae..961bb7a26ea 100644
--- a/src/devices/machine/netlist.h
+++ b/src/devices/machine/netlist.h
@@ -112,8 +112,8 @@ class netlist_mame_device_t : public device_t
public:
// construction/destruction
- netlist_mame_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- netlist_mame_device_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *file);
+ netlist_mame_device_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ netlist_mame_device_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *file);
virtual ~netlist_mame_device_t() { pstring::resetmem(); }
static void static_set_constructor(device_t &device, void (*setup_func)(netlist::setup_t &));
@@ -176,7 +176,7 @@ class netlist_mame_cpu_device_t : public netlist_mame_device_t,
public:
// construction/destruction
- netlist_mame_cpu_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ netlist_mame_cpu_device_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_cpu_device_t() {}
protected:
// netlist_mame_device_t
@@ -250,7 +250,7 @@ class netlist_mame_sound_device_t : public netlist_mame_device_t,
public:
// construction/destruction
- netlist_mame_sound_device_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ netlist_mame_sound_device_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_sound_device_t() {}
inline sound_stream *get_stream() { return m_stream; }
@@ -333,7 +333,7 @@ class netlist_mame_analog_input_t : public device_t,
public:
// construction/destruction
- netlist_mame_analog_input_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ netlist_mame_analog_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_analog_input_t() { }
static void static_set_name(device_t &device, const char *param_name);
@@ -387,7 +387,7 @@ class netlist_mame_analog_output_t : public device_t,
public:
// construction/destruction
- netlist_mame_analog_output_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ netlist_mame_analog_output_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_analog_output_t() { }
static void static_set_params(device_t &device, const char *in_name, netlist_analog_output_delegate adelegate);
@@ -413,7 +413,7 @@ class netlist_mame_logic_input_t : public device_t,
public:
// construction/destruction
- netlist_mame_logic_input_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ netlist_mame_logic_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_logic_input_t() { }
static void static_set_params(device_t &device, const char *param_name, const UINT32 mask, const UINT32 shift);
@@ -459,7 +459,7 @@ class netlist_mame_stream_input_t : public device_t,
public:
// construction/destruction
- netlist_mame_stream_input_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ netlist_mame_stream_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_stream_input_t() { }
static void static_set_params(device_t &device, int channel, const char *param_name);
@@ -483,7 +483,7 @@ class netlist_mame_stream_output_t : public device_t,
public:
// construction/destruction
- netlist_mame_stream_output_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ netlist_mame_stream_output_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~netlist_mame_stream_output_t() { }
static void static_set_params(device_t &device, int channel, const char *out_name);
diff --git a/src/devices/machine/nmc9306.cpp b/src/devices/machine/nmc9306.cpp
index e980f748104..0b23eda21d7 100644
--- a/src/devices/machine/nmc9306.cpp
+++ b/src/devices/machine/nmc9306.cpp
@@ -103,7 +103,7 @@ inline void nmc9306_device::erase(offs_t offset)
// nmc9306_device - constructor
//-------------------------------------------------
-nmc9306_device::nmc9306_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+nmc9306_device::nmc9306_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NMC9306, "NMC9306", tag, owner, clock, "nmc9306", __FILE__),
device_nvram_interface(mconfig, *this),
m_state(STATE_IDLE),
@@ -189,7 +189,7 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
switch (m_state)
{
case STATE_IDLE:
- if (LOG) logerror("NMC9306 '%s' Idle %u\n", tag().c_str(), m_di);
+ if (LOG) logerror("NMC9306 '%s' Idle %u\n", tag(), m_di);
if (m_di)
{
@@ -200,7 +200,7 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
break;
case STATE_COMMAND:
- if (LOG) logerror("NMC9306 '%s' Command Bit %u\n", tag().c_str(), m_di);
+ if (LOG) logerror("NMC9306 '%s' Command Bit %u\n", tag(), m_di);
m_command <<= 1;
m_command |= m_di;
@@ -214,7 +214,7 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
break;
case STATE_ADDRESS:
- if (LOG) logerror("NMC9306 '%s' Address Bit %u\n", tag().c_str(), m_di);
+ if (LOG) logerror("NMC9306 '%s' Address Bit %u\n", tag(), m_di);
m_address <<= 1;
m_address |= m_di;
@@ -228,21 +228,21 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
switch (m_command & 0x03)
{
case EWDS:
- if (LOG) logerror("NMC9306 '%s' EWDS\n", tag().c_str());
+ if (LOG) logerror("NMC9306 '%s' EWDS\n", tag());
m_ewen = false;
m_state = STATE_IDLE;
break;
case WRAL:
- if (LOG) logerror("NMC9306 '%s' WRAL\n", tag().c_str());
+ if (LOG) logerror("NMC9306 '%s' WRAL\n", tag());
break;
case ERAL:
- if (LOG) logerror("NMC9306 '%s' ERAL\n", tag().c_str());
+ if (LOG) logerror("NMC9306 '%s' ERAL\n", tag());
break;
case EWEN:
- if (LOG) logerror("NMC9306 '%s' EWEN\n", tag().c_str());
+ if (LOG) logerror("NMC9306 '%s' EWEN\n", tag());
m_ewen = true;
m_state = STATE_IDLE;
break;
@@ -250,18 +250,18 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
break;
case WRITE:
- if (LOG) logerror("NMC9306 '%s' WRITE %u\n", tag().c_str(), m_address & 0x0f);
+ if (LOG) logerror("NMC9306 '%s' WRITE %u\n", tag(), m_address & 0x0f);
m_state = STATE_DATA_IN;
break;
case READ:
- if (LOG) logerror("NMC9306 '%s' READ %u\n", tag().c_str(), m_address & 0x0f);
+ if (LOG) logerror("NMC9306 '%s' READ %u\n", tag(), m_address & 0x0f);
m_data = read(m_address & 0x0f);
m_state = STATE_DATA_OUT;
break;
case ERASE:
- if (LOG) logerror("NMC9306 '%s' ERASE %u\n", tag().c_str(), m_address & 0x0f);
+ if (LOG) logerror("NMC9306 '%s' ERASE %u\n", tag(), m_address & 0x0f);
erase(m_address & 0x0f);
m_state = STATE_ERASE;
break;
@@ -272,7 +272,7 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
break;
case STATE_DATA_IN:
- if (LOG) logerror("NMC9306 '%s' Data Bit IN %u\n", tag().c_str(), m_di);
+ if (LOG) logerror("NMC9306 '%s' Data Bit IN %u\n", tag(), m_di);
m_data <<= 1;
m_data |= m_di;
@@ -287,7 +287,7 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w )
break;
case STATE_DATA_OUT:
- if (LOG) logerror("NMC9306 '%s' Data Bit OUT %u\n", tag().c_str(), m_di);
+ if (LOG) logerror("NMC9306 '%s' Data Bit OUT %u\n", tag(), m_di);
m_do = BIT(m_data, 15);
m_data <<= 1;
diff --git a/src/devices/machine/nmc9306.h b/src/devices/machine/nmc9306.h
index 81aec67d185..92aba51965b 100644
--- a/src/devices/machine/nmc9306.h
+++ b/src/devices/machine/nmc9306.h
@@ -50,7 +50,7 @@ class nmc9306_device : public device_t,
{
public:
// construction/destruction
- nmc9306_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nmc9306_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( cs_w );
DECLARE_WRITE_LINE_MEMBER( sk_w );
diff --git a/src/devices/machine/nsc810.cpp b/src/devices/machine/nsc810.cpp
index 4ec76576bfd..fb2f3466508 100644
--- a/src/devices/machine/nsc810.cpp
+++ b/src/devices/machine/nsc810.cpp
@@ -22,7 +22,7 @@
const device_type NSC810 = &device_creator<nsc810_device>;
-nsc810_device::nsc810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+nsc810_device::nsc810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NSC810, "National Semiconductor NSC810", tag, owner, clock, "nsc810", __FILE__), m_portA_latch(0), m_portB_latch(0), m_portC_latch(0),
m_ddrA(0), m_ddrB(0), m_ddrC(0), m_mode(0), m_timer0(nullptr), m_timer1(nullptr), m_timer0_mode(0), m_timer1_mode(0), m_timer0_counter(0), m_timer1_counter(0),
m_timer0_base(0), m_timer1_base(0), m_timer0_running(false), m_timer1_running(false), m_timer0_clock(0), m_timer1_clock(0), m_ramselect(false),
@@ -88,7 +88,7 @@ void nsc810_device::device_timer(emu_timer &timer, device_timer_id id, int param
{
m_timer0_out(ASSERT_LINE);
m_timer0_counter = m_timer0_base;
- if(LOG) logerror("NSC810 '%s': Timer 0 output set\n", tag().c_str());
+ if(LOG) logerror("NSC810 '%s': Timer 0 output set\n",tag());
}
}
break;
@@ -100,7 +100,7 @@ void nsc810_device::device_timer(emu_timer &timer, device_timer_id id, int param
{
m_timer1_out(ASSERT_LINE);
m_timer1_counter = m_timer1_base;
- if(LOG) logerror("NSC810 '%s': Timer 1 output set\n", tag().c_str());
+ if(LOG) logerror("NSC810 '%s': Timer 1 output set\n",tag());
}
}
break;
@@ -123,17 +123,17 @@ READ8_MEMBER(nsc810_device::read)
case REG_PORTA:
res = m_portA_latch &= m_ddrA;
res |= (m_portA_r() & ~m_ddrA);
- //if(LOG) logerror("NSC810 '%s': Port A data read %02x\n", tag().c_str(),res);
+ //if(LOG) logerror("NSC810 '%s': Port A data read %02x\n",tag(),res);
break;
case REG_PORTB:
res = m_portB_latch &= m_ddrB;
res |= (m_portB_r() & ~m_ddrB);
- //if(LOG) logerror("NSC810 '%s': Port B data read %02x\n", tag().c_str(),res);
+ //if(LOG) logerror("NSC810 '%s': Port B data read %02x\n",tag(),res);
break;
case REG_PORTC:
res = m_portC_latch &= m_ddrC;
res |= (m_portC_r() & ~m_ddrC);
- //if(LOG) logerror("NSC810 '%s': Port C data read %02x\n", tag().c_str(),res);
+ //if(LOG) logerror("NSC810 '%s': Port C data read %02x\n",tag(),res);
break;
case REG_MODE_TIMER0:
res = m_timer0_mode;
@@ -146,7 +146,7 @@ READ8_MEMBER(nsc810_device::read)
if((m_timer0_mode & 0x07) == 0x01 || (m_timer0_mode & 0x07) == 0x02)
{
m_timer0_out(CLEAR_LINE);
- if(LOG) logerror("NSC810 '%s': Timer 0 output reset\n", tag().c_str());
+ if(LOG) logerror("NSC810 '%s': Timer 0 output reset\n",tag());
}
break;
case REG_TIMER0_HIGH:
@@ -154,7 +154,7 @@ READ8_MEMBER(nsc810_device::read)
if((m_timer0_mode & 0x07) == 0x01 || (m_timer0_mode & 0x07) == 0x02)
{
m_timer0_out(CLEAR_LINE);
- if(LOG) logerror("NSC810 '%s': Timer 0 output reset\n", tag().c_str());
+ if(LOG) logerror("NSC810 '%s': Timer 0 output reset\n",tag());
}
break;
case REG_TIMER1_LOW:
@@ -162,7 +162,7 @@ READ8_MEMBER(nsc810_device::read)
if((m_timer1_mode & 0x07) == 0x01 || (m_timer1_mode & 0x07) == 0x02)
{
m_timer1_out(0);
- if(LOG) logerror("NSC810 '%s': Timer 1 output reset\n", tag().c_str());
+ if(LOG) logerror("NSC810 '%s': Timer 1 output reset\n",tag());
}
break;
case REG_TIMER1_HIGH:
@@ -170,11 +170,11 @@ READ8_MEMBER(nsc810_device::read)
if((m_timer1_mode & 0x07) == 0x01 || (m_timer1_mode & 0x07) == 0x02)
{
m_timer1_out(0);
- if(LOG) logerror("NSC810 '%s': Timer 1 output reset\n", tag().c_str());
+ if(LOG) logerror("NSC810 '%s': Timer 1 output reset\n",tag());
}
break;
default:
- if(LOG) logerror("NSC810 '%s': unused port %02x read\n", tag().c_str(),offset);
+ if(LOG) logerror("NSC810 '%s': unused port %02x read\n",tag(),offset);
}
}
return res;
@@ -196,75 +196,75 @@ WRITE8_MEMBER(nsc810_device::write)
case REG_PORTA:
m_portA_latch = data & ~m_ddrA;
m_portA_w((0xff & ~m_ddrA) | (data & m_ddrA));
- if(LOG) logerror("NSC810 '%s': Port A data write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Port A data write %02x\n",tag(),data);
break;
case REG_PORTB:
m_portB_latch = data & ~m_ddrB;
m_portB_w((0xff & ~m_ddrB) | (data & m_ddrB));
- if(LOG) logerror("NSC810 '%s': Port B data write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Port B data write %02x\n",tag(),data);
break;
case REG_PORTC:
m_portC_latch = data & ~m_ddrC;
m_portC_w((0xff & ~m_ddrC) | (data & m_ddrC));
- if(LOG) logerror("NSC810 '%s': Port C data write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Port C data write %02x\n",tag(),data);
break;
case REG_DDRA:
m_ddrA = data;
- if(LOG) logerror("NSC810 '%s': Port A direction write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Port A direction write %02x\n",tag(),data);
break;
case REG_DDRB:
m_ddrB = data;
- if(LOG) logerror("NSC810 '%s': Port B direction write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Port B direction write %02x\n",tag(),data);
break;
case REG_DDRC:
m_ddrC = data;
- if(LOG) logerror("NSC810 '%s': Port C direction write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Port C direction write %02x\n",tag(),data);
break;
case REG_MODE_DEF:
- if(LOG) logerror("NSC810 '%s': Mode Definition write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Mode Definition write %02x\n",tag(),data);
break;
case REG_PORTA_BITCLR:
- if(LOG) logerror("NSC810 '%s': Port A bit-clear write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Port A bit-clear write %02x\n",tag(),data);
break;
case REG_PORTB_BITCLR:
- if(LOG) logerror("NSC810 '%s': Port B bit-clear write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Port B bit-clear write %02x\n",tag(),data);
break;
case REG_PORTC_BITCLR:
- if(LOG) logerror("NSC810 '%s': Port C bit-clear write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Port C bit-clear write %02x\n",tag(),data);
break;
case REG_PORTA_BITSET:
- if(LOG) logerror("NSC810 '%s': Port A bit-set write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Port A bit-set write %02x\n",tag(),data);
break;
case REG_PORTB_BITSET:
- if(LOG) logerror("NSC810 '%s': Port B bit-set write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Port B bit-set write %02x\n",tag(),data);
break;
case REG_PORTC_BITSET:
- if(LOG) logerror("NSC810 '%s': Port C bit-set write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Port C bit-set write %02x\n",tag(),data);
break;
case REG_TIMER0_LOW:
m_timer0_base = (m_timer0_base & 0xff00) | data;
m_timer0_counter = (m_timer0_counter & 0xff00) | data;
- if(LOG) logerror("NSC810 '%s': Timer 0 low-byte write %02x (base=%04x)\n", tag().c_str(),data,m_timer0_base);
+ if(LOG) logerror("NSC810 '%s': Timer 0 low-byte write %02x (base=%04x)\n",tag(),data,m_timer0_base);
break;
case REG_TIMER0_HIGH:
m_timer0_base = (m_timer0_base & 0x00ff) | (data << 8);
m_timer0_counter = (m_timer0_counter & 0x00ff) | (data << 8);
- if(LOG) logerror("NSC810 '%s': Timer 0 high-byte write %02x (base=%04x)\n", tag().c_str(),data,m_timer0_base);
+ if(LOG) logerror("NSC810 '%s': Timer 0 high-byte write %02x (base=%04x)\n",tag(),data,m_timer0_base);
break;
case REG_TIMER1_LOW:
m_timer1_base = (m_timer1_base & 0xff00) | data;
m_timer1_counter = (m_timer1_counter & 0xff00) | data;
- if(LOG) logerror("NSC810 '%s': Timer 1 low-byte write %02x (base=%04x)\n", tag().c_str(),data,m_timer1_base);
+ if(LOG) logerror("NSC810 '%s': Timer 1 low-byte write %02x (base=%04x)\n",tag(),data,m_timer1_base);
break;
case REG_TIMER1_HIGH:
m_timer1_base = (m_timer1_base & 0x00ff) | (data << 8);
m_timer1_counter = (m_timer1_counter & 0x00ff) | (data << 8);
- if(LOG) logerror("NSC810 '%s': Timer 1 high-byte write %02x (base=%04x)\n", tag().c_str(),data,m_timer1_base);
+ if(LOG) logerror("NSC810 '%s': Timer 1 high-byte write %02x (base=%04x)\n",tag(),data,m_timer1_base);
break;
case REG_TIMER0_STOP:
m_timer0_running = false;
m_timer0->reset();
- if(LOG) logerror("NSC810 '%s': Timer 0 Stop write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Timer 0 Stop write %02x\n",tag(),data);
break;
case REG_TIMER0_START:
if((m_timer0_mode & 0x07) != 0x00 && (m_timer0_mode & 0x07) != 0x07)
@@ -279,12 +279,12 @@ WRITE8_MEMBER(nsc810_device::write)
rate = m_timer0_clock;
m_timer0->adjust(attotime::zero,0,attotime::from_hz(rate));
}
- if(LOG) logerror("NSC810 '%s': Timer 0 Start write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Timer 0 Start write %02x\n",tag(),data);
break;
case REG_TIMER1_STOP:
m_timer1_running = false;
m_timer1->reset();
- if(LOG) logerror("NSC810 '%s': Timer 1 Stop write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Timer 1 Stop write %02x\n",tag(),data);
break;
case REG_TIMER1_START:
if((m_timer1_mode & 0x07) != 0x00 && (m_timer1_mode & 0x07) != 0x07)
@@ -297,18 +297,18 @@ WRITE8_MEMBER(nsc810_device::write)
rate = m_timer0_clock;
m_timer1->adjust(attotime::zero,0,attotime::from_hz(rate));
}
- if(LOG) logerror("NSC810 '%s': Timer 1 Start write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Timer 1 Start write %02x\n",tag(),data);
break;
case REG_MODE_TIMER0:
m_timer0_mode = data;
- if(LOG) logerror("NSC810 '%s': Timer 0 Mode write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Timer 0 Mode write %02x\n",tag(),data);
break;
case REG_MODE_TIMER1:
m_timer1_mode = data;
- if(LOG) logerror("NSC810 '%s': Timer 1 Mode write %02x\n", tag().c_str(),data);
+ if(LOG) logerror("NSC810 '%s': Timer 1 Mode write %02x\n",tag(),data);
break;
default:
- logerror("NSC810 '%s': Unused register %02x write %02x\n", tag().c_str(),offset,data);
+ logerror("NSC810 '%s': Unused register %02x write %02x\n",tag(),offset,data);
}
}
}
diff --git a/src/devices/machine/nsc810.h b/src/devices/machine/nsc810.h
index eed1801491a..036b197680d 100644
--- a/src/devices/machine/nsc810.h
+++ b/src/devices/machine/nsc810.h
@@ -15,7 +15,7 @@ class nsc810_device : public device_t
{
public:
// construction/destruction
- nsc810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nsc810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_portA_read_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portA_r.set_callback(object); }
template<class _Object> static devcb_base &set_portB_read_callback(device_t &device, _Object object) { return downcast<nsc810_device &>(device).m_portB_r.set_callback(object); }
diff --git a/src/devices/machine/nscsi_bus.cpp b/src/devices/machine/nscsi_bus.cpp
index f753077f631..d0508059758 100644
--- a/src/devices/machine/nscsi_bus.cpp
+++ b/src/devices/machine/nscsi_bus.cpp
@@ -5,7 +5,7 @@
const device_type NSCSI_BUS = &device_creator<nscsi_bus_device>;
const device_type NSCSI_CONNECTOR = &device_creator<nscsi_connector>;
-nscsi_bus_device::nscsi_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+nscsi_bus_device::nscsi_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NSCSI_BUS, "NSCSI Bus", tag, owner, clock, "nscsi_bus", __FILE__), data(0), ctrl(0)
{
devcnt = 0;
@@ -49,7 +49,7 @@ void nscsi_bus_device::regen_ctrl(int refid)
if(0) {
logerror("%s: ctrl %c%c%c%c%c%c%c%c%c %s %04x -",
- tag().c_str(),
+ tag(),
ctrl & nscsi_device::S_RST ? 'R' : '.',
ctrl & nscsi_device::S_ATN ? 'A' : '.',
ctrl & nscsi_device::S_ACK ? 'K' : '.',
@@ -132,7 +132,7 @@ void nscsi_bus_device::device_config_complete()
}
-nscsi_connector::nscsi_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+nscsi_connector::nscsi_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NSCSI_CONNECTOR, "NSCSI Connector Abstraction", tag, owner, clock, "nscsi_connector", __FILE__),
device_slot_interface(mconfig, *this)
{
@@ -151,7 +151,7 @@ nscsi_device *nscsi_connector::get_device()
return dynamic_cast<nscsi_device *>(get_card_device());
}
-nscsi_device::nscsi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nscsi_device::nscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_card_interface(mconfig, *this)
{
@@ -175,7 +175,7 @@ void nscsi_device::device_start()
save_item(NAME(scsi_id));
}
-nscsi_full_device::nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nscsi_full_device::nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
nscsi_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -268,13 +268,13 @@ void nscsi_full_device::step(bool timeout)
scsi_bus->data_w(scsi_refid, 0);
scsi_bus->ctrl_w(scsi_refid, 0, S_ALL);
scsi_state = IDLE;
- logerror("%s: scsi bus reset\n", tag().c_str());
+ logerror("%s: scsi bus reset\n", tag());
return;
}
if(0)
logerror("%s: state=%d.%d %s\n",
- tag().c_str(), scsi_state & STATE_MASK, (scsi_state & SUB_MASK) >> SUB_SHIFT,
+ tag(), scsi_state & STATE_MASK, (scsi_state & SUB_MASK) >> SUB_SHIFT,
timeout ? "timeout" : "change");
switch(scsi_state & SUB_MASK ? scsi_state & SUB_MASK : scsi_state & STATE_MASK) {
@@ -420,7 +420,7 @@ void nscsi_full_device::step(bool timeout)
if(ctrl & S_SEL)
return;
if(ctrl & S_ATN) {
- logerror("%s: Parity error? Say what?\n", tag().c_str());
+ logerror("%s: Parity error? Say what?\n", tag());
scsi_state = IDLE;
break;
}
@@ -437,7 +437,7 @@ void nscsi_full_device::step(bool timeout)
default:
logerror("%s: step() unexpected state %d.%d\n",
- tag().c_str(),
+ tag(),
scsi_state & STATE_MASK, (scsi_state & SUB_MASK) >> SUB_SHIFT);
exit(0);
}
@@ -512,7 +512,7 @@ bool nscsi_full_device::command_done()
nscsi_full_device::control *nscsi_full_device::buf_control_push()
{
if(buf_control_wpos == int(ARRAY_LENGTH(buf_control)))
- throw emu_fatalerror("%s: buf_control overflow\n", tag().c_str());
+ throw emu_fatalerror("%s: buf_control overflow\n", tag());
control *c = buf_control + buf_control_wpos;
buf_control_wpos++;
@@ -522,7 +522,7 @@ nscsi_full_device::control *nscsi_full_device::buf_control_push()
nscsi_full_device::control *nscsi_full_device::buf_control_pop()
{
if(buf_control_rpos == buf_control_wpos)
- throw emu_fatalerror("%s: buf_control underflow\n", tag().c_str());
+ throw emu_fatalerror("%s: buf_control underflow\n", tag());
control *c = buf_control + buf_control_rpos;
buf_control_rpos++;
@@ -571,7 +571,7 @@ void nscsi_full_device::sense(bool deferred, UINT8 key)
void nscsi_full_device::scsi_unknown_command()
{
- logerror("%s: Unhandled command %s", tag().c_str(), command_names[scsi_cmdbuf[0]]);
+ logerror("%s: Unhandled command %s", tag(), command_names[scsi_cmdbuf[0]]);
for(int i=0; i != scsi_cmdsize; i++)
logerror(" %02x", scsi_cmdbuf[i]);
logerror("\n");
@@ -584,7 +584,7 @@ void nscsi_full_device::scsi_command()
{
switch(scsi_cmdbuf[0]) {
case SC_REQUEST_SENSE:
- logerror("%s: command REQUEST SENSE\n", tag().c_str());
+ logerror("%s: command REQUEST SENSE\n", tag());
scsi_data_in(SBUF_SENSE, 8);
scsi_status_complete(SS_GOOD);
break;
@@ -601,7 +601,7 @@ void nscsi_full_device::scsi_message()
return;
}
- logerror("%s: Unknown message", tag().c_str());
+ logerror("%s: Unknown message", tag());
for(int i=0; i != scsi_cmdsize; i++)
logerror(" %02x", scsi_cmdbuf[i]);
logerror("\n");
diff --git a/src/devices/machine/nscsi_bus.h b/src/devices/machine/nscsi_bus.h
index 2e70dc02e2c..c0b35af248e 100644
--- a/src/devices/machine/nscsi_bus.h
+++ b/src/devices/machine/nscsi_bus.h
@@ -17,7 +17,7 @@ class nscsi_device;
class nscsi_bus_device : public device_t
{
public:
- nscsi_bus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nscsi_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void ctrl_w(int refid, UINT32 lines, UINT32 mask);
void data_w(int refid, UINT32 lines);
@@ -51,7 +51,7 @@ class nscsi_connector: public device_t,
public device_slot_interface
{
public:
- nscsi_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nscsi_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~nscsi_connector();
nscsi_device *get_device();
@@ -86,7 +86,7 @@ public:
S_PHASE_MASK = S_MSG|S_CTL|S_INP
};
- nscsi_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void connect_to_bus(nscsi_bus_device *bus, int refid, int default_scsi_id);
virtual void scsi_ctrl_changed();
@@ -101,7 +101,7 @@ protected:
class nscsi_full_device : public nscsi_device
{
public:
- nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void scsi_ctrl_changed() override;
protected:
diff --git a/src/devices/machine/nscsi_cb.cpp b/src/devices/machine/nscsi_cb.cpp
index f0cf4fbd726..94950098f6a 100644
--- a/src/devices/machine/nscsi_cb.cpp
+++ b/src/devices/machine/nscsi_cb.cpp
@@ -4,7 +4,7 @@
const device_type NSCSI_CB = &device_creator<nscsi_callback_device>;
-nscsi_callback_device::nscsi_callback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+nscsi_callback_device::nscsi_callback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: nscsi_device(mconfig, NSCSI_CB, "SCSI callback (new)", tag, owner, clock, "nscsi_cb", __FILE__),
m_write_rst(*this),
m_write_atn(*this),
diff --git a/src/devices/machine/nscsi_cb.h b/src/devices/machine/nscsi_cb.h
index 930cb653160..547f288842b 100644
--- a/src/devices/machine/nscsi_cb.h
+++ b/src/devices/machine/nscsi_cb.h
@@ -36,7 +36,7 @@
class nscsi_callback_device : public nscsi_device
{
public:
- nscsi_callback_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nscsi_callback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _line> void set_rst_callback(_line line) { m_write_rst.set_callback(line); }
template<class _line> void set_atn_callback(_line line) { m_write_atn.set_callback(line); }
diff --git a/src/devices/machine/nscsi_cd.cpp b/src/devices/machine/nscsi_cd.cpp
index d0b86e209b9..2cc3dc48ae5 100644
--- a/src/devices/machine/nscsi_cd.cpp
+++ b/src/devices/machine/nscsi_cd.cpp
@@ -5,7 +5,7 @@
const device_type NSCSI_CDROM = &device_creator<nscsi_cdrom_device>;
-nscsi_cdrom_device::nscsi_cdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+nscsi_cdrom_device::nscsi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
nscsi_full_device(mconfig, NSCSI_CDROM, "SCSI CDROM", tag, owner, clock, "scsi_cdrom", __FILE__), cdrom(nullptr), bytes_per_sector(0), lba(0), cur_lba(0), blocks(0)
{
}
@@ -48,7 +48,7 @@ UINT8 nscsi_cdrom_device::scsi_get_data(int id, int pos)
if(clba != cur_lba) {
cur_lba = clba;
if(!cdrom_read_data(cdrom, cur_lba, block, CD_TRACK_MODE1)) {
- logerror("%s: CD READ ERROR !\n", tag().c_str());
+ logerror("%s: CD READ ERROR !\n", tag());
memset(block, 0, sizeof(block));
}
}
@@ -65,7 +65,7 @@ void nscsi_cdrom_device::scsi_command()
{
switch(scsi_cmdbuf[0]) {
case SC_TEST_UNIT_READY:
- logerror("%s: command TEST UNIT READY\n", tag().c_str());
+ logerror("%s: command TEST UNIT READY\n", tag());
if(cdrom)
scsi_status_complete(SS_GOOD);
else
@@ -84,7 +84,7 @@ void nscsi_cdrom_device::scsi_command()
blocks = 256;
logerror("%s: command READ start=%08x blocks=%04x\n",
- tag().c_str(), lba, blocks);
+ tag(), lba, blocks);
scsi_data_in(2, blocks*bytes_per_sector);
scsi_status_complete(SS_GOOD);
@@ -93,7 +93,7 @@ void nscsi_cdrom_device::scsi_command()
case SC_INQUIRY: {
int lun = get_lun(scsi_cmdbuf[1] >> 5);
logerror("%s: command INQUIRY lun=%d EVPD=%d page=%d alloc=%02x link=%02x\n",
- tag().c_str(),
+ tag(),
lun, scsi_cmdbuf[1] & 1, scsi_cmdbuf[2], scsi_cmdbuf[4], scsi_cmdbuf[5]);
if(lun) {
bad_lun();
@@ -124,7 +124,7 @@ void nscsi_cdrom_device::scsi_command()
}
case SC_START_STOP_UNIT:
- logerror("%s: command START STOP UNIT\n", tag().c_str());
+ logerror("%s: command START STOP UNIT\n", tag());
scsi_status_complete(SS_GOOD);
break;
@@ -134,7 +134,7 @@ void nscsi_cdrom_device::scsi_command()
break;
}
- logerror("%s: command READ CAPACITY\n", tag().c_str());
+ logerror("%s: command READ CAPACITY\n", tag());
UINT32 temp = cdrom_get_track_start(cdrom, 0xaa);
temp--; // return the last used block on the disc
@@ -163,7 +163,7 @@ void nscsi_cdrom_device::scsi_command()
blocks = (scsi_cmdbuf[7] << 8) | scsi_cmdbuf[8];
logerror("%s: command READ EXTENDED start=%08x blocks=%04x\n",
- tag().c_str(), lba, blocks);
+ tag(), lba, blocks);
scsi_data_in(2, blocks*bytes_per_sector);
scsi_status_complete(SS_GOOD);
@@ -172,7 +172,7 @@ void nscsi_cdrom_device::scsi_command()
case SC_MODE_SENSE_6: {
int lun = get_lun(scsi_cmdbuf[1] >> 5);
logerror("%s: command MODE SENSE 6 lun=%d page=%02x alloc=%02x link=%02x\n",
- tag().c_str(),
+ tag(),
lun, scsi_cmdbuf[2] & 0x3f, scsi_cmdbuf[4], scsi_cmdbuf[5]);
if(lun) {
bad_lun();
@@ -229,7 +229,7 @@ void nscsi_cdrom_device::scsi_command()
break;
default:
- logerror("%s: mode sense page %02x unhandled\n", tag().c_str(), page);
+ logerror("%s: mode sense page %02x unhandled\n", tag(), page);
break;
}
}
diff --git a/src/devices/machine/nscsi_cd.h b/src/devices/machine/nscsi_cd.h
index b516d1e0987..a251d1a3e98 100644
--- a/src/devices/machine/nscsi_cd.h
+++ b/src/devices/machine/nscsi_cd.h
@@ -9,7 +9,7 @@
class nscsi_cdrom_device : public nscsi_full_device
{
public:
- nscsi_cdrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nscsi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
protected:
diff --git a/src/devices/machine/nscsi_hd.cpp b/src/devices/machine/nscsi_hd.cpp
index 92a77fc939f..d7d3ccb5e5b 100644
--- a/src/devices/machine/nscsi_hd.cpp
+++ b/src/devices/machine/nscsi_hd.cpp
@@ -5,12 +5,12 @@
const device_type NSCSI_HARDDISK = &device_creator<nscsi_harddisk_device>;
-nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
nscsi_full_device(mconfig, NSCSI_HARDDISK, "SCSI HARDDISK", tag, owner, clock, "scsi_harddisk", __FILE__), harddisk(nullptr), lba(0), cur_lba(0), blocks(0), bytes_per_sector(0)
{
}
-nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
nscsi_full_device(mconfig, type, name, tag, owner, clock, shortname, source), harddisk(nullptr), lba(0), cur_lba(0), blocks(0), bytes_per_sector(0)
{
}
@@ -58,7 +58,7 @@ UINT8 nscsi_harddisk_device::scsi_get_data(int id, int pos)
if(clba != cur_lba) {
cur_lba = clba;
if(!hard_disk_read(harddisk, cur_lba, block)) {
- logerror("%s: HD READ ERROR !\n", tag().c_str());
+ logerror("%s: HD READ ERROR !\n", tag());
memset(block, 0, sizeof(block));
}
}
@@ -77,7 +77,7 @@ void nscsi_harddisk_device::scsi_put_data(int id, int pos, UINT8 data)
int clba = lba + pos / bytes_per_sector;
if(offset == bytes_per_sector-1) {
if(!hard_disk_write(harddisk, clba, block))
- logerror("%s: HD WRITE ERROR !\n", tag().c_str());
+ logerror("%s: HD WRITE ERROR !\n", tag());
}
}
@@ -97,7 +97,7 @@ void nscsi_harddisk_device::scsi_command()
switch(scsi_cmdbuf[0]) {
case SC_TEST_UNIT_READY:
- logerror("%s: command TEST UNIT READY\n", tag().c_str());
+ logerror("%s: command TEST UNIT READY\n", tag());
scsi_status_complete(SS_GOOD);
break;
@@ -108,7 +108,7 @@ void nscsi_harddisk_device::scsi_command()
blocks = 256;
logerror("%s: command READ start=%08x blocks=%04x\n",
- tag().c_str(), lba, blocks);
+ tag(), lba, blocks);
scsi_data_in(2, blocks*bytes_per_sector);
scsi_status_complete(SS_GOOD);
@@ -121,7 +121,7 @@ void nscsi_harddisk_device::scsi_command()
blocks = 256;
logerror("%s: command WRITE start=%08x blocks=%04x\n",
- tag().c_str(), lba, blocks);
+ tag(), lba, blocks);
scsi_data_out(2, blocks*bytes_per_sector);
scsi_status_complete(SS_GOOD);
@@ -130,7 +130,7 @@ void nscsi_harddisk_device::scsi_command()
case SC_INQUIRY: {
int lun = get_lun(scsi_cmdbuf[1] >> 5);
logerror("%s: command INQUIRY lun=%d EVPD=%d page=%d alloc=%02x link=%02x\n",
- tag().c_str(),
+ tag(),
lun, scsi_cmdbuf[1] & 1, scsi_cmdbuf[2], scsi_cmdbuf[4], scsi_cmdbuf[5]);
if(lun) {
bad_lun();
@@ -180,7 +180,7 @@ void nscsi_harddisk_device::scsi_command()
case SC_MODE_SENSE_6: {
int lun = get_lun(scsi_cmdbuf[1] >> 5);
logerror("%s: command MODE SENSE 6 lun=%d page=%02x alloc=%02x link=%02x\n",
- tag().c_str(),
+ tag(),
lun, scsi_cmdbuf[2] & 0x3f, scsi_cmdbuf[4], scsi_cmdbuf[5]);
if(lun) {
bad_lun();
@@ -301,7 +301,7 @@ void nscsi_harddisk_device::scsi_command()
}
default:
- logerror("%s: mode sense page %02x unhandled\n", tag().c_str(), page);
+ logerror("%s: mode sense page %02x unhandled\n", tag(), page);
break;
}
}
@@ -315,12 +315,12 @@ void nscsi_harddisk_device::scsi_command()
}
case SC_START_STOP_UNIT:
- logerror("%s: command START STOP UNIT\n", tag().c_str());
+ logerror("%s: command START STOP UNIT\n", tag());
scsi_status_complete(SS_GOOD);
break;
case SC_READ_CAPACITY: {
- logerror("%s: command READ CAPACITY\n", tag().c_str());
+ logerror("%s: command READ CAPACITY\n", tag());
hard_disk_info *info = hard_disk_get_info(harddisk);
UINT32 size = info->cylinders * info->heads * info->sectors - 1;
@@ -344,7 +344,7 @@ void nscsi_harddisk_device::scsi_command()
blocks = (scsi_cmdbuf[7] << 8) | scsi_cmdbuf[8];
logerror("%s: command READ EXTENDED start=%08x blocks=%04x\n",
- tag().c_str(), lba, blocks);
+ tag(), lba, blocks);
scsi_data_in(2, blocks*bytes_per_sector);
scsi_status_complete(SS_GOOD);
@@ -355,14 +355,14 @@ void nscsi_harddisk_device::scsi_command()
blocks = (scsi_cmdbuf[7] << 8) | scsi_cmdbuf[8];
logerror("%s: command WRITE EXTENDED start=%08x blocks=%04x\n",
- tag().c_str(), lba, blocks);
+ tag(), lba, blocks);
scsi_data_out(2, blocks*bytes_per_sector);
scsi_status_complete(SS_GOOD);
break;
default:
- logerror("%s: command %02x ***UNKNOWN***\n", tag().c_str(), scsi_cmdbuf[0]);
+ logerror("%s: command %02x ***UNKNOWN***\n", tag(), scsi_cmdbuf[0]);
nscsi_full_device::scsi_command();
break;
}
diff --git a/src/devices/machine/nscsi_hd.h b/src/devices/machine/nscsi_hd.h
index ef83629c456..2206b3e3a73 100644
--- a/src/devices/machine/nscsi_hd.h
+++ b/src/devices/machine/nscsi_hd.h
@@ -9,8 +9,8 @@
class nscsi_harddisk_device : public nscsi_full_device
{
public:
- nscsi_harddisk_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nscsi_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/machine/nscsi_s1410.cpp b/src/devices/machine/nscsi_s1410.cpp
index 84f5ff2ee83..b486b4994e9 100644
--- a/src/devices/machine/nscsi_s1410.cpp
+++ b/src/devices/machine/nscsi_s1410.cpp
@@ -4,7 +4,7 @@
const device_type NSCSI_S1410 = &device_creator<nscsi_s1410_device>;
-nscsi_s1410_device::nscsi_s1410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+nscsi_s1410_device::nscsi_s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
nscsi_harddisk_device(mconfig, NSCSI_S1410, "S1410", tag, owner, clock, "scsi_s1410", __FILE__)
{
}
@@ -64,7 +64,7 @@ void nscsi_s1410_device::scsi_command()
memset(&data[0], 0xc6, track_length);
if(!hard_disk_write(harddisk, lba, &data[0])) {
- logerror("%s: HD WRITE ERROR !\n", tag().c_str());
+ logerror("%s: HD WRITE ERROR !\n", tag());
scsi_status_complete(SS_FORMAT_ERROR);
} else {
scsi_status_complete(SS_GOOD);
@@ -115,7 +115,7 @@ void nscsi_s1410_device::scsi_command()
break;
default:
- logerror("%s: command %02x ***UNKNOWN***\n", tag().c_str(), scsi_cmdbuf[0]);
+ logerror("%s: command %02x ***UNKNOWN***\n", tag(), scsi_cmdbuf[0]);
break;
}
}
diff --git a/src/devices/machine/nscsi_s1410.h b/src/devices/machine/nscsi_s1410.h
index e4d135d9467..446cf18568d 100644
--- a/src/devices/machine/nscsi_s1410.h
+++ b/src/devices/machine/nscsi_s1410.h
@@ -9,7 +9,7 @@
class nscsi_s1410_device : public nscsi_harddisk_device
{
public:
- nscsi_s1410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nscsi_s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// SCSI status returns
diff --git a/src/devices/machine/nvram.cpp b/src/devices/machine/nvram.cpp
index 44a809cdb68..d1e99ceb98b 100644
--- a/src/devices/machine/nvram.cpp
+++ b/src/devices/machine/nvram.cpp
@@ -22,7 +22,7 @@ const device_type NVRAM = &device_creator<nvram_device>;
// nvram_device - constructor
//-------------------------------------------------
-nvram_device::nvram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+nvram_device::nvram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NVRAM, "NVRAM", tag, owner, clock, "nvram", __FILE__),
device_nvram_interface(mconfig, *this),
m_default_value(DEFAULT_ALL_1),
@@ -158,12 +158,12 @@ void nvram_device::determine_final_base()
{
memory_share *share = owner()->memshare(tag());
if (share == nullptr)
- throw emu_fatalerror("NVRAM device '%s' has no corresponding AM_SHARE region", tag().c_str());
+ throw emu_fatalerror("NVRAM device '%s' has no corresponding AM_SHARE region", tag());
m_base = share->ptr();
m_length = share->bytes();
}
// if we are region-backed for the default, find it now and make sure it's the right size
if (m_region != nullptr && m_region->bytes() != m_length)
- throw emu_fatalerror("NVRAM device '%s' has a default region, but it should be 0x%" SIZETFMT "X bytes", tag().c_str(), m_length);
+ throw emu_fatalerror("NVRAM device '%s' has a default region, but it should be 0x%" SIZETFMT "X bytes", tag(), m_length);
}
diff --git a/src/devices/machine/nvram.h b/src/devices/machine/nvram.h
index 49b24e5ebee..ac6b62e7bca 100644
--- a/src/devices/machine/nvram.h
+++ b/src/devices/machine/nvram.h
@@ -77,7 +77,7 @@ public:
};
// construction/destruction
- nvram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ nvram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// inline configuration helpers
static void static_set_default_value(device_t &device, default_value value);
diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp
index 03a35a4e290..d72db5a0c45 100644
--- a/src/devices/machine/pc_fdc.cpp
+++ b/src/devices/machine/pc_fdc.cpp
@@ -45,7 +45,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, pc_fdc_at_device)
AM_RANGE(0x7, 0x7) AM_READWRITE(dir_r, ccr_w)
ADDRESS_MAP_END
-pc_fdc_family_device::pc_fdc_family_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+pc_fdc_family_device::pc_fdc_family_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
pc_fdc_interface(mconfig, type, name, tag, owner, clock, shortname, source), fdc(*this, "upd765"),
intrq_cb(*this),
drq_cb(*this)
@@ -103,7 +103,7 @@ void pc_fdc_family_device::device_reset()
WRITE8_MEMBER( pc_fdc_family_device::dor_w )
{
- logerror("%s: dor = %02x\n", tag().c_str(), data);
+ logerror("%s: dor = %02x\n", tag(), data);
UINT8 pdor = dor;
dor = data;
@@ -136,7 +136,7 @@ READ8_MEMBER( pc_fdc_family_device::dir_r )
WRITE8_MEMBER( pc_fdc_family_device::ccr_w )
{
static const int rates[4] = { 500000, 300000, 250000, 1000000 };
- logerror("%s: ccr = %02x\n", tag().c_str(), data);
+ logerror("%s: ccr = %02x\n", tag(), data);
fdc->set_rate(rates[data & 3]);
}
@@ -170,7 +170,7 @@ void pc_fdc_family_device::check_irq()
bool pirq = irq;
irq = fdc_irq && (dor & 4) && (dor & 8);
if(irq != pirq && !intrq_cb.isnull()) {
- logerror("%s: pc_irq = %d\n", tag().c_str(), irq);
+ logerror("%s: pc_irq = %d\n", tag(), irq);
intrq_cb(irq);
}
}
@@ -183,10 +183,10 @@ void pc_fdc_family_device::check_drq()
drq_cb(drq);
}
-pc_fdc_xt_device::pc_fdc_xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : pc_fdc_family_device(mconfig, PC_FDC_XT, "PC FDC XT", tag, owner, clock, "pc_fdc_xt", __FILE__)
+pc_fdc_xt_device::pc_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pc_fdc_family_device(mconfig, PC_FDC_XT, "PC FDC XT", tag, owner, clock, "pc_fdc_xt", __FILE__)
{
}
-pc_fdc_at_device::pc_fdc_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : pc_fdc_family_device(mconfig, PC_FDC_AT, "PC FDC AT", tag, owner, clock, "pc_fdc_at", __FILE__)
+pc_fdc_at_device::pc_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pc_fdc_family_device(mconfig, PC_FDC_AT, "PC FDC AT", tag, owner, clock, "pc_fdc_at", __FILE__)
{
}
diff --git a/src/devices/machine/pc_fdc.h b/src/devices/machine/pc_fdc.h
index b6dbb4f6c5c..b94fab2a2ca 100644
--- a/src/devices/machine/pc_fdc.h
+++ b/src/devices/machine/pc_fdc.h
@@ -26,7 +26,7 @@
class pc_fdc_family_device : public pc_fdc_interface {
public:
- pc_fdc_family_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pc_fdc_family_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<pc_fdc_family_device &>(device).intrq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<pc_fdc_family_device &>(device).drq_cb.set_callback(object); }
@@ -64,7 +64,7 @@ protected:
class pc_fdc_xt_device : public pc_fdc_family_device {
public:
- pc_fdc_xt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pc_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
WRITE8_MEMBER(dor_fifo_w);
@@ -72,7 +72,7 @@ public:
class pc_fdc_at_device : public pc_fdc_family_device {
public:
- pc_fdc_at_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pc_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
diff --git a/src/devices/machine/pc_lpt.cpp b/src/devices/machine/pc_lpt.cpp
index e87ceade046..f483c7bb336 100644
--- a/src/devices/machine/pc_lpt.cpp
+++ b/src/devices/machine/pc_lpt.cpp
@@ -12,7 +12,7 @@
const device_type PC_LPT = &device_creator<pc_lpt_device>;
-pc_lpt_device::pc_lpt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+pc_lpt_device::pc_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PC_LPT, "PC-LPT", tag, owner, clock, "pc_lpt", __FILE__),
m_irq(1),
m_data(0xff), m_control(0),
@@ -119,7 +119,7 @@ READ8_MEMBER( pc_lpt_device::read )
}
/* if we reach this its an error */
- logerror("PC-LPT %s: Read from invalid offset %x\n", tag().c_str(), offset);
+ logerror("PC-LPT %s: Read from invalid offset %x\n", tag(), offset);
return 0xff;
}
diff --git a/src/devices/machine/pc_lpt.h b/src/devices/machine/pc_lpt.h
index a2b150d67fa..ca2a71f6524 100644
--- a/src/devices/machine/pc_lpt.h
+++ b/src/devices/machine/pc_lpt.h
@@ -21,7 +21,7 @@
class pc_lpt_device : public device_t
{
public:
- pc_lpt_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pc_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<pc_lpt_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/devices/machine/pccard.cpp b/src/devices/machine/pccard.cpp
index c15ff32a6f9..3284c2c5d45 100644
--- a/src/devices/machine/pccard.cpp
+++ b/src/devices/machine/pccard.cpp
@@ -22,7 +22,7 @@ WRITE16_MEMBER( pccard_interface::write_reg )
const device_type PCCARD_SLOT = &device_creator<pccard_slot_device>;
-pccard_slot_device::pccard_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+pccard_slot_device::pccard_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PCCARD_SLOT, "PCCARD SLOT", tag, owner, clock, "pccard", __FILE__),
device_slot_interface(mconfig, *this),
m_pccard(nullptr)
diff --git a/src/devices/machine/pccard.h b/src/devices/machine/pccard.h
index ea24bb063ef..2068406d4b2 100644
--- a/src/devices/machine/pccard.h
+++ b/src/devices/machine/pccard.h
@@ -24,7 +24,7 @@ class pccard_slot_device : public device_t,
public device_slot_interface
{
public:
- pccard_slot_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pccard_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ_LINE_MEMBER(read_line_inserted);
DECLARE_READ16_MEMBER(read_memory);
diff --git a/src/devices/machine/pcf8593.cpp b/src/devices/machine/pcf8593.cpp
index 004287cb16b..48e002fdf2d 100644
--- a/src/devices/machine/pcf8593.cpp
+++ b/src/devices/machine/pcf8593.cpp
@@ -46,7 +46,7 @@ const device_type PCF8593 = &device_creator<pcf8593_device>;
// pcf8593_device - constructor
//-------------------------------------------------
-pcf8593_device::pcf8593_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+pcf8593_device::pcf8593_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PCF8593, "PCF8593 RTC", tag, owner, clock, "pcf8593", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this)
diff --git a/src/devices/machine/pcf8593.h b/src/devices/machine/pcf8593.h
index a52dfdd0c8c..63b3befe6b9 100644
--- a/src/devices/machine/pcf8593.h
+++ b/src/devices/machine/pcf8593.h
@@ -32,7 +32,7 @@ class pcf8593_device : public device_t,
public device_nvram_interface
{
public:
- pcf8593_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pcf8593_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER(scl_w);
DECLARE_WRITE_LINE_MEMBER(sda_w);
diff --git a/src/devices/machine/pci-apic.cpp b/src/devices/machine/pci-apic.cpp
index ee5674fc58f..ce32692c7e6 100644
--- a/src/devices/machine/pci-apic.cpp
+++ b/src/devices/machine/pci-apic.cpp
@@ -4,7 +4,7 @@
const device_type APIC = &device_creator<apic_device>;
-apic_device::apic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+apic_device::apic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, APIC, "I/O Advanced Programmable Interrupt Controller", tag, owner, clock, "apic", __FILE__)
{
}
diff --git a/src/devices/machine/pci-apic.h b/src/devices/machine/pci-apic.h
index b39a853ff71..4da0dc00bd3 100644
--- a/src/devices/machine/pci-apic.h
+++ b/src/devices/machine/pci-apic.h
@@ -10,7 +10,7 @@
class apic_device : public pci_device {
public:
- apic_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ apic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/pci-sata.cpp b/src/devices/machine/pci-sata.cpp
index 0785cf77730..65cc090848b 100644
--- a/src/devices/machine/pci-sata.cpp
+++ b/src/devices/machine/pci-sata.cpp
@@ -4,7 +4,7 @@
const device_type SATA = &device_creator<sata_device>;
-sata_device::sata_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sata_device::sata_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, SATA, "SATA AHCI interface", tag, owner, clock, "sata", __FILE__)
{
}
diff --git a/src/devices/machine/pci-sata.h b/src/devices/machine/pci-sata.h
index fc696e9b6ab..7075b49bb58 100644
--- a/src/devices/machine/pci-sata.h
+++ b/src/devices/machine/pci-sata.h
@@ -10,7 +10,7 @@
class sata_device : public pci_device {
public:
- sata_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ sata_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/pci-smbus.cpp b/src/devices/machine/pci-smbus.cpp
index 89953d11587..13d4d491570 100644
--- a/src/devices/machine/pci-smbus.cpp
+++ b/src/devices/machine/pci-smbus.cpp
@@ -26,7 +26,7 @@ DEVICE_ADDRESS_MAP_START(map, 32, smbus_device)
AM_RANGE(0x14, 0x17) AM_READ8 (notify_dhigh_r, 0xff000000)
ADDRESS_MAP_END
-smbus_device::smbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+smbus_device::smbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, SMBUS, "SMBUS interface", tag, owner, clock, "smbus", __FILE__)
{
}
@@ -70,7 +70,7 @@ READ8_MEMBER (smbus_device::hst_sts_r)
WRITE8_MEMBER (smbus_device::hst_sts_w)
{
hst_sts &= ~data;
- logerror("%s: hst_sts = %02x\n", tag().c_str(), hst_sts);
+ logerror("%s: hst_sts = %02x\n", tag(), hst_sts);
}
READ8_MEMBER (smbus_device::hst_cnt_r)
@@ -81,7 +81,7 @@ READ8_MEMBER (smbus_device::hst_cnt_r)
WRITE8_MEMBER (smbus_device::hst_cnt_w)
{
hst_cnt = data;
- logerror("%s: hst_cnt = %02x\n", tag().c_str(), hst_cnt);
+ logerror("%s: hst_cnt = %02x\n", tag(), hst_cnt);
if(xmit_slva != 0xa1)
hst_sts = 4;
@@ -118,7 +118,7 @@ READ8_MEMBER (smbus_device::hst_cmd_r)
WRITE8_MEMBER (smbus_device::hst_cmd_w)
{
hst_cmd = data;
- logerror("%s: hst_cmd = %02x\n", tag().c_str(), hst_cmd);
+ logerror("%s: hst_cmd = %02x\n", tag(), hst_cmd);
}
READ8_MEMBER (smbus_device::xmit_slva_r)
@@ -129,7 +129,7 @@ READ8_MEMBER (smbus_device::xmit_slva_r)
WRITE8_MEMBER (smbus_device::xmit_slva_w)
{
xmit_slva = data;
- logerror("%s: xmit_slva = %02x\n", tag().c_str(), xmit_slva);
+ logerror("%s: xmit_slva = %02x\n", tag(), xmit_slva);
}
READ8_MEMBER (smbus_device::hst_d0_r)
@@ -140,7 +140,7 @@ READ8_MEMBER (smbus_device::hst_d0_r)
WRITE8_MEMBER (smbus_device::hst_d0_w)
{
hst_d0 = data;
- logerror("%s: hst_d0 = %02x\n", tag().c_str(), hst_d0);
+ logerror("%s: hst_d0 = %02x\n", tag(), hst_d0);
}
READ8_MEMBER (smbus_device::hst_d1_r)
@@ -151,7 +151,7 @@ READ8_MEMBER (smbus_device::hst_d1_r)
WRITE8_MEMBER (smbus_device::hst_d1_w)
{
hst_d1 = data;
- logerror("%s: hst_d1 = %02x\n", tag().c_str(), hst_d1);
+ logerror("%s: hst_d1 = %02x\n", tag(), hst_d1);
}
READ8_MEMBER (smbus_device::host_block_db_r)
@@ -162,7 +162,7 @@ READ8_MEMBER (smbus_device::host_block_db_r)
WRITE8_MEMBER (smbus_device::host_block_db_w)
{
host_block_db = data;
- logerror("%s: host_block_db = %02x\n", tag().c_str(), host_block_db);
+ logerror("%s: host_block_db = %02x\n", tag(), host_block_db);
}
READ8_MEMBER (smbus_device::pec_r)
@@ -173,7 +173,7 @@ READ8_MEMBER (smbus_device::pec_r)
WRITE8_MEMBER (smbus_device::pec_w)
{
pec = data;
- logerror("%s: pec = %02x\n", tag().c_str(), pec);
+ logerror("%s: pec = %02x\n", tag(), pec);
}
READ8_MEMBER (smbus_device::rcv_slva_r)
@@ -184,7 +184,7 @@ READ8_MEMBER (smbus_device::rcv_slva_r)
WRITE8_MEMBER (smbus_device::rcv_slva_w)
{
rcv_slva = data;
- logerror("%s: rcv_slva = %02x\n", tag().c_str(), rcv_slva);
+ logerror("%s: rcv_slva = %02x\n", tag(), rcv_slva);
}
READ16_MEMBER (smbus_device::slv_data_r)
@@ -195,7 +195,7 @@ READ16_MEMBER (smbus_device::slv_data_r)
WRITE16_MEMBER(smbus_device::slv_data_w)
{
slv_data = data;
- logerror("%s: slv_data = %02x\n", tag().c_str(), slv_data);
+ logerror("%s: slv_data = %02x\n", tag(), slv_data);
}
READ8_MEMBER (smbus_device::aux_sts_r)
@@ -206,7 +206,7 @@ READ8_MEMBER (smbus_device::aux_sts_r)
WRITE8_MEMBER (smbus_device::aux_sts_w)
{
aux_sts = data;
- logerror("%s: aux_sts = %02x\n", tag().c_str(), aux_sts);
+ logerror("%s: aux_sts = %02x\n", tag(), aux_sts);
}
READ8_MEMBER (smbus_device::aux_ctl_r)
@@ -217,7 +217,7 @@ READ8_MEMBER (smbus_device::aux_ctl_r)
WRITE8_MEMBER (smbus_device::aux_ctl_w)
{
aux_ctl = data;
- logerror("%s: aux_ctl = %02x\n", tag().c_str(), aux_ctl);
+ logerror("%s: aux_ctl = %02x\n", tag(), aux_ctl);
}
READ8_MEMBER (smbus_device::smlink_pin_ctl_r)
@@ -228,7 +228,7 @@ READ8_MEMBER (smbus_device::smlink_pin_ctl_r)
WRITE8_MEMBER (smbus_device::smlink_pin_ctl_w)
{
smlink_pin_ctl = data;
- logerror("%s: smlink_pin_ctl = %02x\n", tag().c_str(), smlink_pin_ctl);
+ logerror("%s: smlink_pin_ctl = %02x\n", tag(), smlink_pin_ctl);
}
READ8_MEMBER (smbus_device::smbus_pin_ctl_r)
@@ -239,7 +239,7 @@ READ8_MEMBER (smbus_device::smbus_pin_ctl_r)
WRITE8_MEMBER (smbus_device::smbus_pin_ctl_w)
{
smbus_pin_ctl = data;
- logerror("%s: smbus_pin_ctl = %02x\n", tag().c_str(), smbus_pin_ctl);
+ logerror("%s: smbus_pin_ctl = %02x\n", tag(), smbus_pin_ctl);
}
READ8_MEMBER (smbus_device::slv_sts_r)
@@ -250,7 +250,7 @@ READ8_MEMBER (smbus_device::slv_sts_r)
WRITE8_MEMBER (smbus_device::slv_sts_w)
{
slv_sts = data;
- logerror("%s: slv_sts = %02x\n", tag().c_str(), slv_sts);
+ logerror("%s: slv_sts = %02x\n", tag(), slv_sts);
}
READ8_MEMBER (smbus_device::slv_cmd_r)
@@ -261,7 +261,7 @@ READ8_MEMBER (smbus_device::slv_cmd_r)
WRITE8_MEMBER (smbus_device::slv_cmd_w)
{
slv_cmd = data;
- logerror("%s: slv_cmd = %02x\n", tag().c_str(), slv_cmd);
+ logerror("%s: slv_cmd = %02x\n", tag(), slv_cmd);
}
READ8_MEMBER (smbus_device::notify_daddr_r)
diff --git a/src/devices/machine/pci-smbus.h b/src/devices/machine/pci-smbus.h
index eb808e2c583..2ff96befc9b 100644
--- a/src/devices/machine/pci-smbus.h
+++ b/src/devices/machine/pci-smbus.h
@@ -10,7 +10,7 @@
class smbus_device : public pci_device {
public:
- smbus_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ smbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER (hst_sts_r);
DECLARE_WRITE8_MEMBER (hst_sts_w);
diff --git a/src/devices/machine/pci-usb.cpp b/src/devices/machine/pci-usb.cpp
index 68098c1ffcc..56789e12eb3 100644
--- a/src/devices/machine/pci-usb.cpp
+++ b/src/devices/machine/pci-usb.cpp
@@ -8,7 +8,7 @@ const device_type USB_EHCI = &device_creator<usb_ehci_device>;
DEVICE_ADDRESS_MAP_START(map, 32, usb_uhci_device)
ADDRESS_MAP_END
-usb_uhci_device::usb_uhci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+usb_uhci_device::usb_uhci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, USB_UHCI, "USB 1.1 UHCI interface", tag, owner, clock, "usb_uhci", __FILE__)
{
}
@@ -27,7 +27,7 @@ void usb_uhci_device::device_reset()
DEVICE_ADDRESS_MAP_START(map, 32, usb_ehci_device)
ADDRESS_MAP_END
-usb_ehci_device::usb_ehci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+usb_ehci_device::usb_ehci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, USB_EHCI, "USB 2.0 EHCI interface", tag, owner, clock, "usb_ehci", __FILE__)
{
}
diff --git a/src/devices/machine/pci-usb.h b/src/devices/machine/pci-usb.h
index bbbb7f14830..31541432efd 100644
--- a/src/devices/machine/pci-usb.h
+++ b/src/devices/machine/pci-usb.h
@@ -13,7 +13,7 @@
class usb_uhci_device : public pci_device {
public:
- usb_uhci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ usb_uhci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
@@ -25,7 +25,7 @@ private:
class usb_ehci_device : public pci_device {
public:
- usb_ehci_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ usb_ehci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/pci.cpp b/src/devices/machine/pci.cpp
index 0e54518250b..f41eaea2e20 100644
--- a/src/devices/machine/pci.cpp
+++ b/src/devices/machine/pci.cpp
@@ -58,7 +58,7 @@ DEVICE_ADDRESS_MAP_START(config_map, 32, pci_bridge_device)
AM_RANGE(0x3c, 0x3f) AM_READWRITE16(bridge_control_r, bridge_control_w, 0xffff0000)
ADDRESS_MAP_END
-pci_device::pci_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+pci_device::pci_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
main_id = 0xffffffff;
@@ -141,7 +141,7 @@ READ32_MEMBER(pci_device::address_base_r)
WRITE32_MEMBER(pci_device::address_base_w)
{
if(bank_reg_infos[offset].bank == -1) {
- logerror("%s: write to address base (%d, %08x) not linked to any bank\n", tag().c_str(), offset, data);
+ logerror("%s: write to address base (%d, %08x) not linked to any bank\n", tag(), offset, data);
return;
}
@@ -173,7 +173,7 @@ WRITE16_MEMBER(pci_device::command_w)
{
mem_mask &= command_mask;
COMBINE_DATA(&command);
- logerror("%s: command = %04x\n", tag().c_str(), command);
+ logerror("%s: command = %04x\n", tag(), command);
}
READ16_MEMBER(pci_device::status_r)
@@ -284,14 +284,14 @@ void pci_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end
}
space->install_device_delegate(start, end, *this, bi.map);
- logerror("%s: map %s at %0*x-%0*x\n", tag().c_str(), bi.map.name(), bi.flags & M_IO ? 4 : 8, UINT32(start), bi.flags & M_IO ? 4 : 8, UINT32(end));
+ logerror("%s: map %s at %0*x-%0*x\n", tag(), bi.map.name(), bi.flags & M_IO ? 4 : 8, UINT32(start), bi.flags & M_IO ? 4 : 8, UINT32(end));
}
map_extra(memory_window_start, memory_window_end, memory_offset, memory_space,
io_window_start, io_window_end, io_offset, io_space);
if(expansion_rom_base & 1) {
- logerror("%s: map expansion rom at %08x-%08x\n", tag().c_str(), expansion_rom_base & ~1, (expansion_rom_base & ~1) + expansion_rom_size - 1);
+ logerror("%s: map expansion rom at %08x-%08x\n", tag(), expansion_rom_base & ~1, (expansion_rom_base & ~1) + expansion_rom_size - 1);
UINT32 start = (expansion_rom_base & ~1) + memory_offset;
UINT32 end = start + expansion_rom_size - 1;
if(end > memory_window_end)
@@ -340,14 +340,14 @@ void pci_device::add_map(UINT64 size, int flags, address_map_delegate &map)
bank_reg_infos[breg].hi = 0;
}
- logerror("Device %s (%s) has 0x%" I64FMT "x bytes of %s named %s\n", tag().c_str(), name(), size, flags & M_IO ? "io" : "memory", bank_infos[bid].map.name());
+ logerror("Device %s (%s) has 0x%" I64FMT "x bytes of %s named %s\n", tag(), name(), size, flags & M_IO ? "io" : "memory", bank_infos[bid].map.name());
}
void pci_device::add_rom(const UINT8 *rom, UINT32 size)
{
expansion_rom = rom;
expansion_rom_size = size;
- logerror("Device %s (%s) has 0x%x bytes of expansion rom\n", tag().c_str(), name(), size);
+ logerror("Device %s (%s) has 0x%x bytes of expansion rom\n", tag(), name(), size);
}
void pci_device::add_rom_from_region()
@@ -373,7 +373,7 @@ void pci_device::set_map_flags(int id, int flags)
remap_cb();
}
-agp_device::agp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+agp_device::agp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: pci_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -390,14 +390,14 @@ void agp_device::device_reset()
-pci_bridge_device::pci_bridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+pci_bridge_device::pci_bridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, PCI_BRIDGE, "PCI-PCI Bridge", tag, owner, clock, "pci_bridge", __FILE__),
device_memory_interface(mconfig, *this),
configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20)
{
}
-pci_bridge_device::pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+pci_bridge_device::pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: pci_device(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20)
@@ -435,7 +435,7 @@ void pci_bridge_device::device_start()
elem = nullptr;
for(device_t *d = bus_root()->first_subdevice(); d != nullptr; d = d->next()) {
- const char *t = d->tag().c_str();
+ const char *t = d->tag();
int l = strlen(t);
if(l <= 4 || t[l-5] != ':' || t[l-2] != '.')
continue;
@@ -519,7 +519,7 @@ UINT32 pci_bridge_device::do_config_read(UINT8 bus, UINT8 device, UINT16 reg, UI
{
if(sub_devices[device]) {
UINT32 data = space(AS_PROGRAM).read_dword((device << 12) | reg, mem_mask);
- logerror("%s: config_read %02x:%02x.%x:%02x %08x @ %08x\n", tag().c_str(), bus, device >> 3, device & 7, reg, data, mem_mask);
+ logerror("%s: config_read %02x:%02x.%x:%02x %08x @ %08x\n", tag(), bus, device >> 3, device & 7, reg, data, mem_mask);
return data;
} else
return 0xffffffff;
@@ -548,7 +548,7 @@ void pci_bridge_device::do_config_write(UINT8 bus, UINT8 device, UINT16 reg, UIN
{
if(sub_devices[device]) {
space(AS_PROGRAM).write_dword((device << 12) | reg, data, mem_mask);
- logerror("%s: config_write %02x:%02x.%x:%02x %08x @ %08x\n", tag().c_str(), bus, device >> 3, device & 7, reg, data, mem_mask);
+ logerror("%s: config_write %02x:%02x.%x:%02x %08x @ %08x\n", tag(), bus, device >> 3, device & 7, reg, data, mem_mask);
}
}
@@ -569,60 +569,60 @@ void pci_bridge_device::config_write(UINT8 bus, UINT8 device, UINT16 reg, UINT32
READ32_MEMBER (pci_bridge_device::b_address_base_r)
{
- logerror("%s: b_address_base_r %d\n", tag().c_str(), offset);
+ logerror("%s: b_address_base_r %d\n", tag(), offset);
return 0xffffffff;
}
WRITE32_MEMBER(pci_bridge_device::b_address_base_w)
{
- logerror("%s: b_address_base_w %d, %08x\n", tag().c_str(), offset, data);
+ logerror("%s: b_address_base_w %d, %08x\n", tag(), offset, data);
}
READ8_MEMBER (pci_bridge_device::primary_bus_r)
{
- logerror("%s: primary_bus_r\n", tag().c_str());
+ logerror("%s: primary_bus_r\n", tag());
return primary_bus;
}
WRITE8_MEMBER (pci_bridge_device::primary_bus_w)
{
primary_bus = data;
- logerror("%s: primary_bus_w %02x\n", tag().c_str(), data);
+ logerror("%s: primary_bus_w %02x\n", tag(), data);
}
READ8_MEMBER (pci_bridge_device::secondary_bus_r)
{
- logerror("%s: secondary_bus_r\n", tag().c_str());
+ logerror("%s: secondary_bus_r\n", tag());
return secondary_bus;
}
WRITE8_MEMBER (pci_bridge_device::secondary_bus_w)
{
secondary_bus = data;
- logerror("%s: secondary_bus_w %02x\n", tag().c_str(), data);
+ logerror("%s: secondary_bus_w %02x\n", tag(), data);
}
READ8_MEMBER (pci_bridge_device::subordinate_bus_r)
{
- logerror("%s: subordinate_bus_r\n", tag().c_str());
+ logerror("%s: subordinate_bus_r\n", tag());
return subordinate_bus;
}
WRITE8_MEMBER (pci_bridge_device::subordinate_bus_w)
{
subordinate_bus = data;
- logerror("%s: subordinate_bus_w %02x\n", tag().c_str(), data);
+ logerror("%s: subordinate_bus_w %02x\n", tag(), data);
}
READ8_MEMBER (pci_bridge_device::secondary_latency_r)
{
- logerror("%s: secondary_latency_r\n", tag().c_str());
+ logerror("%s: secondary_latency_r\n", tag());
return 0xff;
}
WRITE8_MEMBER (pci_bridge_device::secondary_latency_w)
{
- logerror("%s: secondary_latency_w %02x\n", tag().c_str(), data);
+ logerror("%s: secondary_latency_w %02x\n", tag(), data);
}
READ8_MEMBER (pci_bridge_device::iobase_r)
@@ -633,7 +633,7 @@ READ8_MEMBER (pci_bridge_device::iobase_r)
WRITE8_MEMBER (pci_bridge_device::iobase_w)
{
iobase = data;
- logerror("%s: iobase_w %02x\n", tag().c_str(), data);
+ logerror("%s: iobase_w %02x\n", tag(), data);
}
READ8_MEMBER (pci_bridge_device::iolimit_r)
@@ -644,18 +644,18 @@ READ8_MEMBER (pci_bridge_device::iolimit_r)
WRITE8_MEMBER (pci_bridge_device::iolimit_w)
{
iolimit = data;
- logerror("%s: iolimit_w %02x\n", tag().c_str(), data);
+ logerror("%s: iolimit_w %02x\n", tag(), data);
}
READ16_MEMBER (pci_bridge_device::secondary_status_r)
{
- logerror("%s: secondary_status_r\n", tag().c_str());
+ logerror("%s: secondary_status_r\n", tag());
return 0xffff;
}
WRITE16_MEMBER(pci_bridge_device::secondary_status_w)
{
- logerror("%s: secondary_status_w %04x\n", tag().c_str(), data);
+ logerror("%s: secondary_status_w %04x\n", tag(), data);
}
READ16_MEMBER (pci_bridge_device::memory_base_r)
@@ -666,7 +666,7 @@ READ16_MEMBER (pci_bridge_device::memory_base_r)
WRITE16_MEMBER(pci_bridge_device::memory_base_w)
{
COMBINE_DATA(&memory_base);
- logerror("%s: memory_base_w %04x\n", tag().c_str(), memory_base);
+ logerror("%s: memory_base_w %04x\n", tag(), memory_base);
}
READ16_MEMBER (pci_bridge_device::memory_limit_r)
@@ -677,7 +677,7 @@ READ16_MEMBER (pci_bridge_device::memory_limit_r)
WRITE16_MEMBER(pci_bridge_device::memory_limit_w)
{
COMBINE_DATA(&memory_limit);
- logerror("%s: memory_limit_w %04x\n", tag().c_str(), memory_limit);
+ logerror("%s: memory_limit_w %04x\n", tag(), memory_limit);
}
READ16_MEMBER (pci_bridge_device::prefetch_base_r)
@@ -688,7 +688,7 @@ READ16_MEMBER (pci_bridge_device::prefetch_base_r)
WRITE16_MEMBER(pci_bridge_device::prefetch_base_w)
{
COMBINE_DATA(&prefetch_base);
- logerror("%s: prefetch_base_w %04x\n", tag().c_str(), prefetch_base);
+ logerror("%s: prefetch_base_w %04x\n", tag(), prefetch_base);
}
READ16_MEMBER (pci_bridge_device::prefetch_limit_r)
@@ -699,7 +699,7 @@ READ16_MEMBER (pci_bridge_device::prefetch_limit_r)
WRITE16_MEMBER(pci_bridge_device::prefetch_limit_w)
{
COMBINE_DATA(&prefetch_limit);
- logerror("%s: prefetch_limit_w %04x\n", tag().c_str(), prefetch_limit);
+ logerror("%s: prefetch_limit_w %04x\n", tag(), prefetch_limit);
}
READ32_MEMBER (pci_bridge_device::prefetch_baseu_r)
@@ -710,7 +710,7 @@ READ32_MEMBER (pci_bridge_device::prefetch_baseu_r)
WRITE32_MEMBER(pci_bridge_device::prefetch_baseu_w)
{
COMBINE_DATA(&prefetch_baseu);
- logerror("%s: prefetch_baseu_w %08x\n", tag().c_str(), prefetch_baseu);
+ logerror("%s: prefetch_baseu_w %08x\n", tag(), prefetch_baseu);
}
READ32_MEMBER (pci_bridge_device::prefetch_limitu_r)
@@ -721,7 +721,7 @@ READ32_MEMBER (pci_bridge_device::prefetch_limitu_r)
WRITE32_MEMBER(pci_bridge_device::prefetch_limitu_w)
{
COMBINE_DATA(&prefetch_limitu);
- logerror("%s: prefetch_limitu_w %08x\n", tag().c_str(), prefetch_limitu);
+ logerror("%s: prefetch_limitu_w %08x\n", tag(), prefetch_limitu);
}
READ16_MEMBER (pci_bridge_device::iobaseu_r)
@@ -732,7 +732,7 @@ READ16_MEMBER (pci_bridge_device::iobaseu_r)
WRITE16_MEMBER(pci_bridge_device::iobaseu_w)
{
COMBINE_DATA(&iobaseu);
- logerror("%s: iobaseu_w %04x\n", tag().c_str(), iobaseu);
+ logerror("%s: iobaseu_w %04x\n", tag(), iobaseu);
}
READ16_MEMBER (pci_bridge_device::iolimitu_r)
@@ -743,29 +743,29 @@ READ16_MEMBER (pci_bridge_device::iolimitu_r)
WRITE16_MEMBER(pci_bridge_device::iolimitu_w)
{
COMBINE_DATA(&iolimitu);
- logerror("%s: iolimitu_w %04x\n", tag().c_str(), iolimitu);
+ logerror("%s: iolimitu_w %04x\n", tag(), iolimitu);
}
READ8_MEMBER (pci_bridge_device::interrupt_line_r)
{
- logerror("%s: interrupt_line_r\n", tag().c_str());
+ logerror("%s: interrupt_line_r\n", tag());
return 0xff;
}
WRITE8_MEMBER (pci_bridge_device::interrupt_line_w)
{
- logerror("%s: interrupt_line_w %02x\n", tag().c_str(), data);
+ logerror("%s: interrupt_line_w %02x\n", tag(), data);
}
READ8_MEMBER (pci_bridge_device::interrupt_pin_r)
{
- logerror("%s: interrupt_pin_r\n", tag().c_str());
+ logerror("%s: interrupt_pin_r\n", tag());
return 0xff;
}
WRITE8_MEMBER (pci_bridge_device::interrupt_pin_w)
{
- logerror("%s: interrupt_pin_w %02x\n", tag().c_str(), data);
+ logerror("%s: interrupt_pin_w %02x\n", tag(), data);
}
READ16_MEMBER (pci_bridge_device::bridge_control_r)
@@ -776,11 +776,11 @@ READ16_MEMBER (pci_bridge_device::bridge_control_r)
WRITE16_MEMBER(pci_bridge_device::bridge_control_w)
{
COMBINE_DATA(&bridge_control);
- logerror("%s: bridge_control_w %04x\n", tag().c_str(), bridge_control);
+ logerror("%s: bridge_control_w %04x\n", tag(), bridge_control);
}
-agp_bridge_device::agp_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+agp_bridge_device::agp_bridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: pci_bridge_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -803,7 +803,7 @@ DEVICE_ADDRESS_MAP_START(io_configuration_access_map, 32, pci_host_device)
ADDRESS_MAP_END
-pci_host_device::pci_host_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+pci_host_device::pci_host_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: pci_bridge_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -883,7 +883,7 @@ void pci_host_device::root_config_write(UINT8 bus, UINT8 device, UINT16 reg, UIN
}
-pci_root_device::pci_root_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+pci_root_device::pci_root_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PCI_ROOT,"PCI virtual root", tag, owner, clock, "pci_root", __FILE__)
{
}
diff --git a/src/devices/machine/pci.h b/src/devices/machine/pci.h
index f0e663e85f9..a88f0a3b7fb 100644
--- a/src/devices/machine/pci.h
+++ b/src/devices/machine/pci.h
@@ -30,7 +30,7 @@ public:
mapper_cb remap_cb, remap_config_cb;
- pci_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pci_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
void set_ids(UINT32 main_id, UINT8 revision, UINT32 pclass, UINT32 subsystem_id);
void set_multifunction_device(bool enable);
@@ -137,7 +137,7 @@ protected:
class agp_device : public pci_device {
public:
- agp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ agp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
@@ -146,8 +146,8 @@ protected:
class pci_bridge_device : public pci_device, public device_memory_interface {
public:
- pci_bridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pci_bridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
virtual void set_remap_cb(mapper_cb _remap_cb) override;
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
@@ -226,7 +226,7 @@ private:
class agp_bridge_device : public pci_bridge_device {
public:
- agp_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ agp_bridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
@@ -237,7 +237,7 @@ class pci_host_device : public pci_bridge_device {
public:
DECLARE_ADDRESS_MAP(io_configuration_access_map, 32);
- pci_host_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pci_host_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
address_space *memory_space, *io_space;
@@ -265,7 +265,7 @@ protected:
class pci_root_device : public device_t {
public:
- pci_root_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pci_root_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/pci9050.cpp b/src/devices/machine/pci9050.cpp
index 4cc6d7e4380..6e74a19e284 100644
--- a/src/devices/machine/pci9050.cpp
+++ b/src/devices/machine/pci9050.cpp
@@ -40,7 +40,7 @@ ADDRESS_MAP_END
DEVICE_ADDRESS_MAP_START(empty, 32, pci9050_device)
ADDRESS_MAP_END
-pci9050_device::pci9050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+pci9050_device::pci9050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, PCI9050, "PLX PCI9050 PCI to Local Bus Bridge", tag, owner, clock, "pci9050", __FILE__)
{
for(int i=0; i<4; i++) {
diff --git a/src/devices/machine/pci9050.h b/src/devices/machine/pci9050.h
index 893d40eced5..adb3ac969e0 100644
--- a/src/devices/machine/pci9050.h
+++ b/src/devices/machine/pci9050.h
@@ -23,7 +23,7 @@ class pci9050_device :
public pci_device
{
public:
- pci9050_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pci9050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// PCI9050 I/O register space handlers
DECLARE_READ32_MEMBER( lasrr_r );
diff --git a/src/devices/machine/pckeybrd.cpp b/src/devices/machine/pckeybrd.cpp
index bff25f2d764..0650fc8cea3 100644
--- a/src/devices/machine/pckeybrd.cpp
+++ b/src/devices/machine/pckeybrd.cpp
@@ -277,7 +277,7 @@ const at_keyboard_device::extended_keyboard_code at_keyboard_device::m_extended_
const device_type PC_KEYB = &device_creator<pc_keyboard_device>;
const device_type AT_KEYB = &device_creator<at_keyboard_device>;
-pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PC_KEYB, "PC Keyboard", tag, owner, clock, "pc_keyb", __FILE__),
m_type(KEYBOARD_TYPE_PC),
m_ioport_0(*this, ":pc_keyboard_0"),
@@ -292,7 +292,7 @@ pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, std::strin
{
}
-pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_ioport_0(*this, ":pc_keyboard_0"),
m_ioport_1(*this, ":pc_keyboard_1"),
@@ -306,7 +306,7 @@ pc_keyboard_device::pc_keyboard_device(const machine_config &mconfig, device_typ
{
}
-at_keyboard_device::at_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+at_keyboard_device::at_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
pc_keyboard_device(mconfig, AT_KEYB, "AT Keyboard", tag, owner, clock, "at_keyb", __FILE__),
m_scan_code_set(1)
{
diff --git a/src/devices/machine/pckeybrd.h b/src/devices/machine/pckeybrd.h
index c5e4ebe2a86..69a133df2c6 100644
--- a/src/devices/machine/pckeybrd.h
+++ b/src/devices/machine/pckeybrd.h
@@ -19,8 +19,8 @@
class pc_keyboard_device : public device_t
{
public:
- pc_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- pc_keyboard_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE_LINE_MEMBER(enable);
@@ -83,7 +83,7 @@ private:
class at_keyboard_device : public pc_keyboard_device
{
public:
- at_keyboard_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ at_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/pdc.cpp b/src/devices/machine/pdc.cpp
index 2945a294d9c..4a882d12a04 100644
--- a/src/devices/machine/pdc.cpp
+++ b/src/devices/machine/pdc.cpp
@@ -306,7 +306,7 @@ ioport_constructor pdc_device::device_input_ports() const
// pdc_device - constructor
//-------------------------------------------------
-pdc_device::pdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+pdc_device::pdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDC, "ROLM PDC", tag, owner, clock, "pdc", __FILE__),
m_pdccpu(*this, Z80_TAG),
m_dma8237(*this, FDCDMA_TAG),
diff --git a/src/devices/machine/pdc.h b/src/devices/machine/pdc.h
index 8c4f5f46d87..c1f3a3cbf51 100644
--- a/src/devices/machine/pdc.h
+++ b/src/devices/machine/pdc.h
@@ -35,7 +35,7 @@ class pdc_device : public device_t
{
public:
/* Constructor and Destructor */
- pdc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
/* Optional information overrides */
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/machine/pic8259.cpp b/src/devices/machine/pic8259.cpp
index 2e2aff0904c..40fe6fd916c 100644
--- a/src/devices/machine/pic8259.cpp
+++ b/src/devices/machine/pic8259.cpp
@@ -34,7 +34,7 @@ void pic8259_device::device_timer(emu_timer &timer, device_timer_id id, int para
{
if (LOG_GENERAL)
{
- logerror("pic8259_timerproc() %s: PIC IRQ #%d still in service\n", tag().c_str(), irq);
+ logerror("pic8259_timerproc() %s: PIC IRQ #%d still in service\n", tag(), irq);
}
break;
}
@@ -44,7 +44,7 @@ void pic8259_device::device_timer(emu_timer &timer, device_timer_id id, int para
{
if (LOG_GENERAL)
{
- logerror("pic8259_timerproc() %s: PIC triggering IRQ #%d\n", tag().c_str(), irq);
+ logerror("pic8259_timerproc() %s: PIC triggering IRQ #%d\n", tag(), irq);
}
m_out_int_func(1);
return;
@@ -65,7 +65,7 @@ void pic8259_device::set_irq_line(int irq, int state)
{
/* setting IRQ line */
if (LOG_GENERAL)
- logerror("pic8259_set_irq_line() %s: PIC set IRQ line #%d\n", tag().c_str(), irq);
+ logerror("pic8259_set_irq_line() %s: PIC set IRQ line #%d\n", tag(), irq);
if(m_level_trig_mode || (!m_level_trig_mode && !(m_irq_lines & mask)))
{
@@ -78,7 +78,7 @@ void pic8259_device::set_irq_line(int irq, int state)
/* clearing IRQ line */
if (LOG_GENERAL)
{
- logerror("pic8259_device::set_irq_line() %s: PIC cleared IRQ line #%d\n", tag().c_str(), irq);
+ logerror("pic8259_device::set_irq_line() %s: PIC cleared IRQ line #%d\n", tag(), irq);
}
m_irq_lines &= ~mask;
@@ -99,7 +99,7 @@ UINT32 pic8259_device::acknowledge()
{
if (LOG_GENERAL)
{
- logerror("pic8259_acknowledge() %s: PIC acknowledge IRQ #%d\n", tag().c_str(), irq);
+ logerror("pic8259_acknowledge() %s: PIC acknowledge IRQ #%d\n", tag(), irq);
}
if (!m_level_trig_mode)
{
@@ -203,7 +203,7 @@ WRITE8_MEMBER( pic8259_device::write )
/* write ICW1 - this pretty much resets the chip */
if (LOG_ICW)
{
- logerror("pic8259_device::write() %s: ICW1; data=0x%02X\n", tag().c_str(), data);
+ logerror("pic8259_device::write() %s: ICW1; data=0x%02X\n", tag(), data);
}
m_imr = 0x00;
@@ -224,7 +224,7 @@ WRITE8_MEMBER( pic8259_device::write )
/* write OCW3 */
if (LOG_OCW)
{
- logerror("pic8259_device::write() %s: OCW3; data=0x%02X\n", tag().c_str(), data);
+ logerror("pic8259_device::write() %s: OCW3; data=0x%02X\n", tag(), data);
}
m_ocw3 = data;
@@ -237,7 +237,7 @@ WRITE8_MEMBER( pic8259_device::write )
/* write OCW2 */
if (LOG_OCW)
{
- logerror("pic8259_device::write() %s: OCW2; data=0x%02X\n", tag().c_str(), data);
+ logerror("pic8259_device::write() %s: OCW2; data=0x%02X\n", tag(), data);
}
switch (data & 0xe0)
@@ -302,7 +302,7 @@ WRITE8_MEMBER( pic8259_device::write )
/* write ICW2 */
if (LOG_ICW)
{
- logerror("pic8259_device::write() %s: ICW2; data=0x%02X\n", tag().c_str(), data);
+ logerror("pic8259_device::write() %s: ICW2; data=0x%02X\n", tag(), data);
}
m_base = data & 0xf8;
@@ -321,7 +321,7 @@ WRITE8_MEMBER( pic8259_device::write )
/* write ICW3 */
if (LOG_ICW)
{
- logerror("pic8259_device::write() %s: ICW3; data=0x%02X\n", tag().c_str(), data);
+ logerror("pic8259_device::write() %s: ICW3; data=0x%02X\n", tag(), data);
}
m_slave = data;
@@ -332,7 +332,7 @@ WRITE8_MEMBER( pic8259_device::write )
/* write ICW4 */
if (LOG_ICW)
{
- logerror("pic8259_device::write() %s: ICW4; data=0x%02X\n", tag().c_str(), data);
+ logerror("pic8259_device::write() %s: ICW4; data=0x%02X\n", tag(), data);
}
m_nested = (data & 0x10) ? 1 : 0;
@@ -427,7 +427,7 @@ void pic8259_device::device_reset()
const device_type PIC8259 = &device_creator<pic8259_device>;
-pic8259_device::pic8259_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+pic8259_device::pic8259_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PIC8259, "8259 PIC", tag, owner, clock, "pit8259", __FILE__)
, m_out_int_func(*this)
, m_sp_en_func(*this)
diff --git a/src/devices/machine/pic8259.h b/src/devices/machine/pic8259.h
index 1372f60b11d..d02c74bca4f 100644
--- a/src/devices/machine/pic8259.h
+++ b/src/devices/machine/pic8259.h
@@ -42,7 +42,7 @@
class pic8259_device : public device_t
{
public:
- pic8259_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pic8259_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &static_set_out_int_callback(device_t &device, _Object object) { return downcast<pic8259_device &>(device).m_out_int_func.set_callback(object); }
template<class _Object> static devcb_base &static_set_sp_en_callback(device_t &device, _Object object) { return downcast<pic8259_device &>(device).m_sp_en_func.set_callback(object); }
diff --git a/src/devices/machine/pit8253.cpp b/src/devices/machine/pit8253.cpp
index efad6443bdd..d0bf2bc5c84 100644
--- a/src/devices/machine/pit8253.cpp
+++ b/src/devices/machine/pit8253.cpp
@@ -46,7 +46,7 @@ enum
const device_type PIT8253 = &device_creator<pit8253_device>;
-pit8253_device::pit8253_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+pit8253_device::pit8253_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PIT8253, "8253 PIT", tag, owner, clock, "pit8253", __FILE__),
m_clk0(0),
m_clk1(0),
@@ -57,7 +57,7 @@ pit8253_device::pit8253_device(const machine_config &mconfig, std::string tag, d
{
}
-pit8253_device::pit8253_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+pit8253_device::pit8253_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_clk0(0),
m_clk1(0),
@@ -71,7 +71,7 @@ pit8253_device::pit8253_device(const machine_config &mconfig, device_type type,
const device_type PIT8254 = &device_creator<pit8254_device>;
-pit8254_device::pit8254_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+pit8254_device::pit8254_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pit8253_device(mconfig, PIT8254, "8254 PIT", tag, owner, clock, "pit8254", __FILE__)
{
}
diff --git a/src/devices/machine/pit8253.h b/src/devices/machine/pit8253.h
index 3f6707e667f..e31ce8a3d19 100644
--- a/src/devices/machine/pit8253.h
+++ b/src/devices/machine/pit8253.h
@@ -54,8 +54,8 @@
class pit8253_device : public device_t
{
public:
- pit8253_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- pit8253_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ pit8253_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pit8253_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~pit8253_device() {}
// static configuration helpers
@@ -161,7 +161,7 @@ extern const device_type PIT8253;
class pit8254_device : public pit8253_device
{
public:
- pit8254_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pit8254_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual void readback_command(UINT8 data) override;
diff --git a/src/devices/machine/pla.cpp b/src/devices/machine/pla.cpp
index 8ecb0c6ba96..f96a2bd8f60 100644
--- a/src/devices/machine/pla.cpp
+++ b/src/devices/machine/pla.cpp
@@ -17,7 +17,7 @@ const device_type PLA = &device_creator<pla_device>;
// pla_device - constructor
//-------------------------------------------------
-pla_device::pla_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+pla_device::pla_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, PLA, "PLA", tag, owner, clock, "pla", __FILE__),
m_format(PLA_FMT_JEDBIN),
m_inputs(0),
@@ -90,7 +90,7 @@ void pla_device::parse_fusemap()
m_term[p].or_mask = 0;
}
- logerror("%s PLA parse error %d!\n", tag().c_str(), result);
+ logerror("%s PLA parse error %d!\n", tag(), result);
return;
}
diff --git a/src/devices/machine/pla.h b/src/devices/machine/pla.h
index 97dd1604dcd..9f14a155ac5 100644
--- a/src/devices/machine/pla.h
+++ b/src/devices/machine/pla.h
@@ -88,7 +88,7 @@ class pla_device : public device_t
{
public:
// construction/destruction
- pla_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pla_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void set_num_inputs(device_t &device, UINT32 i) { downcast<pla_device &>(device).m_inputs = i; }
diff --git a/src/devices/machine/r10696.cpp b/src/devices/machine/r10696.cpp
index 6367b685858..819d31084e9 100644
--- a/src/devices/machine/r10696.cpp
+++ b/src/devices/machine/r10696.cpp
@@ -47,7 +47,7 @@
const device_type R10696 = &device_creator<r10696_device>;
-r10696_device::r10696_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+r10696_device::r10696_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, R10696, "Rockwell 10696", tag, owner, clock, "r10696", __FILE__),
m_io_a(0), m_io_b(0), m_io_c(0),
m_iord(*this), m_iowr(*this)
diff --git a/src/devices/machine/r10696.h b/src/devices/machine/r10696.h
index 6a7cd728adf..b3e821a9ed9 100644
--- a/src/devices/machine/r10696.h
+++ b/src/devices/machine/r10696.h
@@ -32,7 +32,7 @@
class r10696_device : public device_t
{
public:
- r10696_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ r10696_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~r10696_device() {}
DECLARE_READ8_MEMBER ( io_r );
diff --git a/src/devices/machine/r10788.cpp b/src/devices/machine/r10788.cpp
index e129d592f83..f6e9d65ecbf 100644
--- a/src/devices/machine/r10788.cpp
+++ b/src/devices/machine/r10788.cpp
@@ -54,7 +54,7 @@
const device_type R10788 = &device_creator<r10788_device>;
-r10788_device::r10788_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+r10788_device::r10788_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, R10788, "Rockwell 10788", tag, owner, clock, "r10788", __FILE__),
m_ktr(0), m_kts(0), m_kla(0), m_klb(0), m_mask_a(15), m_mask_b(15), m_ker(0),
m_io_counter(0), m_scan_counter(0),
diff --git a/src/devices/machine/r10788.h b/src/devices/machine/r10788.h
index 1e165afaa47..d7428074abc 100644
--- a/src/devices/machine/r10788.h
+++ b/src/devices/machine/r10788.h
@@ -30,7 +30,7 @@
class r10788_device : public device_t
{
public:
- r10788_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ r10788_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~r10788_device() {}
enum {
diff --git a/src/devices/machine/ra17xx.cpp b/src/devices/machine/ra17xx.cpp
index e83a41723fb..c1252181c7d 100644
--- a/src/devices/machine/ra17xx.cpp
+++ b/src/devices/machine/ra17xx.cpp
@@ -54,7 +54,7 @@
const device_type RA17XX = &device_creator<ra17xx_device>;
-ra17xx_device::ra17xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ra17xx_device::ra17xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RA17XX, "Rockwell A17XX", tag, owner, clock, "ra17xx", __FILE__),
m_enable(false),
m_iord(*this),
diff --git a/src/devices/machine/ra17xx.h b/src/devices/machine/ra17xx.h
index 4afa6cf0971..0bc1fc991e4 100644
--- a/src/devices/machine/ra17xx.h
+++ b/src/devices/machine/ra17xx.h
@@ -32,7 +32,7 @@
class ra17xx_device : public device_t
{
public:
- ra17xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ra17xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~ra17xx_device() {}
DECLARE_READ8_MEMBER ( io_r );
diff --git a/src/devices/machine/ram.cpp b/src/devices/machine/ram.cpp
index 997d2ed68a2..92728b55303 100644
--- a/src/devices/machine/ram.cpp
+++ b/src/devices/machine/ram.cpp
@@ -29,7 +29,7 @@ const device_type RAM = &device_creator<ram_device>;
// ram_device - constructor
//-------------------------------------------------
-ram_device::ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ram_device::ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RAM, "RAM", tag, owner, clock, "ram", __FILE__)
{
m_size = 0;
@@ -48,7 +48,7 @@ void ram_device::device_start()
{
/* the device named 'ram' can get ram options from command line */
m_size = 0;
- if (strcmp(tag().c_str(), ":" RAM_TAG) == 0)
+ if (strcmp(tag(), ":" RAM_TAG) == 0)
{
const char *ramsize_string = machine().options().ram_size();
if ((ramsize_string != nullptr) && (ramsize_string[0] != '\0'))
@@ -86,7 +86,7 @@ void ram_device::device_validity_check(validity_checker &valid) const
osd_printf_error("Invalid default RAM option: %s\n", m_default_size);
/* command line options are only parsed for the device named RAM_TAG */
- if (!tag().empty() && strcmp(tag().c_str(), ":" RAM_TAG) == 0)
+ if (tag() != nullptr && strcmp(tag(), ":" RAM_TAG) == 0)
{
/* verify command line ram option */
ramsize_string = mconfig().options().ram_size();
diff --git a/src/devices/machine/ram.h b/src/devices/machine/ram.h
index e815242a8be..7d3f054895f 100644
--- a/src/devices/machine/ram.h
+++ b/src/devices/machine/ram.h
@@ -51,7 +51,7 @@ class ram_device : public device_t
{
public:
// construction/destruction
- ram_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// accessors
UINT32 size(void) const { return m_size; }
diff --git a/src/devices/machine/rf5c296.cpp b/src/devices/machine/rf5c296.cpp
index b70ff43ac3f..f2da08685ab 100644
--- a/src/devices/machine/rf5c296.cpp
+++ b/src/devices/machine/rf5c296.cpp
@@ -6,7 +6,7 @@
const device_type RF5C296 = &device_creator<rf5c296_device>;
-rf5c296_device::rf5c296_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+rf5c296_device::rf5c296_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PCCARD_SLOT, "PCCARD SLOT", tag, owner, clock, "pccard", __FILE__), m_rf5c296_reg(0), m_pccard(nullptr), m_pccard_name(nullptr)
{
}
diff --git a/src/devices/machine/rf5c296.h b/src/devices/machine/rf5c296.h
index 850e5d7cd80..faab5e738fb 100644
--- a/src/devices/machine/rf5c296.h
+++ b/src/devices/machine/rf5c296.h
@@ -13,7 +13,7 @@
class rf5c296_device : public device_t
{
public:
- rf5c296_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ rf5c296_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
static void set_pccard_name(device_t &device, const char *name) { downcast<rf5c296_device &>(device).m_pccard_name = name; }
diff --git a/src/devices/machine/roc10937.cpp b/src/devices/machine/roc10937.cpp
index 327d2f9cf4c..c76e02f13e6 100644
--- a/src/devices/machine/roc10937.cpp
+++ b/src/devices/machine/roc10937.cpp
@@ -127,7 +127,7 @@ static const int roc10937poslut[]=
const device_type ROC10937 = &device_creator<roc10937_t>;
-rocvfd_t::rocvfd_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+rocvfd_t::rocvfd_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
m_port_val=0;
@@ -246,7 +246,7 @@ void rocvfd_t::shift_clock(int state)
}
///////////////////////////////////////////////////////////////////////////
-roc10937_t::roc10937_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+roc10937_t::roc10937_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: rocvfd_t(mconfig, ROC10937, "Rockwell 10937 VFD controller and compatible", tag, owner, clock, "roc10937", __FILE__)
{
m_port_val=0;
@@ -254,7 +254,7 @@ roc10937_t::roc10937_t(const machine_config &mconfig, std::string tag, device_t
const device_type MSC1937 = &device_creator<msc1937_t>;
-msc1937_t::msc1937_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+msc1937_t::msc1937_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: rocvfd_t(mconfig, MSC1937, "OKI MSC1937 VFD controller", tag, owner, clock, "msc1937", __FILE__)
{
m_port_val=0;
@@ -313,7 +313,7 @@ void rocvfd_t::write_char(int data)
const device_type ROC10957 = &device_creator<roc10957_t>;
-roc10957_t::roc10957_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+roc10957_t::roc10957_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: rocvfd_t(mconfig, ROC10957, "Rockwell 10957 VFD controller and compatible", tag, owner, clock, "roc10957", __FILE__)
{
m_port_val=0;
@@ -381,7 +381,7 @@ void roc10957_t::write_char(int data)
const device_type S16LF01 = &device_creator<s16lf01_t>;
-s16lf01_t::s16lf01_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+s16lf01_t::s16lf01_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: rocvfd_t(mconfig, S16LF01, "Samsung 16LF01 Series VFD controller and compatible", tag, owner, clock, "s16lf01", __FILE__)
{
m_port_val=0;
diff --git a/src/devices/machine/roc10937.h b/src/devices/machine/roc10937.h
index ae826fbc7cf..3acf90726b0 100644
--- a/src/devices/machine/roc10937.h
+++ b/src/devices/machine/roc10937.h
@@ -49,7 +49,7 @@
class rocvfd_t : public device_t {
public:
- rocvfd_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ rocvfd_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration helpers
static void static_set_value(device_t &device, int val);
@@ -87,24 +87,24 @@ protected:
class roc10937_t : public rocvfd_t {
public:
- roc10937_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ roc10937_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class msc1937_t : public rocvfd_t {
public:
- msc1937_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ msc1937_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class roc10957_t : public rocvfd_t {
public:
- roc10957_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ roc10957_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void write_char(int data);
};
class s16lf01_t : public rocvfd_t {
public:
- s16lf01_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ s16lf01_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type ROC10937;
diff --git a/src/devices/machine/rp5c01.cpp b/src/devices/machine/rp5c01.cpp
index cb99a41caad..5ac56b4b415 100644
--- a/src/devices/machine/rp5c01.cpp
+++ b/src/devices/machine/rp5c01.cpp
@@ -110,7 +110,7 @@ inline void rp5c01_device::set_alarm_line()
if (m_alarm != alarm)
{
- if (LOG) logerror("RP5C01 '%s' Alarm %u\n", tag().c_str(), alarm);
+ if (LOG) logerror("RP5C01 '%s' Alarm %u\n", tag(), alarm);
m_out_alarm_cb(alarm);
m_alarm = alarm;
@@ -167,7 +167,7 @@ inline void rp5c01_device::check_alarm()
// rp5c01_device - constructor
//-------------------------------------------------
-rp5c01_device::rp5c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+rp5c01_device::rp5c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RP5C01, "RP5C01", tag, owner, clock, "rp5c01", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -349,7 +349,7 @@ READ8_MEMBER( rp5c01_device::read )
break;
}
- if (LOG) logerror("RP5C01 '%s' Register %u Read %02x\n", tag().c_str(), offset, data);
+ if (LOG) logerror("RP5C01 '%s' Register %u Read %02x\n", tag(), offset, data);
return data & 0x0f;
}
@@ -371,14 +371,14 @@ WRITE8_MEMBER( rp5c01_device::write )
if (LOG)
{
- logerror("RP5C01 '%s' Mode %u\n", tag().c_str(), data & MODE_MASK);
- logerror("RP5C01 '%s' Timer %s\n", tag().c_str(), (data & MODE_TIMER_EN) ? "enabled" : "disabled");
- logerror("RP5C01 '%s' Alarm %s\n", tag().c_str(), (data & MODE_ALARM_EN) ? "enabled" : "disabled");
+ logerror("RP5C01 '%s' Mode %u\n", tag(), data & MODE_MASK);
+ logerror("RP5C01 '%s' Timer %s\n", tag(), (data & MODE_TIMER_EN) ? "enabled" : "disabled");
+ logerror("RP5C01 '%s' Alarm %s\n", tag(), (data & MODE_ALARM_EN) ? "enabled" : "disabled");
}
break;
case REGISTER_TEST:
- if (LOG) logerror("RP5C01 '%s' Test %u not supported!\n", tag().c_str(), data);
+ if (LOG) logerror("RP5C01 '%s' Test %u not supported!\n", tag(), data);
break;
case REGISTER_RESET:
@@ -395,10 +395,10 @@ WRITE8_MEMBER( rp5c01_device::write )
if (LOG)
{
- if (data & RESET_ALARM) logerror("RP5C01 '%s' Alarm Reset\n", tag().c_str());
- if (data & RESET_TIMER) logerror("RP5C01 '%s' Timer Reset not supported!\n", tag().c_str());
- logerror("RP5C01 '%s' 16Hz Signal %s\n", tag().c_str(), (data & RESET_16_HZ) ? "disabled" : "enabled");
- logerror("RP5C01 '%s' 1Hz Signal %s\n", tag().c_str(), (data & RESET_1_HZ) ? "disabled" : "enabled");
+ if (data & RESET_ALARM) logerror("RP5C01 '%s' Alarm Reset\n", tag());
+ if (data & RESET_TIMER) logerror("RP5C01 '%s' Timer Reset not supported!\n", tag());
+ logerror("RP5C01 '%s' 16Hz Signal %s\n", tag(), (data & RESET_16_HZ) ? "disabled" : "enabled");
+ logerror("RP5C01 '%s' 1Hz Signal %s\n", tag(), (data & RESET_1_HZ) ? "disabled" : "enabled");
}
break;
@@ -422,7 +422,7 @@ WRITE8_MEMBER( rp5c01_device::write )
break;
}
- if (LOG) logerror("RP5C01 '%s' Register %u Write %02x\n", tag().c_str(), offset, data);
+ if (LOG) logerror("RP5C01 '%s' Register %u Write %02x\n", tag(), offset, data);
break;
}
}
diff --git a/src/devices/machine/rp5c01.h b/src/devices/machine/rp5c01.h
index 7e20fd55123..f9cf0a12609 100644
--- a/src/devices/machine/rp5c01.h
+++ b/src/devices/machine/rp5c01.h
@@ -51,7 +51,7 @@ class rp5c01_device : public device_t,
{
public:
// construction/destruction
- rp5c01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ rp5c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_alarm_callback(device_t &device, _Object object) { return downcast<rp5c01_device &>(device).m_out_alarm_cb.set_callback(object); }
static void remove_battery(device_t &device) { downcast<rp5c01_device &>(device).m_battery_backed = false; }
diff --git a/src/devices/machine/rp5c15.cpp b/src/devices/machine/rp5c15.cpp
index c6190ba5ddb..7967366c349 100644
--- a/src/devices/machine/rp5c15.cpp
+++ b/src/devices/machine/rp5c15.cpp
@@ -125,7 +125,7 @@ inline void rp5c15_device::set_alarm_line()
if (m_alarm != alarm)
{
- if (LOG) logerror("RP5C15 '%s' Alarm %u\n", tag().c_str(), alarm);
+ if (LOG) logerror("RP5C15 '%s' Alarm %u\n", tag(), alarm);
m_out_alarm_cb(alarm);
m_alarm = alarm;
@@ -182,7 +182,7 @@ inline void rp5c15_device::check_alarm()
// rp5c15_device - constructor
//-------------------------------------------------
-rp5c15_device::rp5c15_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+rp5c15_device::rp5c15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RP5C15, "RP5C15", tag, owner, clock, "rp5c15", __FILE__),
device_rtc_interface(mconfig, *this),
m_out_alarm_cb(*this),
@@ -323,7 +323,7 @@ READ8_MEMBER( rp5c15_device::read )
break;
}
- if (LOG) logerror("RP5C15 '%s' Register %u Read %02x\n", tag().c_str(), offset, data);
+ if (LOG) logerror("RP5C15 '%s' Register %u Read %02x\n", tag(), offset, data);
return data & 0x0f;
}
@@ -345,14 +345,14 @@ WRITE8_MEMBER( rp5c15_device::write )
if (LOG)
{
- logerror("RP5C15 '%s' Mode %u\n", tag().c_str(), data & MODE_MASK);
- logerror("RP5C15 '%s' Timer %s\n", tag().c_str(), (data & MODE_TIMER_EN) ? "enabled" : "disabled");
- logerror("RP5C15 '%s' Alarm %s\n", tag().c_str(), (data & MODE_ALARM_EN) ? "enabled" : "disabled");
+ logerror("RP5C15 '%s' Mode %u\n", tag(), data & MODE_MASK);
+ logerror("RP5C15 '%s' Timer %s\n", tag(), (data & MODE_TIMER_EN) ? "enabled" : "disabled");
+ logerror("RP5C15 '%s' Alarm %s\n", tag(), (data & MODE_ALARM_EN) ? "enabled" : "disabled");
}
break;
case REGISTER_TEST:
- if (LOG) logerror("RP5C15 '%s' Test %u not supported!\n", tag().c_str(), data);
+ if (LOG) logerror("RP5C15 '%s' Test %u not supported!\n", tag(), data);
break;
case REGISTER_RESET:
@@ -369,10 +369,10 @@ WRITE8_MEMBER( rp5c15_device::write )
if (LOG)
{
- if (data & RESET_ALARM) logerror("RP5C15 '%s' Alarm Reset\n", tag().c_str());
- if (data & RESET_TIMER) logerror("RP5C15 '%s' Timer Reset not supported!\n", tag().c_str());
- logerror("RP5C15 '%s' 16Hz Signal %s\n", tag().c_str(), (data & RESET_16_HZ) ? "disabled" : "enabled");
- logerror("RP5C15 '%s' 1Hz Signal %s\n", tag().c_str(), (data & RESET_1_HZ) ? "disabled" : "enabled");
+ if (data & RESET_ALARM) logerror("RP5C15 '%s' Alarm Reset\n", tag());
+ if (data & RESET_TIMER) logerror("RP5C15 '%s' Timer Reset not supported!\n", tag());
+ logerror("RP5C15 '%s' 16Hz Signal %s\n", tag(), (data & RESET_16_HZ) ? "disabled" : "enabled");
+ logerror("RP5C15 '%s' 1Hz Signal %s\n", tag(), (data & RESET_1_HZ) ? "disabled" : "enabled");
}
break;
@@ -441,7 +441,7 @@ WRITE8_MEMBER( rp5c15_device::write )
break;
}
- if (LOG) logerror("RP5C15 '%s' Register %u Write %02x\n", tag().c_str(), offset, data);
+ if (LOG) logerror("RP5C15 '%s' Register %u Write %02x\n", tag(), offset, data);
break;
}
}
diff --git a/src/devices/machine/rp5c15.h b/src/devices/machine/rp5c15.h
index b4d2eb9d0e9..1e36dfaf60f 100644
--- a/src/devices/machine/rp5c15.h
+++ b/src/devices/machine/rp5c15.h
@@ -48,7 +48,7 @@ class rp5c15_device : public device_t,
{
public:
// construction/destruction
- rp5c15_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ rp5c15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_alarm_callback(device_t &device, _Object object) { return downcast<rp5c15_device &>(device).m_out_alarm_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_clkout_callback(device_t &device, _Object object) { return downcast<rp5c15_device &>(device).m_out_clkout_cb.set_callback(object); }
diff --git a/src/devices/machine/rp5h01.cpp b/src/devices/machine/rp5h01.cpp
index 37ea36b901c..40964570129 100644
--- a/src/devices/machine/rp5h01.cpp
+++ b/src/devices/machine/rp5h01.cpp
@@ -32,7 +32,7 @@ static const UINT8 initial_data[0x10] =
const device_type RP5H01 = &device_creator<rp5h01_device>;
-rp5h01_device::rp5h01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+rp5h01_device::rp5h01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RP5H01, "RP5H01 6/7-bit Counter", tag, owner, clock, "rp5h01", __FILE__)
{
}
diff --git a/src/devices/machine/rp5h01.h b/src/devices/machine/rp5h01.h
index 6a242b5cec0..9a72c6384de 100644
--- a/src/devices/machine/rp5h01.h
+++ b/src/devices/machine/rp5h01.h
@@ -37,7 +37,7 @@ enum {
class rp5h01_device : public device_t
{
public:
- rp5h01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ rp5h01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( enable_w ); /* /CE */
DECLARE_WRITE_LINE_MEMBER( reset_w ); /* RESET */
diff --git a/src/devices/machine/rtc4543.cpp b/src/devices/machine/rtc4543.cpp
index 93f77f2e48d..ac1eba33e79 100644
--- a/src/devices/machine/rtc4543.cpp
+++ b/src/devices/machine/rtc4543.cpp
@@ -29,7 +29,7 @@ const device_type RTC4543 = &device_creator<rtc4543_device>;
// rtc4543_device - constructor
//-------------------------------------------------
-rtc4543_device::rtc4543_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+rtc4543_device::rtc4543_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RTC4543, "R4543 RTC", tag, owner, clock, "rtc4543", __FILE__),
device_rtc_interface(mconfig, *this),
data_cb(*this), m_ce(0), m_clk(0), m_wr(0), m_data(0), m_shiftreg(0), m_curreg(0), m_curbit(0), m_clock_timer(nullptr)
@@ -119,7 +119,7 @@ void rtc4543_device::rtc_clock_updated(int year, int month, int day, int day_of_
WRITE_LINE_MEMBER( rtc4543_device::ce_w )
{
- if (VERBOSE) printf("RTC4543 '%s' CE: %u\n", tag().c_str(), state);
+ if (VERBOSE) printf("RTC4543 '%s' CE: %u\n", tag(), state);
if (!state && m_ce) // complete transfer
{
@@ -139,7 +139,7 @@ WRITE_LINE_MEMBER( rtc4543_device::ce_w )
WRITE_LINE_MEMBER( rtc4543_device::wr_w )
{
- if (VERBOSE) logerror("RTC4543 '%s' WR: %u\n", tag().c_str(), state);
+ if (VERBOSE) logerror("RTC4543 '%s' WR: %u\n", tag(), state);
m_wr = state;
}
@@ -150,7 +150,7 @@ WRITE_LINE_MEMBER( rtc4543_device::wr_w )
WRITE_LINE_MEMBER( rtc4543_device::clk_w )
{
- if (VERBOSE) logerror("RTC4543 '%s' CLK: %u\n", tag().c_str(), state);
+ if (VERBOSE) logerror("RTC4543 '%s' CLK: %u\n", tag(), state);
if (!m_ce) return;
@@ -165,7 +165,7 @@ WRITE_LINE_MEMBER( rtc4543_device::clk_w )
m_shiftreg = m_regs[m_curreg++];
if (VERBOSE)
- logerror("RTC4543 '%s' sending byte: %02x\n", tag().c_str(), m_shiftreg);
+ logerror("RTC4543 '%s' sending byte: %02x\n", tag(), m_shiftreg);
}
// shift data bit
@@ -190,7 +190,7 @@ WRITE_LINE_MEMBER( rtc4543_device::clk_w )
WRITE_LINE_MEMBER( rtc4543_device::data_w )
{
- if (VERBOSE) logerror("RTC4543 '%s' I/O: %u\n", tag().c_str(), state);
+ if (VERBOSE) logerror("RTC4543 '%s' I/O: %u\n", tag(), state);
m_data = state & 1;
}
diff --git a/src/devices/machine/rtc4543.h b/src/devices/machine/rtc4543.h
index 1b9dabdf753..e32e37370ee 100644
--- a/src/devices/machine/rtc4543.h
+++ b/src/devices/machine/rtc4543.h
@@ -39,7 +39,7 @@ class rtc4543_device : public device_t,
{
public:
// construction/destruction
- rtc4543_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ rtc4543_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( ce_w );
DECLARE_WRITE_LINE_MEMBER( wr_w );
diff --git a/src/devices/machine/rtc65271.cpp b/src/devices/machine/rtc65271.cpp
index b0690f3d35f..074b8d87f48 100644
--- a/src/devices/machine/rtc65271.cpp
+++ b/src/devices/machine/rtc65271.cpp
@@ -672,7 +672,7 @@ const device_type RTC65271 = &device_creator<rtc65271_device>;
// rtc65271_device - constructor
//-------------------------------------------------
-rtc65271_device::rtc65271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+rtc65271_device::rtc65271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RTC65271, "RTC-65271", tag, owner, clock, "rtc65271", __FILE__),
device_nvram_interface(mconfig, *this),
m_interrupt_cb(*this)
diff --git a/src/devices/machine/rtc65271.h b/src/devices/machine/rtc65271.h
index e3925bf068a..c5d554e75fd 100644
--- a/src/devices/machine/rtc65271.h
+++ b/src/devices/machine/rtc65271.h
@@ -22,7 +22,7 @@ class rtc65271_device : public device_t,
{
public:
// construction/destruction
- rtc65271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ rtc65271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/machine/rtc9701.cpp b/src/devices/machine/rtc9701.cpp
index a367ea7eb57..7c92ddc53e7 100644
--- a/src/devices/machine/rtc9701.cpp
+++ b/src/devices/machine/rtc9701.cpp
@@ -32,7 +32,7 @@ const device_type rtc9701 = &device_creator<rtc9701_device>;
// rtc9701_device - constructor
//-------------------------------------------------
-rtc9701_device::rtc9701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+rtc9701_device::rtc9701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, rtc9701, "RTC-9701", tag, owner, clock, "rtc9701", __FILE__),
device_nvram_interface(mconfig, *this),
m_latch(0),
diff --git a/src/devices/machine/rtc9701.h b/src/devices/machine/rtc9701.h
index fa367cb21c5..14407f157ec 100644
--- a/src/devices/machine/rtc9701.h
+++ b/src/devices/machine/rtc9701.h
@@ -51,7 +51,7 @@ class rtc9701_device : public device_t,
{
public:
// construction/destruction
- rtc9701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ rtc9701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
diff --git a/src/devices/machine/s2636.cpp b/src/devices/machine/s2636.cpp
index d39ce5f2271..0beddbed0a3 100644
--- a/src/devices/machine/s2636.cpp
+++ b/src/devices/machine/s2636.cpp
@@ -155,7 +155,7 @@ UINT16 const s2636_device::SCORE_FONT[16][5] =
const device_type S2636 = &device_creator<s2636_device>;
-s2636_device::s2636_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+s2636_device::s2636_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S2636, "Signetics 2636", tag, owner, clock, "s2636", __FILE__)
, device_video_interface(mconfig, *this)
, device_sound_interface(mconfig, *this)
diff --git a/src/devices/machine/s2636.h b/src/devices/machine/s2636.h
index 371168df616..2a22aa323d7 100644
--- a/src/devices/machine/s2636.h
+++ b/src/devices/machine/s2636.h
@@ -41,7 +41,7 @@ class s2636_device : public device_t,
public device_sound_interface
{
public:
- s2636_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ s2636_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~s2636_device() {}
static void set_offsets(device_t &device, int y_offset, int x_offset)
diff --git a/src/devices/machine/s3520cf.cpp b/src/devices/machine/s3520cf.cpp
index cbf33391b00..d37a6b2a542 100644
--- a/src/devices/machine/s3520cf.cpp
+++ b/src/devices/machine/s3520cf.cpp
@@ -35,7 +35,7 @@ const device_type S3520CF = &device_creator<s3520cf_device>;
// s3520cf_device - constructor
//-------------------------------------------------
-s3520cf_device::s3520cf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+s3520cf_device::s3520cf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S3520CF, "S-3520CF RTC", tag, owner, clock, "s3520cf", __FILE__), m_dir(0), m_latch(0), m_reset_line(0), m_read_latch(0), m_current_cmd(0), m_cmd_stream_pos(0), m_rtc_addr(0), m_mode(0), m_sysr(0), m_rtc_state()
{
}
diff --git a/src/devices/machine/s3520cf.h b/src/devices/machine/s3520cf.h
index f925d8b4efc..c277c69142a 100644
--- a/src/devices/machine/s3520cf.h
+++ b/src/devices/machine/s3520cf.h
@@ -42,7 +42,7 @@ class s3520cf_device : public device_t
{
public:
// construction/destruction
- s3520cf_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ s3520cf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_READ_LINE_MEMBER( read_bit );
diff --git a/src/devices/machine/s3c2400.cpp b/src/devices/machine/s3c2400.cpp
index 83a05dc110b..a1ef609a1ac 100644
--- a/src/devices/machine/s3c2400.cpp
+++ b/src/devices/machine/s3c2400.cpp
@@ -41,7 +41,7 @@ UINT32 s3c2400_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
const device_type S3C2400 = &device_creator<s3c2400_device>;
-s3c2400_device::s3c2400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+s3c2400_device::s3c2400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S3C2400, "Samsung S3C2400", tag, owner, clock, "s3c2400", __FILE__),
m_palette(*this),
m_cpu(*this, ":maincpu"),
@@ -85,7 +85,7 @@ s3c2400_device::~s3c2400_device()
// palette device
//-------------------------------------------------
-void s3c2400_device::static_set_palette_tag(device_t &device, std::string tag)
+void s3c2400_device::static_set_palette_tag(device_t &device, const char *tag)
{
downcast<s3c2400_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/machine/s3c2400.h b/src/devices/machine/s3c2400.h
index 347156612e5..fbd2e5e70d4 100644
--- a/src/devices/machine/s3c2400.h
+++ b/src/devices/machine/s3c2400.h
@@ -352,11 +352,11 @@ enum
class s3c2400_device : public device_t
{
public:
- s3c2400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ s3c2400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~s3c2400_device();
// static configuration
- static void static_set_palette_tag(device_t &device, std::string tag);
+ static void static_set_palette_tag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_pin_r_cb.set_callback(object); }
template<class _Object> static devcb_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_pin_w_cb.set_callback(object); }
template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c2400_device &>(device).m_port_r_cb.set_callback(object); }
diff --git a/src/devices/machine/s3c2410.cpp b/src/devices/machine/s3c2410.cpp
index 12166118c49..c89a67ef47b 100644
--- a/src/devices/machine/s3c2410.cpp
+++ b/src/devices/machine/s3c2410.cpp
@@ -41,7 +41,7 @@ UINT32 s3c2410_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
const device_type S3C2410 = &device_creator<s3c2410_device>;
-s3c2410_device::s3c2410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+s3c2410_device::s3c2410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S3C2410, "S3C2410 MCU", tag, owner, clock, "s3c2410", __FILE__),
m_palette(*this),
m_cpu(*this, ":maincpu"),
@@ -91,7 +91,7 @@ s3c2410_device::~s3c2410_device()
// palette device
//-------------------------------------------------
-void s3c2410_device::static_set_palette_tag(device_t &device, std::string tag)
+void s3c2410_device::static_set_palette_tag(device_t &device, const char *tag)
{
downcast<s3c2410_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/machine/s3c2410.h b/src/devices/machine/s3c2410.h
index e09b5a3ccc5..6e9b28a9146 100644
--- a/src/devices/machine/s3c2410.h
+++ b/src/devices/machine/s3c2410.h
@@ -438,11 +438,11 @@ static const UINT32 MAP_SUBINT_TO_INT[11] =
class s3c2410_device : public device_t
{
public:
- s3c2410_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ s3c2410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~s3c2410_device();
// static configuration
- static void static_set_palette_tag(device_t &device, std::string tag);
+ static void static_set_palette_tag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_pin_r_cb.set_callback(object); }
template<class _Object> static devcb_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_pin_w_cb.set_callback(object); }
template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c2410_device &>(device).m_port_r_cb.set_callback(object); }
diff --git a/src/devices/machine/s3c2440.cpp b/src/devices/machine/s3c2440.cpp
index 4c78d38b1bc..7cc5e0a6247 100644
--- a/src/devices/machine/s3c2440.cpp
+++ b/src/devices/machine/s3c2440.cpp
@@ -41,7 +41,7 @@ UINT32 s3c2440_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
const device_type S3C2440 = &device_creator<s3c2440_device>;
-s3c2440_device::s3c2440_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+s3c2440_device::s3c2440_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S3C2440, "Samsung S3C2440", tag, owner, clock, "s3c2440", __FILE__),
m_palette(*this),
m_cpu(*this, ":maincpu"),
@@ -93,7 +93,7 @@ s3c2440_device::~s3c2440_device()
// palette device
//-------------------------------------------------
-void s3c2440_device::static_set_palette_tag(device_t &device, std::string tag)
+void s3c2440_device::static_set_palette_tag(device_t &device, const char *tag)
{
downcast<s3c2440_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/machine/s3c2440.h b/src/devices/machine/s3c2440.h
index b19f5aaf483..58976ddcf1a 100644
--- a/src/devices/machine/s3c2440.h
+++ b/src/devices/machine/s3c2440.h
@@ -469,11 +469,11 @@ static const UINT32 MAP_SUBINT_TO_INT[15] =
class s3c2440_device : public device_t
{
public:
- s3c2440_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ s3c2440_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~s3c2440_device();
// static configuration
- static void static_set_palette_tag(device_t &device, std::string tag);
+ static void static_set_palette_tag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_core_pin_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_pin_r_cb.set_callback(object); }
template<class _Object> static devcb_base &set_core_pin_w_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_pin_w_cb.set_callback(object); }
template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c2440_device &>(device).m_port_r_cb.set_callback(object); }
diff --git a/src/devices/machine/s3c44b0.cpp b/src/devices/machine/s3c44b0.cpp
index 766c0e77c72..19579a1aa03 100644
--- a/src/devices/machine/s3c44b0.cpp
+++ b/src/devices/machine/s3c44b0.cpp
@@ -32,7 +32,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
const device_type S3C44B0 = &device_creator<s3c44b0_device>;
-s3c44b0_device::s3c44b0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+s3c44b0_device::s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, S3C44B0, "Samsung S3C44B0", tag, owner, clock, "s3c44b0", __FILE__), m_cpu(nullptr),
m_port_r_cb(*this),
m_port_w_cb(*this),
diff --git a/src/devices/machine/s3c44b0.h b/src/devices/machine/s3c44b0.h
index d379ca66af0..05b0c134532 100644
--- a/src/devices/machine/s3c44b0.h
+++ b/src/devices/machine/s3c44b0.h
@@ -600,7 +600,7 @@ enum
class s3c44b0_device : public device_t
{
public:
- s3c44b0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~s3c44b0_device() {}
template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_port_r_cb.set_callback(object); }
diff --git a/src/devices/machine/serflash.cpp b/src/devices/machine/serflash.cpp
index 29891365a47..ebdd1dd53a9 100644
--- a/src/devices/machine/serflash.cpp
+++ b/src/devices/machine/serflash.cpp
@@ -21,7 +21,7 @@ const device_type SERFLASH = &device_creator<serflash_device>;
// serflash_device - constructor
//-------------------------------------------------
-serflash_device::serflash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+serflash_device::serflash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SERFLASH, "Serial Flash", tag, owner, clock, "serflash", __FILE__),
device_nvram_interface(mconfig, *this),
m_length(0), m_region(nullptr), m_flash_state(), m_flash_enab(0), m_flash_cmd_seq(0), m_flash_cmd_prev(0), m_flash_addr_seq(0), m_flash_read_seq(0), m_flash_row(0),
diff --git a/src/devices/machine/serflash.h b/src/devices/machine/serflash.h
index 718de72609e..a5cf2c58bfb 100644
--- a/src/devices/machine/serflash.h
+++ b/src/devices/machine/serflash.h
@@ -42,7 +42,7 @@ class serflash_device : public device_t,
public:
// construction/destruction
- serflash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ serflash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( flash_ready_r );
DECLARE_READ8_MEMBER( flash_io_r );
diff --git a/src/devices/machine/smc91c9x.cpp b/src/devices/machine/smc91c9x.cpp
index 463f76403d4..a38be999136 100644
--- a/src/devices/machine/smc91c9x.cpp
+++ b/src/devices/machine/smc91c9x.cpp
@@ -105,7 +105,7 @@ static const char *const ethernet_regname[64] =
DEVICE INTERFACE
***************************************************************************/
-smc91c9x_device::smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+smc91c9x_device::smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_irq_handler(*this)
{
@@ -183,7 +183,7 @@ void smc91c9x_device::device_reset()
const device_type SMC91C94 = &device_creator<smc91c94_device>;
-smc91c94_device::smc91c94_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+smc91c94_device::smc91c94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: smc91c9x_device(mconfig, SMC91C94, "SMC91C94 Ethernet Controller", tag, owner, clock, "smc91c94", __FILE__)
{
}
@@ -191,7 +191,7 @@ smc91c94_device::smc91c94_device(const machine_config &mconfig, std::string tag,
const device_type SMC91C96 = &device_creator<smc91c96_device>;
-smc91c96_device::smc91c96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+smc91c96_device::smc91c96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: smc91c9x_device(mconfig, SMC91C96, "SMC91C96", tag, owner, clock, "smc91c96", __FILE__)
{
}
diff --git a/src/devices/machine/smc91c9x.h b/src/devices/machine/smc91c9x.h
index 041e9819d72..f3e7032e0e2 100644
--- a/src/devices/machine/smc91c9x.h
+++ b/src/devices/machine/smc91c9x.h
@@ -21,7 +21,7 @@
class smc91c9x_device : public device_t
{
public:
- smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~smc91c9x_device() {}
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<smc91c9x_device &>(device).m_irq_handler.set_callback(object); }
@@ -67,7 +67,7 @@ private:
class smc91c94_device : public smc91c9x_device
{
public:
- smc91c94_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ smc91c94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type SMC91C94;
@@ -75,7 +75,7 @@ extern const device_type SMC91C94;
class smc91c96_device : public smc91c9x_device
{
public:
- smc91c96_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ smc91c96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type SMC91C96;
diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp
index 78dd3b14093..34a7cb87f05 100644
--- a/src/devices/machine/smpc.cpp
+++ b/src/devices/machine/smpc.cpp
@@ -763,7 +763,7 @@ void saturn_state::smpc_comreg_exec(address_space &space, UINT8 data, UINT8 is_s
machine().scheduler().timer_set(attotime::from_usec(100), timer_expired_delegate(FUNC(saturn_state::smpc_nmi_set),this),data & 1);
break;
default:
- printf ("cpu '%s' (PC=%08X) SMPC: undocumented Command %02x\n", space.device().tag().c_str(), space.device().safe_pc(), data);
+ printf ("cpu '%s' (PC=%08X) SMPC: undocumented Command %02x\n", space.device().tag(), space.device().safe_pc(), data);
}
}
@@ -1006,7 +1006,7 @@ READ8_MEMBER( saturn_state::saturn_SMPC_r )
}
}
- if (LOG_SMPC) logerror ("cpu %s (PC=%08X) SMPC: Read from Byte Offset %02x (%d) Returns %02x\n", space.device().tag().c_str(), space.device().safe_pc(), offset, offset>>1, return_data);
+ if (LOG_SMPC) logerror ("cpu %s (PC=%08X) SMPC: Read from Byte Offset %02x (%d) Returns %02x\n", space.device().tag(), space.device().safe_pc(), offset, offset>>1, return_data);
return return_data;
}
diff --git a/src/devices/machine/spchrom.cpp b/src/devices/machine/spchrom.cpp
index dab4f65e7a9..542be5b4ded 100644
--- a/src/devices/machine/spchrom.cpp
+++ b/src/devices/machine/spchrom.cpp
@@ -25,7 +25,7 @@
// device type definition
const device_type SPEECHROM = &device_creator<speechrom_device>;
-speechrom_device::speechrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+speechrom_device::speechrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SPEECHROM, "SPEECHROM", tag, owner, clock, "speechrom", __FILE__), m_speechrom_data(nullptr), m_speechROMlen(0),
m_speechROMaddr(0),
m_load_pointer(0),
@@ -127,7 +127,7 @@ void speechrom_device::device_start()
memory_region *region = memregion(tag());
if (region == nullptr)
{
- throw emu_fatalerror("No region for device '%s'\n", tag().c_str());
+ throw emu_fatalerror("No region for device '%s'\n", tag());
}
m_speechrom_data = region->base();
diff --git a/src/devices/machine/spchrom.h b/src/devices/machine/spchrom.h
index 42d8a107601..c72af249529 100644
--- a/src/devices/machine/spchrom.h
+++ b/src/devices/machine/spchrom.h
@@ -14,7 +14,7 @@ class speechrom_device : public device_t
{
public:
// construction/destruction
- speechrom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ speechrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
/// TODO: implement bus behaviour
int read(int count);
diff --git a/src/devices/machine/steppers.cpp b/src/devices/machine/steppers.cpp
index 9eb8b6c251b..2f63c8529d3 100644
--- a/src/devices/machine/steppers.cpp
+++ b/src/devices/machine/steppers.cpp
@@ -43,7 +43,7 @@
const device_type STEPPER = &device_creator<stepper_device>;
-stepper_device::stepper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+stepper_device::stepper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, STEPPER, "Stepper Motor", tag, owner, clock, "stepper", __FILE__),
m_optic_cb(*this)
{
diff --git a/src/devices/machine/steppers.h b/src/devices/machine/steppers.h
index 7778bbc6f47..4b180e75355 100644
--- a/src/devices/machine/steppers.h
+++ b/src/devices/machine/steppers.h
@@ -101,7 +101,7 @@ extern const device_type STEPPER;
class stepper_device : public device_t
{
public:
- stepper_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ stepper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_optic_handler(device_t &device, _Object object) { return downcast<stepper_device &>(device).m_optic_cb.set_callback(object); }
diff --git a/src/devices/machine/strata.cpp b/src/devices/machine/strata.cpp
index ab908868626..4f7006f4d99 100644
--- a/src/devices/machine/strata.cpp
+++ b/src/devices/machine/strata.cpp
@@ -46,7 +46,7 @@
const device_type STRATAFLASH = &device_creator<strataflash_device>;
-strataflash_device::strataflash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+strataflash_device::strataflash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, STRATAFLASH, "Intel 28F640J5", tag, owner, clock, "strataflash", __FILE__),
device_nvram_interface(mconfig, *this)
{
diff --git a/src/devices/machine/strata.h b/src/devices/machine/strata.h
index a80fa8c7e59..5092d1e891e 100644
--- a/src/devices/machine/strata.h
+++ b/src/devices/machine/strata.h
@@ -7,7 +7,7 @@
class strataflash_device : public device_t, public device_nvram_interface
{
public:
- strataflash_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ strataflash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// 8-bit access
DECLARE_READ8_MEMBER( read8 );
diff --git a/src/devices/machine/t10mmc.cpp b/src/devices/machine/t10mmc.cpp
index af1221a2bfc..b6f0fa68f34 100644
--- a/src/devices/machine/t10mmc.cpp
+++ b/src/devices/machine/t10mmc.cpp
@@ -31,7 +31,7 @@ void t10mmc::t10_reset()
SetDevice( m_image->get_cdrom_file() );
if( !m_cdrom )
{
- m_device->logerror( "T10MMC %s: no CD found!\n", m_image->tag().c_str());
+ m_device->logerror( "T10MMC %s: no CD found!\n", m_image->tag() );
}
m_lba = 0;
diff --git a/src/devices/machine/t10sbc.cpp b/src/devices/machine/t10sbc.cpp
index a6caecd9750..623d73acf42 100644
--- a/src/devices/machine/t10sbc.cpp
+++ b/src/devices/machine/t10sbc.cpp
@@ -22,7 +22,7 @@ void t10sbc::t10_reset()
m_disk = m_image->get_hard_disk_file();
if (!m_disk)
{
- m_device->logerror("T10SBC %s: no HD found!\n", m_image->owner()->tag().c_str());
+ m_device->logerror("T10SBC %s: no HD found!\n", m_image->owner()->tag());
}
else
{
diff --git a/src/devices/machine/tc009xlvc.cpp b/src/devices/machine/tc009xlvc.cpp
index cc0af416d3f..724bd5edf16 100644
--- a/src/devices/machine/tc009xlvc.cpp
+++ b/src/devices/machine/tc009xlvc.cpp
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( tc0091lvc_map8, AS_0, 8, tc0091lvc_device )
AM_RANGE(0x080000, 0x0801ff) AM_READWRITE(tc0091lvc_paletteram_r,tc0091lvc_paletteram_w)
ADDRESS_MAP_END
-tc0091lvc_device::tc0091lvc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tc0091lvc_device::tc0091lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TC0091LVC, "Taito TC0091LVC", tag, owner, clock, "tc0091lvc", __FILE__),
device_memory_interface(mconfig, *this),
m_space_config("tc0091lvc", ENDIANNESS_LITTLE, 8,20, 0, nullptr, *ADDRESS_MAP_NAME(tc0091lvc_map8)),
@@ -178,7 +178,7 @@ tc0091lvc_device::tc0091lvc_device(const machine_config &mconfig, std::string ta
// gfx decoder
//-------------------------------------------------
-void tc0091lvc_device::static_set_gfxdecode_tag(device_t &device, std::string tag)
+void tc0091lvc_device::static_set_gfxdecode_tag(device_t &device, const char *tag)
{
downcast<tc0091lvc_device &>(device).m_gfxdecode.set_tag(tag);
}
@@ -189,7 +189,7 @@ void tc0091lvc_device::static_set_gfxdecode_tag(device_t &device, std::string ta
// palette device
//-------------------------------------------------
-void tc0091lvc_device::static_set_palette_tag(device_t &device, std::string tag)
+void tc0091lvc_device::static_set_palette_tag(device_t &device, const char *tag)
{
downcast<tc0091lvc_device &>(device).m_palette.set_tag(tag);
}
diff --git a/src/devices/machine/tc009xlvc.h b/src/devices/machine/tc009xlvc.h
index 142d4f242da..66911acd4e5 100644
--- a/src/devices/machine/tc009xlvc.h
+++ b/src/devices/machine/tc009xlvc.h
@@ -17,11 +17,11 @@ class tc0091lvc_device : public device_t,
public device_memory_interface
{
public:
- tc0091lvc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tc0091lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration
- static void static_set_gfxdecode_tag(device_t &device, std::string tag);
- static void static_set_palette_tag(device_t &device, std::string tag);
+ static void static_set_gfxdecode_tag(device_t &device, const char *tag);
+ static void static_set_palette_tag(device_t &device, const char *tag);
DECLARE_READ8_MEMBER( vregs_r );
DECLARE_WRITE8_MEMBER( vregs_w );
diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp
index 1d47a65ce1f..6b1b26b8c85 100644
--- a/src/devices/machine/terminal.cpp
+++ b/src/devices/machine/terminal.cpp
@@ -140,7 +140,7 @@ static const UINT8 terminal_font[256*16] =
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
-generic_terminal_device::generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+generic_terminal_device::generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_palette(*this, "palette"),
m_io_term_conf(*this, "TERM_CONF"),
@@ -151,7 +151,7 @@ generic_terminal_device::generic_terminal_device(const machine_config &mconfig,
{
}
-generic_terminal_device::generic_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+generic_terminal_device::generic_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GENERIC_TERMINAL, "Generic Terminal", tag, owner, clock, "generic_terminal", __FILE__),
m_palette(*this, "palette"),
m_io_term_conf(*this, "TERM_CONF"),
diff --git a/src/devices/machine/terminal.h b/src/devices/machine/terminal.h
index aef9960ca7e..0f6901629af 100644
--- a/src/devices/machine/terminal.h
+++ b/src/devices/machine/terminal.h
@@ -26,8 +26,8 @@ INPUT_PORTS_EXTERN( generic_terminal );
class generic_terminal_device : public device_t
{
public:
- generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- generic_terminal_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ generic_terminal_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ generic_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_terminal_device &>(device).m_keyboard_cb.set_callback(object); }
diff --git a/src/devices/machine/timekpr.cpp b/src/devices/machine/timekpr.cpp
index bb137f1647e..ccd849ef21d 100644
--- a/src/devices/machine/timekpr.cpp
+++ b/src/devices/machine/timekpr.cpp
@@ -119,13 +119,13 @@ static int counter_from_ram( UINT8 *data, int offset )
// timekeeper_device_config - constructor
//-------------------------------------------------
-timekeeper_device::timekeeper_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+timekeeper_device::timekeeper_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nvram_interface(mconfig, *this)
{
}
-m48t02_device::m48t02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+m48t02_device::m48t02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: timekeeper_device(mconfig, M48T02, "M48T02 Timekeeper", tag, owner, clock, "m48t02", __FILE__)
{
m_offset_control = 0x7f8;
@@ -141,7 +141,7 @@ m48t02_device::m48t02_device(const machine_config &mconfig, std::string tag, dev
m_size = 0x800;
}
-m48t35_device::m48t35_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+m48t35_device::m48t35_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: timekeeper_device(mconfig, M48T35, "M48T35 Timekeeper", tag, owner, clock, "m48t35", __FILE__)
{
m_offset_control = 0x7ff8;
@@ -157,7 +157,7 @@ m48t35_device::m48t35_device(const machine_config &mconfig, std::string tag, dev
m_size = 0x8000;
}
-m48t37_device::m48t37_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+m48t37_device::m48t37_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: timekeeper_device(mconfig, M48T37, "M48T37 Timekeeper", tag, owner, clock, "m48t37", __FILE__)
{
m_offset_control = 0x7ff8;
@@ -173,7 +173,7 @@ m48t37_device::m48t37_device(const machine_config &mconfig, std::string tag, dev
m_size = 0x8000;
}
-m48t58_device::m48t58_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+m48t58_device::m48t58_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: timekeeper_device(mconfig, M48T58, "M48T58 Timekeeper", tag, owner, clock, "m48t58", __FILE__)
{
m_offset_control = 0x1ff8;
@@ -189,7 +189,7 @@ m48t58_device::m48t58_device(const machine_config &mconfig, std::string tag, dev
m_size = 0x2000;
}
-mk48t08_device::mk48t08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+mk48t08_device::mk48t08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: timekeeper_device(mconfig, MK48T08, "MK48T08 Timekeeper", tag, owner, clock, "m48t08", __FILE__)
{
m_offset_control = 0x1ff8;
diff --git a/src/devices/machine/timekpr.h b/src/devices/machine/timekpr.h
index 8e057fe0519..4cb11f6ea86 100644
--- a/src/devices/machine/timekpr.h
+++ b/src/devices/machine/timekpr.h
@@ -55,7 +55,7 @@ class timekeeper_device : public device_t,
{
protected:
// construction/destruction
- timekeeper_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ timekeeper_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
public:
DECLARE_WRITE8_MEMBER( write );
@@ -107,31 +107,31 @@ protected:
class m48t02_device : public timekeeper_device
{
public:
- m48t02_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m48t02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class m48t35_device : public timekeeper_device
{
public:
- m48t35_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m48t35_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class m48t37_device : public timekeeper_device
{
public:
- m48t37_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m48t37_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class m48t58_device : public timekeeper_device
{
public:
- m48t58_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m48t58_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class mk48t08_device : public timekeeper_device
{
public:
- mk48t08_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mk48t08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
// device type definition
diff --git a/src/devices/machine/tmp68301.cpp b/src/devices/machine/tmp68301.cpp
index 39fa851de23..c2526699070 100644
--- a/src/devices/machine/tmp68301.cpp
+++ b/src/devices/machine/tmp68301.cpp
@@ -99,7 +99,7 @@ WRITE16_MEMBER(tmp68301_device::pdr_w)
}
-tmp68301_device::tmp68301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tmp68301_device::tmp68301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMP68301, "TMP68301", tag, owner, clock, "tmp68301", __FILE__),
device_memory_interface(mconfig, *this),
m_in_parallel_cb(*this),
diff --git a/src/devices/machine/tmp68301.h b/src/devices/machine/tmp68301.h
index 875dc93b93b..b22add4a6c6 100644
--- a/src/devices/machine/tmp68301.h
+++ b/src/devices/machine/tmp68301.h
@@ -25,7 +25,7 @@ class tmp68301_device : public device_t,
public device_memory_interface
{
public:
- tmp68301_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tmp68301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~tmp68301_device() {}
template<class _Object> static devcb_base &set_in_parallel_callback(device_t &device, _Object object) { return downcast<tmp68301_device &>(device).m_in_parallel_cb.set_callback(object); }
diff --git a/src/devices/machine/tms1024.cpp b/src/devices/machine/tms1024.cpp
index b77747217ce..6e7d5c206e7 100644
--- a/src/devices/machine/tms1024.cpp
+++ b/src/devices/machine/tms1024.cpp
@@ -24,19 +24,19 @@ const device_type TMS1025 = &device_creator<tms1025_device>;
// constructor
//-------------------------------------------------
-tms1024_device::tms1024_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms1024_device::tms1024_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS1024, "TMS1024 I/O Expander", tag, owner, clock, "tms1024", __FILE__), m_h(0), m_s(0), m_std(0),
m_write_port1(*this), m_write_port2(*this), m_write_port3(*this), m_write_port4(*this), m_write_port5(*this), m_write_port6(*this), m_write_port7(*this)
{
}
-tms1024_device::tms1024_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+tms1024_device::tms1024_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_h(0), m_s(0), m_std(0),
m_write_port1(*this), m_write_port2(*this), m_write_port3(*this), m_write_port4(*this), m_write_port5(*this), m_write_port6(*this), m_write_port7(*this)
{
}
-tms1025_device::tms1025_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms1025_device::tms1025_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms1024_device(mconfig, TMS1025, "TMS1025 I/O Expander", tag, owner, clock, "tms1025", __FILE__)
{
}
diff --git a/src/devices/machine/tms1024.h b/src/devices/machine/tms1024.h
index 27c90581cd1..e351f87d2fb 100644
--- a/src/devices/machine/tms1024.h
+++ b/src/devices/machine/tms1024.h
@@ -64,8 +64,8 @@ enum
class tms1024_device : public device_t
{
public:
- tms1024_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- tms1024_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ tms1024_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms1024_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb_base &set_write_port1_callback(device_t &device, _Object object) { return downcast<tms1024_device &>(device).m_write_port1.set_callback(object); }
@@ -98,7 +98,7 @@ protected:
class tms1025_device : public tms1024_device
{
public:
- tms1025_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms1025_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/machine/tms5501.cpp b/src/devices/machine/tms5501.cpp
index 4dfe350d631..71f3f298cde 100644
--- a/src/devices/machine/tms5501.cpp
+++ b/src/devices/machine/tms5501.cpp
@@ -53,7 +53,7 @@ ADDRESS_MAP_END
// tms5501_device - constructor
//-------------------------------------------------
-tms5501_device::tms5501_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+tms5501_device::tms5501_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, TMS5501, "TMS5501", tag, owner, clock, "tms5501", __FILE__),
device_serial_interface(mconfig, *this),
m_write_irq(*this),
@@ -275,7 +275,7 @@ READ8_MEMBER( tms5501_device::sta_r )
WRITE8_MEMBER( tms5501_device::cmd_w )
{
- if (LOG) logerror("TMS5501 '%s' Command %02x\n", tag().c_str(), data);
+ if (LOG) logerror("TMS5501 '%s' Command %02x\n", tag(), data);
m_cmd = data;
@@ -314,7 +314,7 @@ WRITE8_MEMBER( tms5501_device::cmd_w )
WRITE8_MEMBER( tms5501_device::rr_w )
{
- if (LOG) logerror("TMS5501 '%s' Rate Register %02x\n", tag().c_str(), data);
+ if (LOG) logerror("TMS5501 '%s' Rate Register %02x\n", tag(), data);
m_rr = data;
@@ -348,7 +348,7 @@ WRITE8_MEMBER( tms5501_device::rr_w )
WRITE8_MEMBER( tms5501_device::tb_w )
{
- if (LOG) logerror("TMS5501 '%s' Transmitter Buffer %02x\n", tag().c_str(), data);
+ if (LOG) logerror("TMS5501 '%s' Transmitter Buffer %02x\n", tag(), data);
m_tb = data;
@@ -373,7 +373,7 @@ WRITE8_MEMBER( tms5501_device::tb_w )
WRITE8_MEMBER( tms5501_device::xo_w )
{
- if (LOG) logerror("TMS5501 '%s' Output %02x\n", tag().c_str(), data);
+ if (LOG) logerror("TMS5501 '%s' Output %02x\n", tag(), data);
m_write_xo(data);
}
@@ -385,7 +385,7 @@ WRITE8_MEMBER( tms5501_device::xo_w )
WRITE8_MEMBER( tms5501_device::mr_w )
{
- if (LOG) logerror("TMS5501 '%s' Mask Register %02x\n", tag().c_str(), data);
+ if (LOG) logerror("TMS5501 '%s' Mask Register %02x\n", tag(), data);
m_mr = data;
@@ -399,7 +399,7 @@ WRITE8_MEMBER( tms5501_device::mr_w )
WRITE8_MEMBER( tms5501_device::tmr_w )
{
- if (LOG) logerror("TMS5501 '%s' Timer %u %02x\n", tag().c_str(), offset, data);
+ if (LOG) logerror("TMS5501 '%s' Timer %u %02x\n", tag(), offset, data);
m_timer[offset]->adjust(attotime::from_double((double) data / (clock() / 128.0)));
}
@@ -467,7 +467,7 @@ void tms5501_device::set_interrupt(UINT8 mask)
{
m_irq |= mask;
- if (LOG) logerror("TMS5501 '%s' Interrupt %02x\n", tag().c_str(), mask);
+ if (LOG) logerror("TMS5501 '%s' Interrupt %02x\n", tag(), mask);
check_interrupt();
}
@@ -483,7 +483,7 @@ void tms5501_device::check_interrupt()
if (state == ASSERT_LINE)
{
- if (LOG) logerror("TMS5501 '%s' Interrupt Assert\n", tag().c_str());
+ if (LOG) logerror("TMS5501 '%s' Interrupt Assert\n", tag());
m_sta |= STA_IP;
}
@@ -520,7 +520,7 @@ UINT8 tms5501_device::get_vector()
check_interrupt();
- if (LOG) logerror("%s: TMS5501 '%s' Interrupt Acknowledge %02x\n", machine().describe_context(), tag().c_str(), rst);
+ if (LOG) logerror("%s: TMS5501 '%s' Interrupt Acknowledge %02x\n", machine().describe_context(), tag(), rst);
break;
}
}
diff --git a/src/devices/machine/tms5501.h b/src/devices/machine/tms5501.h
index 3e3a03d13a2..b618266212c 100644
--- a/src/devices/machine/tms5501.h
+++ b/src/devices/machine/tms5501.h
@@ -67,7 +67,7 @@ class tms5501_device : public device_t,
{
public:
// construction/destruction
- tms5501_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms5501_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<tms5501_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_xmt_wr_callback(device_t &device, _Object object) { return downcast<tms5501_device &>(device).m_write_xmt.set_callback(object); }
diff --git a/src/devices/machine/tms6100.cpp b/src/devices/machine/tms6100.cpp
index 951536e8941..67eb9d17a14 100644
--- a/src/devices/machine/tms6100.cpp
+++ b/src/devices/machine/tms6100.cpp
@@ -27,7 +27,7 @@
const device_type TMS6100 = &device_creator<tms6100_device>;
-tms6100_device::tms6100_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+tms6100_device::tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_rom(*this, DEVICE_SELF),
m_reverse_bits(false),
@@ -35,7 +35,7 @@ tms6100_device::tms6100_device(const machine_config &mconfig, device_type type,
{
}
-tms6100_device::tms6100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS6100, "TMS6100", tag, owner, clock, "tms6100", __FILE__),
m_rom(*this, DEVICE_SELF),
m_reverse_bits(false),
@@ -45,7 +45,7 @@ tms6100_device::tms6100_device(const machine_config &mconfig, std::string tag, d
const device_type M58819 = &device_creator<m58819_device>;
-m58819_device::m58819_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+m58819_device::m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms6100_device(mconfig, M58819, "M58819S", tag, owner, clock, "m58819s", __FILE__)
{
}
diff --git a/src/devices/machine/tms6100.h b/src/devices/machine/tms6100.h
index a0130a51c10..cd802bab7d2 100644
--- a/src/devices/machine/tms6100.h
+++ b/src/devices/machine/tms6100.h
@@ -94,8 +94,8 @@
class tms6100_device : public device_t
{
public:
- tms6100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- tms6100_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
static void enable_4bit_mode(device_t &device) { downcast<tms6100_device &>(device).m_4bit_mode = true; }
@@ -140,7 +140,7 @@ protected:
class m58819_device : public tms6100_device
{
public:
- m58819_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/machine/tms9901.cpp b/src/devices/machine/tms9901.cpp
index 5ffca982353..8ca2f4b2bf7 100644
--- a/src/devices/machine/tms9901.cpp
+++ b/src/devices/machine/tms9901.cpp
@@ -134,7 +134,7 @@ TODO: Tests on a real machine
/*
Constructor
*/
-tms9901_device::tms9901_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms9901_device::tms9901_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS9901, "TMS9901 Programmable System Interface", tag, owner, clock, "tms9901", __FILE__),
m_read_block(*this),
m_write_p0(*this),
@@ -171,12 +171,12 @@ void tms9901_device::field_interrupts(void)
// if timer is enabled, INT3 pin is overridden by timer
if (m_timer_int_pending)
{
- if (TRACE_CLOCK) logerror("%s: timer fires\n", tag().c_str());
+ if (TRACE_CLOCK) logerror("%s: timer fires\n", tag());
current_ints |= TMS9901_INT3;
}
else
{
- if (TRACE_CLOCK) logerror("%s: timer clear\n", tag().c_str());
+ if (TRACE_CLOCK) logerror("%s: timer clear\n", tag());
current_ints &= ~TMS9901_INT3;
}
}
@@ -300,7 +300,7 @@ READ8_MEMBER( tms9901_device::read )
// Set those bits here
answer |= (m_pio_output_mirror & m_pio_direction_mirror) & 0xFF;
}
- if (TRACE_PINS) logerror("%s: input on lines INT7..CB = %02x\n", tag().c_str(), answer);
+ if (TRACE_PINS) logerror("%s: input on lines INT7..CB = %02x\n", tag(), answer);
break;
case 1:
if (m_clock_mode)
@@ -320,7 +320,7 @@ READ8_MEMBER( tms9901_device::read )
answer &= ~(m_pio_direction_mirror >> 8);
answer |= (m_pio_output_mirror & m_pio_direction_mirror) >> 8;
}
- if (TRACE_PINS) logerror("%s: input on lines INT15..INT8 = %02x\n", tag().c_str(), answer);
+ if (TRACE_PINS) logerror("%s: input on lines INT15..INT8 = %02x\n", tag(), answer);
break;
case 2:
/* exit timer mode */
@@ -334,7 +334,7 @@ READ8_MEMBER( tms9901_device::read )
answer &= ~m_pio_direction;
answer |= (m_pio_output & m_pio_direction) & 0xFF;
- if (TRACE_PINS) logerror("%s: input on lines P7..P0 = %02x\n", tag().c_str(), answer);
+ if (TRACE_PINS) logerror("%s: input on lines P7..P0 = %02x\n", tag(), answer);
break;
case 3:
@@ -347,7 +347,7 @@ READ8_MEMBER( tms9901_device::read )
answer &= ~(m_pio_direction >> 8);
answer |= (m_pio_output & m_pio_direction) >> 8;
- if (TRACE_PINS) logerror("%s: input on lines P15..P8 = %02x\n", tag().c_str(), answer);
+ if (TRACE_PINS) logerror("%s: input on lines P15..P8 = %02x\n", tag(), answer);
break;
}
@@ -376,7 +376,7 @@ WRITE8_MEMBER ( tms9901_device::write )
if (offset >= 0x10)
{
int pin = offset & 0x0F;
- if (TRACE_PINS) logerror("%s: output on P%d = %d\n", tag().c_str(), pin, data);
+ if (TRACE_PINS) logerror("%s: output on P%d = %d\n", tag(), pin, data);
int bit = (1 << pin);
@@ -454,12 +454,12 @@ WRITE8_MEMBER ( tms9901_device::write )
{
// Switch to interrupt mode; quit clock mode
m_clock_mode = false;
- if (TRACE_MODE) logerror("%s: int mode\n", tag().c_str());
+ if (TRACE_MODE) logerror("%s: int mode\n", tag());
}
else
{
m_clock_mode = true;
- if (TRACE_MODE) logerror("%s: clock mode\n", tag().c_str());
+ if (TRACE_MODE) logerror("%s: clock mode\n", tag());
// we are switching to clock mode: latch the current value of
// the decrementer register
if (m_clock_register != 0)
@@ -485,7 +485,7 @@ WRITE8_MEMBER ( tms9901_device::write )
// Spec is not clear on whether the mask bits are also reset by RST2*
// TODO: Check on a real machine. (I'd guess from the text they are not touched)
m_enabled_ints = 0;
- if (TRACE_MODE) logerror("%s: Soft reset (RST2*)\n", tag().c_str());
+ if (TRACE_MODE) logerror("%s: Soft reset (RST2*)\n", tag());
}
}
else
@@ -495,7 +495,7 @@ WRITE8_MEMBER ( tms9901_device::write )
else
m_enabled_ints &= ~0x4000; /* unset bit */
- if (TRACE_PINS) logerror("%s: interrupts = %04x\n", tag().c_str(), m_enabled_ints);
+ if (TRACE_PINS) logerror("%s: interrupts = %04x\n", tag(), m_enabled_ints);
field_interrupts(); /* changed interrupt state */
}
}
@@ -517,7 +517,7 @@ WRITE8_MEMBER ( tms9901_device::write )
m_clock_register &= ~bit; /* clear bit */
/* reset clock timer (page 8) */
- if (TRACE_CLOCK) logerror("%s: clock register = %04x\n", tag().c_str(), m_clock_register);
+ if (TRACE_CLOCK) logerror("%s: clock register = %04x\n", tag(), m_clock_register);
timer_reload();
}
else
@@ -532,7 +532,7 @@ WRITE8_MEMBER ( tms9901_device::write )
if (offset == 3)
m_timer_int_pending = false; /* SBO 3 clears pending timer interrupt (??) */
- if (TRACE_MODE) logerror("%s: enabled interrupts = %04x\n", tag().c_str(), m_enabled_ints);
+ if (TRACE_MODE) logerror("%s: enabled interrupts = %04x\n", tag(), m_enabled_ints);
field_interrupts(); /* changed interrupt state */
}
}
@@ -550,7 +550,7 @@ void tms9901_device::device_timer(emu_timer &timer, device_timer_id id, int para
if (id==DECREMENTER) // we have only that one
{
m_decrementer_value--;
- if (TRACE_CLOCK) logerror("%s: decrementer = %d\n", tag().c_str(), m_decrementer_value);
+ if (TRACE_CLOCK) logerror("%s: decrementer = %d\n", tag(), m_decrementer_value);
if (m_decrementer_value<=0)
{
m_timer_int_pending = true; // decrementer interrupt requested
diff --git a/src/devices/machine/tms9901.h b/src/devices/machine/tms9901.h
index bd0700aaa71..87d314e0685 100644
--- a/src/devices/machine/tms9901.h
+++ b/src/devices/machine/tms9901.h
@@ -56,7 +56,7 @@ enum
class tms9901_device : public device_t
{
public:
- tms9901_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms9901_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void set_single_int(int pin_number, int state);
diff --git a/src/devices/machine/tms9902.cpp b/src/devices/machine/tms9902.cpp
index 444e4b5033e..40194b312fe 100644
--- a/src/devices/machine/tms9902.cpp
+++ b/src/devices/machine/tms9902.cpp
@@ -60,7 +60,7 @@ enum
/*
Constructor
*/
-tms9902_device::tms9902_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tms9902_device::tms9902_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS9902, "TMS9902 ACC", tag, owner, clock, "tms9902", __FILE__),
m_int_cb(*this),
m_rcv_cb(*this),
diff --git a/src/devices/machine/tms9902.h b/src/devices/machine/tms9902.h
index b9f522dd977..f0ccf6c2b41 100644
--- a/src/devices/machine/tms9902.h
+++ b/src/devices/machine/tms9902.h
@@ -47,7 +47,7 @@ extern const device_type TMS9902;
class tms9902_device : public device_t
{
public:
- tms9902_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tms9902_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_int_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_int_cb.set_callback(object); }
template<class _Object> static devcb_base &set_rcv_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_rcv_cb.set_callback(object); }
diff --git a/src/devices/machine/upd1990a.cpp b/src/devices/machine/upd1990a.cpp
index a4245e29670..59f85d9c4ca 100644
--- a/src/devices/machine/upd1990a.cpp
+++ b/src/devices/machine/upd1990a.cpp
@@ -44,7 +44,7 @@ const device_type UPD4990A = &device_creator<upd4990a_device>;
// upd1990a_device - constructor
//-------------------------------------------------
-upd1990a_device::upd1990a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+upd1990a_device::upd1990a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_rtc_interface(mconfig, *this),
m_write_data(*this),
@@ -53,7 +53,7 @@ upd1990a_device::upd1990a_device(const machine_config &mconfig, device_type type
{
}
-upd1990a_device::upd1990a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd1990a_device::upd1990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD1990A, "uPD1990A", tag, owner, clock, "upd1990a", __FILE__),
device_rtc_interface(mconfig, *this),
m_write_data(*this),
@@ -62,7 +62,7 @@ upd1990a_device::upd1990a_device(const machine_config &mconfig, std::string tag,
{
}
-upd4990a_device::upd4990a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd4990a_device::upd4990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: upd1990a_device(mconfig, UPD4990A, "uPD4990A RTC", tag, owner, clock, TYPE_4990A, "upd4990a", __FILE__) { }
@@ -204,7 +204,7 @@ WRITE_LINE_MEMBER( upd1990a_device::stb_w )
if (!m_cs)
return;
- if (LOG) logerror("uPD1990A '%s' STB %u\n", tag().c_str(), state);
+ if (LOG) logerror("uPD1990A '%s' STB %u\n", tag(), state);
// rising edge
if (!m_stb && state)
@@ -219,7 +219,7 @@ WRITE_LINE_MEMBER( upd1990a_device::stb_w )
m_c = MODE_TEST;
}
- if (LOG) logerror("uPD1990A '%s' Command %x\n", tag().c_str(), m_c);
+ if (LOG) logerror("uPD1990A '%s' Command %x\n", tag(), m_c);
// common functions
if (m_c == MODE_REGISTER_HOLD || (m_c >= MODE_TP_64HZ && m_c < MODE_TEST))
@@ -390,7 +390,7 @@ WRITE_LINE_MEMBER( upd1990a_device::clk_w )
if (!m_cs)
return;
- if (LOG) logerror("uPD1990A '%s' CLK %u\n", tag().c_str(), state);
+ if (LOG) logerror("uPD1990A '%s' CLK %u\n", tag(), state);
// rising edge
if (!m_clk && state)
@@ -435,14 +435,14 @@ WRITE_LINE_MEMBER( upd1990a_device::clk_w )
WRITE_LINE_MEMBER( upd1990a_device::cs_w )
{
// chip select
- if (LOG) logerror("uPD1990A '%s' CS %u\n", tag().c_str(), state);
+ if (LOG) logerror("uPD1990A '%s' CS %u\n", tag(), state);
m_cs = state;
}
WRITE_LINE_MEMBER( upd1990a_device::oe_w )
{
// output enable
- if (LOG) logerror("uPD1990A '%s' OE %u\n", tag().c_str(), state);
+ if (LOG) logerror("uPD1990A '%s' OE %u\n", tag(), state);
int prev_oe = m_oe;
m_oe = state;
@@ -453,26 +453,26 @@ WRITE_LINE_MEMBER( upd1990a_device::oe_w )
WRITE_LINE_MEMBER( upd1990a_device::c0_w )
{
- if (LOG) logerror("uPD1990A '%s' C0 %u\n", tag().c_str(), state);
+ if (LOG) logerror("uPD1990A '%s' C0 %u\n", tag(), state);
m_c_unlatched = (m_c_unlatched & 0x06) | state;
}
WRITE_LINE_MEMBER( upd1990a_device::c1_w )
{
- if (LOG) logerror("uPD1990A '%s' C1 %u\n", tag().c_str(), state);
+ if (LOG) logerror("uPD1990A '%s' C1 %u\n", tag(), state);
m_c_unlatched = (m_c_unlatched & 0x05) | (state << 1);
}
WRITE_LINE_MEMBER( upd1990a_device::c2_w )
{
- if (LOG) logerror("uPD1990A '%s' C2 %u\n", tag().c_str(), state);
+ if (LOG) logerror("uPD1990A '%s' C2 %u\n", tag(), state);
m_c_unlatched = (m_c_unlatched & 0x03) | (state << 2);
}
WRITE_LINE_MEMBER( upd1990a_device::data_in_w )
{
// data input
- if (LOG) logerror("uPD1990A '%s' DATA IN %u\n", tag().c_str(), state);
+ if (LOG) logerror("uPD1990A '%s' DATA IN %u\n", tag(), state);
m_data_in = state;
}
diff --git a/src/devices/machine/upd1990a.h b/src/devices/machine/upd1990a.h
index ee8ed3bd1b2..3c80670ec8e 100644
--- a/src/devices/machine/upd1990a.h
+++ b/src/devices/machine/upd1990a.h
@@ -52,8 +52,8 @@ class upd1990a_device : public device_t,
{
public:
// construction/destruction
- upd1990a_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
- upd1990a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd1990a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ upd1990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _data> void set_data_callback(_data data) { m_write_data.set_callback(data); }
template<class _tp> void set_tp_callback(_tp tp) { m_write_tp.set_callback(tp); }
@@ -148,7 +148,7 @@ private:
class upd4990a_device : public upd1990a_device
{
public:
- upd4990a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd4990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/machine/upd4701.cpp b/src/devices/machine/upd4701.cpp
index 3e7ce6c8e7a..37e5d5dadd9 100644
--- a/src/devices/machine/upd4701.cpp
+++ b/src/devices/machine/upd4701.cpp
@@ -18,7 +18,7 @@
const device_type UPD4701 = &device_creator<upd4701_device>;
-upd4701_device::upd4701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd4701_device::upd4701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD4701, "uPD4701 Encoder", tag, owner, clock, "upd4701", __FILE__), m_cs(0), m_xy(0), m_ul(0), m_resetx(0), m_resety(0), m_latchx(0), m_latchy(0),
m_startx(0), m_starty(0), m_x(0), m_y(0), m_switches(0), m_latchswitches(0), m_cf(0)
{
diff --git a/src/devices/machine/upd4701.h b/src/devices/machine/upd4701.h
index d9c080d8820..d559e8e00b6 100644
--- a/src/devices/machine/upd4701.h
+++ b/src/devices/machine/upd4701.h
@@ -18,7 +18,7 @@
class upd4701_device : public device_t
{
public:
- upd4701_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd4701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void x_add( INT16 data );
void y_add( INT16 data );
diff --git a/src/devices/machine/upd4992.cpp b/src/devices/machine/upd4992.cpp
index 516e83c6f76..5e53da565a6 100644
--- a/src/devices/machine/upd4992.cpp
+++ b/src/devices/machine/upd4992.cpp
@@ -33,7 +33,7 @@ const device_type UPD4992 = &device_creator<upd4992_device>;
// upd4992_device - constructor
//-------------------------------------------------
-upd4992_device::upd4992_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd4992_device::upd4992_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD4992, "uPD4992 RTC", tag, owner, clock, "upd4992", __FILE__),
device_rtc_interface(mconfig, *this), m_timer_clock(nullptr)
{
diff --git a/src/devices/machine/upd4992.h b/src/devices/machine/upd4992.h
index 60d09a3bea7..23d7dc50cea 100644
--- a/src/devices/machine/upd4992.h
+++ b/src/devices/machine/upd4992.h
@@ -31,7 +31,7 @@ class upd4992_device : public device_t,
{
public:
// construction/destruction
- upd4992_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd4992_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/upd7002.cpp b/src/devices/machine/upd7002.cpp
index 4651b6cfabf..30803adc481 100644
--- a/src/devices/machine/upd7002.cpp
+++ b/src/devices/machine/upd7002.cpp
@@ -18,7 +18,7 @@
const device_type UPD7002 = &device_creator<upd7002_device>;
-upd7002_device::upd7002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd7002_device::upd7002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD7002, "uPD7002", tag, owner, clock, "upd7002", __FILE__), m_status(0), m_data1(0), m_data0(0), m_digitalvalue(0), m_conversion_counter(0)
{
}
diff --git a/src/devices/machine/upd7002.h b/src/devices/machine/upd7002.h
index 3824e0e5c6b..0875549f7e8 100644
--- a/src/devices/machine/upd7002.h
+++ b/src/devices/machine/upd7002.h
@@ -31,7 +31,7 @@ typedef device_delegate<void (int data)> upd7002_eoc_delegate;
class upd7002_device : public device_t
{
public:
- upd7002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd7002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~upd7002_device() {}
static void set_get_analogue_callback(device_t &device, upd7002_get_analogue_delegate callback) { downcast<upd7002_device &>(device).m_get_analogue_cb = callback; }
diff --git a/src/devices/machine/upd71071.cpp b/src/devices/machine/upd71071.cpp
index 64ff0531ee5..921c0bcc7a4 100644
--- a/src/devices/machine/upd71071.cpp
+++ b/src/devices/machine/upd71071.cpp
@@ -92,7 +92,7 @@
const device_type UPD71071 = &device_creator<upd71071_device>;
-upd71071_device::upd71071_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd71071_device::upd71071_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD71071, "NEC uPD71071", tag, owner, clock, "upd71071", __FILE__),
m_upd_clock(0),
m_out_hreq_cb(*this),
diff --git a/src/devices/machine/upd71071.h b/src/devices/machine/upd71071.h
index 2dc11d7e938..e63546a7f40 100644
--- a/src/devices/machine/upd71071.h
+++ b/src/devices/machine/upd71071.h
@@ -26,10 +26,10 @@ struct upd71071_reg
class upd71071_device : public device_t
{
public:
- upd71071_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd71071_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~upd71071_device() {}
- static void static_set_cpu_tag(device_t &device, std::string tag) { downcast<upd71071_device &>(device).m_cpu.set_tag(tag); }
+ static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<upd71071_device &>(device).m_cpu.set_tag(tag); }
static void set_clock(device_t &device, int clock) { downcast<upd71071_device &>(device).m_upd_clock = clock; }
template<class _Object> static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_hreq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_eop_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_eop_cb.set_callback(object); }
diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp
index 7b24b50dfe0..48901ef2314 100644
--- a/src/devices/machine/upd765.cpp
+++ b/src/devices/machine/upd765.cpp
@@ -108,7 +108,7 @@ ADDRESS_MAP_END
int upd765_family_device::rates[4] = { 500000, 300000, 250000, 1000000 };
-upd765_family_device::upd765_family_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+upd765_family_device::upd765_family_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
pc_fdc_interface(mconfig, type, name, tag, owner, clock, shortname, source),
intrq_cb(*this),
drq_cb(*this),
@@ -235,7 +235,7 @@ void upd765_family_device::soft_reset()
void upd765_family_device::tc_w(bool _tc)
{
- logerror("%s: tc=%d\n", tag().c_str(), _tc);
+ logerror("%s: tc=%d\n", tag(), _tc);
if(tc != _tc && _tc) {
live_sync();
tc_done = true;
@@ -304,7 +304,7 @@ READ8_MEMBER(upd765_family_device::dor_r)
WRITE8_MEMBER(upd765_family_device::dor_w)
{
- logerror("%s: dor = %02x\n", tag().c_str(), data);
+ logerror("%s: dor = %02x\n", tag(), data);
UINT8 diff = dor ^ data;
dor = data;
if(diff & 4)
@@ -367,7 +367,7 @@ READ8_MEMBER(upd765_family_device::msr_r)
WRITE8_MEMBER(upd765_family_device::dsr_w)
{
- logerror("%s: dsr_w %02x\n", tag().c_str(), data);
+ logerror("%s: dsr_w %02x\n", tag(), data);
if(data & 0x80)
soft_reset();
dsr = data & 0x7f;
@@ -386,7 +386,7 @@ READ8_MEMBER(upd765_family_device::fifo_r)
case PHASE_EXEC:
if(internal_drq)
return fifo_pop(false);
- logerror("%s: fifo_r in phase %d\n", tag().c_str(), main_phase);
+ logerror("%s: fifo_r in phase %d\n", tag(), main_phase);
break;
case PHASE_RESULT:
@@ -397,7 +397,7 @@ READ8_MEMBER(upd765_family_device::fifo_r)
main_phase = PHASE_CMD;
break;
default:
- logerror("%s: fifo_r in phase %d\n", tag().c_str(), main_phase);
+ logerror("%s: fifo_r in phase %d\n", tag(), main_phase);
break;
}
@@ -415,7 +415,7 @@ WRITE8_MEMBER(upd765_family_device::fifo_w)
if(cmd == C_INCOMPLETE)
break;
if(cmd == C_INVALID) {
- logerror("%s: Invalid on %02x\n", tag().c_str(), command[0]);
+ logerror("%s: Invalid on %02x\n", tag(), command[0]);
main_phase = PHASE_RESULT;
result[0] = ST0_UNK;
result_pos = 1;
@@ -430,11 +430,11 @@ WRITE8_MEMBER(upd765_family_device::fifo_w)
fifo_push(data, false);
return;
}
- logerror("%s: fifo_w in phase %d\n", tag().c_str(), main_phase);
+ logerror("%s: fifo_w in phase %d\n", tag(), main_phase);
break;
default:
- logerror("%s: fifo_w in phase %d\n", tag().c_str(), main_phase);
+ logerror("%s: fifo_w in phase %d\n", tag(), main_phase);
break;
}
}
@@ -501,7 +501,7 @@ void upd765_family_device::fifo_push(UINT8 data, bool internal)
if(fifo_pos == 16) {
if(internal) {
if(!(st1 & ST1_OR))
- logerror("%s: Fifo overrun\n", tag().c_str());
+ logerror("%s: Fifo overrun\n", tag());
st1 |= ST1_OR;
}
return;
@@ -522,7 +522,7 @@ UINT8 upd765_family_device::fifo_pop(bool internal)
if(!fifo_pos) {
if(internal) {
if(!(st1 & ST1_OR))
- logerror("%s: Fifo underrun\n", tag().c_str());
+ logerror("%s: Fifo underrun\n", tag());
st1 |= ST1_OR;
}
return 0;
@@ -1032,7 +1032,7 @@ void upd765_family_device::live_run(attotime limit)
live_write_mfm(byte);
if(cur_live.byte_counter == 19)
logerror("%s: formatting sector %02x %02x %02x %02x\n",
- tag().c_str(), command[12], command[13], command[14], command[15]);
+ tag(), command[12], command[13], command[14], command[15]);
} else if(cur_live.byte_counter < 22)
live_write_mfm(cur_live.crc >> 8);
else if(cur_live.byte_counter < 44)
@@ -1068,7 +1068,7 @@ void upd765_family_device::live_run(attotime limit)
live_write_fm(byte);
if(cur_live.byte_counter == 10)
logerror("%s: formatting sector %02x %02x %02x %02x\n",
- tag().c_str(), command[12], command[13], command[14], command[15]);
+ tag(), command[12], command[13], command[14], command[15]);
} else if(cur_live.byte_counter < 13)
live_write_fm(cur_live.crc >> 8);
else if(cur_live.byte_counter < 24)
@@ -1227,7 +1227,7 @@ void upd765_family_device::start_command(int cmd)
switch(cmd) {
case C_CONFIGURE:
logerror("%s: command configure %02x %02x %02x\n",
- tag().c_str(),
+ tag(),
command[1], command[2], command[3]);
// byte 1 is ignored, byte 3 is precompensation-related
fifocfg = command[2];
@@ -1236,7 +1236,7 @@ void upd765_family_device::start_command(int cmd)
break;
case C_DUMP_REG:
- logerror("%s: command dump regs\n", tag().c_str());
+ logerror("%s: command dump regs\n", tag());
main_phase = PHASE_RESULT;
result[0] = flopi[0].pcn;
result[1] = flopi[1].pcn;
@@ -1261,11 +1261,11 @@ void upd765_family_device::start_command(int cmd)
main_phase = PHASE_RESULT;
result[0] = locked ? 0x10 : 0x00;
result_pos = 1;
- logerror("%s: command lock (%s)\n", tag().c_str(), locked ? "on" : "off");
+ logerror("%s: command lock (%s)\n", tag(), locked ? "on" : "off");
break;
case C_PERPENDICULAR:
- logerror("%s: command perpendicular\n", tag().c_str());
+ logerror("%s: command perpendicular\n", tag());
perpmode = command[1];
main_phase = PHASE_CMD;
break;
@@ -1309,7 +1309,7 @@ void upd765_family_device::start_command(int cmd)
(fi.dev->wpt_r() ? ST3_WP : 0x00) |
(fi.dev->trk00_r() ? 0x00 : ST3_T0) |
(fi.dev->twosid_r() ? 0x00 : ST3_TS);
- logerror("%s: command sense drive status %d (%02x)\n", tag().c_str(), fi.id, result[0]);
+ logerror("%s: command sense drive status %d (%02x)\n", tag(), fi.id, result[0]);
result_pos = 1;
break;
}
@@ -1339,7 +1339,7 @@ void upd765_family_device::start_command(int cmd)
if(fid == 4) {
result[0] = ST0_UNK;
result_pos = 1;
- logerror("%s: command sense interrupt status (%02x)\n", tag().c_str(), result[0]);
+ logerror("%s: command sense interrupt status (%02x)\n", tag(), result[0]);
break;
}
@@ -1349,7 +1349,7 @@ void upd765_family_device::start_command(int cmd)
result[0] = fi.st0;
result[1] = fi.pcn;
- logerror("%s: command sense interrupt status (fid=%d %02x %02x)\n", tag().c_str(), fid, result[0], result[1]);
+ logerror("%s: command sense interrupt status (fid=%d %02x %02x)\n", tag(), fid, result[0], result[1]);
result_pos = 2;
other_irq = false;
@@ -1359,7 +1359,7 @@ void upd765_family_device::start_command(int cmd)
case C_SPECIFY:
logerror("%s: command specify %02x %02x\n",
- tag().c_str(),
+ tag(),
command[1], command[2]);
spec = (command[1] << 8) | command[2];
main_phase = PHASE_CMD;
@@ -1377,7 +1377,7 @@ void upd765_family_device::start_command(int cmd)
void upd765_family_device::command_end(floppy_info &fi, bool data_completion)
{
- logerror("%s: command done (%s) -", tag().c_str(), data_completion ? "data" : "seek");
+ logerror("%s: command done (%s) -", tag(), data_completion ? "data" : "seek");
for(int i=0; i != result_pos; i++)
logerror(" %02x", result[i]);
logerror("\n");
@@ -1394,7 +1394,7 @@ void upd765_family_device::command_end(floppy_info &fi, bool data_completion)
void upd765_family_device::recalibrate_start(floppy_info &fi)
{
- logerror("%s: command recalibrate\n", tag().c_str());
+ logerror("%s: command recalibrate\n", tag());
fi.main_state = RECALIBRATE;
fi.sub_state = SEEK_WAIT_STEP_TIME_DONE;
fi.dir = 1;
@@ -1404,7 +1404,7 @@ void upd765_family_device::recalibrate_start(floppy_info &fi)
void upd765_family_device::seek_start(floppy_info &fi)
{
- logerror("%s: command %sseek %d\n", tag().c_str(), command[0] & 0x80 ? "relative " : "", command[2]);
+ logerror("%s: command %sseek %d\n", tag(), command[0] & 0x80 ? "relative " : "", command[2]);
fi.main_state = SEEK;
fi.sub_state = SEEK_WAIT_STEP_TIME_DONE;
fi.dir = fi.pcn > command[2] ? 1 : 0;
@@ -1486,7 +1486,7 @@ void upd765_family_device::read_data_start(floppy_info &fi)
mfm = command[0] & 0x40;
logerror("%s: command read%s data%s%s%s%s cmd=%02x sel=%x chrn=(%d, %d, %d, %d) eot=%02x gpl=%02x dtl=%02x rate=%d\n",
- tag().c_str(),
+ tag(),
command[0] & 0x08 ? " deleted" : "",
command[0] & 0x80 ? " mt" : "",
command[0] & 0x40 ? " mfm" : "",
@@ -1531,7 +1531,7 @@ void upd765_family_device::scan_start(floppy_info &fi)
mfm = command[0] & 0x40;
logerror("%s: command scan%s data%s%s%s%s cmd=%02x sel=%x chrn=(%d, %d, %d, %d) eot=%02x gpl=%02x stp=%02x rate=%d\n",
- tag().c_str(),
+ tag(),
command[0] & 0x08 ? " deleted" : "",
command[0] & 0x80 ? " mt" : "",
command[0] & 0x40 ? " mfm" : "",
@@ -1638,7 +1638,7 @@ void upd765_family_device::read_data_continue(floppy_info &fi)
return;
}
logerror("%s: reading sector %02x %02x %02x %02x\n",
- tag().c_str(),
+ tag(),
cur_live.idbuf[0],
cur_live.idbuf[1],
cur_live.idbuf[2],
@@ -1725,7 +1725,7 @@ void upd765_family_device::write_data_start(floppy_info &fi)
fi.sub_state = HEAD_LOAD_DONE;
mfm = command[0] & 0x40;
logerror("%s: command write%s data%s%s cmd=%02x sel=%x chrn=(%d, %d, %d, %d) eot=%02x gpl=%02x dtl=%02x rate=%d\n",
- tag().c_str(),
+ tag(),
command[0] & 0x08 ? " deleted" : "",
command[0] & 0x80 ? " mt" : "",
command[0] & 0x40 ? " mfm" : "",
@@ -1853,7 +1853,7 @@ void upd765_family_device::read_track_start(floppy_info &fi)
sectors_read = 0;
logerror("%s: command read track%s cmd=%02x sel=%x chrn=(%d, %d, %d, %d) eot=%02x gpl=%02x dtl=%02x rate=%d\n",
- tag().c_str(),
+ tag(),
command[0] & 0x40 ? " mfm" : "",
command[0],
command[1],
@@ -1935,7 +1935,7 @@ void upd765_family_device::read_track_continue(floppy_info &fi)
return;
case WAIT_INDEX_DONE:
- logerror("%s: index found, reading track\n", tag().c_str());
+ logerror("%s: index found, reading track\n", tag());
fi.sub_state = SCAN_ID;
live_start(fi, SEARCH_ADDRESS_MARK_HEADER);
return;
@@ -1946,7 +1946,7 @@ void upd765_family_device::read_track_continue(floppy_info &fi)
}
st1 &= ~ST1_MA;
logerror("%s: reading sector %02x %02x %02x %02x\n",
- tag().c_str(),
+ tag(),
cur_live.idbuf[0],
cur_live.idbuf[1],
cur_live.idbuf[2],
@@ -2027,7 +2027,7 @@ void upd765_family_device::format_track_start(floppy_info &fi)
mfm = command[0] & 0x40;
logerror("%s: command format track %s h=%02x n=%02x sc=%02x gpl=%02x d=%02x\n",
- tag().c_str(),
+ tag(),
command[0] & 0x40 ? "mfm" : "fm",
command[1], command[2], command[3], command[4], command[5]);
@@ -2062,7 +2062,7 @@ void upd765_family_device::format_track_continue(floppy_info &fi)
return;
case WAIT_INDEX_DONE:
- logerror("%s: index found, writing track\n", tag().c_str());
+ logerror("%s: index found, writing track\n", tag());
fi.sub_state = TRACK_DONE;
cur_live.pll.start_writing(machine().time());
live_start(fi, WRITE_TRACK_PRE_SECTORS);
@@ -2095,7 +2095,7 @@ void upd765_family_device::read_id_start(floppy_info &fi)
mfm = command[0] & 0x40;
logerror("%s: command read id%s, rate=%d\n",
- tag().c_str(),
+ tag(),
command[0] & 0x40 ? " mfm" : "",
cur_rate);
@@ -2173,7 +2173,7 @@ void upd765_family_device::check_irq()
cur_irq = data_irq || other_irq || internal_drq;
cur_irq = cur_irq && (dor & 4) && (mode != MODE_AT || (dor & 8));
if(cur_irq != old_irq) {
- logerror("%s: irq = %d\n", tag().c_str(), cur_irq);
+ logerror("%s: irq = %d\n", tag(), cur_irq);
intrq_cb(cur_irq);
}
}
@@ -2231,7 +2231,7 @@ void upd765_family_device::run_drive_ready_polling()
for(int fid=0; fid<4; fid++) {
bool ready = get_ready(fid);
if(ready != flopi[fid].ready) {
- logerror("%s: polled %d : %d -> %d\n", tag().c_str(), fid, flopi[fid].ready, ready);
+ logerror("%s: polled %d : %d -> %d\n", tag(), fid, flopi[fid].ready, ready);
flopi[fid].ready = ready;
if(!flopi[fid].st0_filled) {
flopi[fid].st0 = ST0_ABRT | fid;
@@ -2415,7 +2415,7 @@ void upd765_family_device::live_write_fm(UINT8 fm)
bool upd765_family_device::sector_matches() const
{
if(0)
- logerror("%s: matching %02x %02x %02x %02x - %02x %02x %02x %02x\n", tag().c_str(),
+ logerror("%s: matching %02x %02x %02x %02x - %02x %02x %02x %02x\n", tag(),
cur_live.idbuf[0], cur_live.idbuf[1], cur_live.idbuf[2], cur_live.idbuf[3],
command[2], command[3], command[4], command[5]);
return
@@ -2425,67 +2425,67 @@ bool upd765_family_device::sector_matches() const
cur_live.idbuf[3] == command[5];
}
-upd765a_device::upd765a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD765A, "UPD765A", tag, owner, clock, "upd765a", __FILE__)
+upd765a_device::upd765a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD765A, "UPD765A", tag, owner, clock, "upd765a", __FILE__)
{
dor_reset = 0x0c;
}
-upd765b_device::upd765b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD765B, "UPD765B", tag, owner, clock, "upd765b", __FILE__)
+upd765b_device::upd765b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD765B, "UPD765B", tag, owner, clock, "upd765b", __FILE__)
{
dor_reset = 0x0c;
}
-i8272a_device::i8272a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, I8272A, "I8272A", tag, owner, clock, "i8272a", __FILE__)
+i8272a_device::i8272a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, I8272A, "I8272A", tag, owner, clock, "i8272a", __FILE__)
{
dor_reset = 0x0c;
}
-upd72065_device::upd72065_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD72065, "UPD72065", tag, owner, clock, "upd72065", __FILE__)
+upd72065_device::upd72065_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, UPD72065, "UPD72065", tag, owner, clock, "upd72065", __FILE__)
{
dor_reset = 0x0c;
}
-smc37c78_device::smc37c78_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, SMC37C78, "SMC37C78", tag, owner, clock, "smc37c78", __FILE__)
+smc37c78_device::smc37c78_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, SMC37C78, "SMC37C78", tag, owner, clock, "smc37c78", __FILE__)
{
ready_connected = false;
select_connected = true;
}
-n82077aa_device::n82077aa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, N82077AA, "N82077AA", tag, owner, clock, "n82077aa", __FILE__)
+n82077aa_device::n82077aa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, N82077AA, "N82077AA", tag, owner, clock, "n82077aa", __FILE__)
{
ready_connected = false;
select_connected = true;
}
-pc_fdc_superio_device::pc_fdc_superio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC FDC SUPERIO", tag, owner, clock, "pc_fdc_superio", __FILE__)
+pc_fdc_superio_device::pc_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC FDC SUPERIO", tag, owner, clock, "pc_fdc_superio", __FILE__)
{
ready_polled = false;
ready_connected = false;
select_connected = true;
}
-dp8473_device::dp8473_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "DP8473", tag, owner, clock, "dp8473", __FILE__)
+dp8473_device::dp8473_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "DP8473", tag, owner, clock, "dp8473", __FILE__)
{
ready_polled = false;
ready_connected = false;
select_connected = true;
}
-pc8477a_device::pc8477a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC8477A", tag, owner, clock, "pc8477a", __FILE__)
+pc8477a_device::pc8477a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "PC8477A", tag, owner, clock, "pc8477a", __FILE__)
{
ready_polled = true;
ready_connected = false;
select_connected = true;
}
-wd37c65c_device::wd37c65c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "WD37C65C", tag, owner, clock, "wd37c65c", __FILE__)
+wd37c65c_device::wd37c65c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd765_family_device(mconfig, PC_FDC_SUPERIO, "WD37C65C", tag, owner, clock, "wd37c65c", __FILE__)
{
ready_polled = true;
ready_connected = false;
select_connected = true;
}
-mcs3201_device::mcs3201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+mcs3201_device::mcs3201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
upd765_family_device(mconfig, MCS3201, "Motorola MCS3201", tag, owner, clock, "mcs3201", __FILE__),
m_input_handler(*this)
{
@@ -2506,7 +2506,7 @@ READ8_MEMBER( mcs3201_device::input_r )
return m_input_handler();
}
-tc8566af_device::tc8566af_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+tc8566af_device::tc8566af_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: upd765_family_device(mconfig, TC8566AF, "TC8566AF", tag, owner, clock, "tc8566af", __FILE__)
, m_cr1(0)
{
diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h
index fc7bac48cf2..19da61d4712 100644
--- a/src/devices/machine/upd765.h
+++ b/src/devices/machine/upd765.h
@@ -75,7 +75,7 @@ public:
typedef delegate<UINT8 ()> byte_read_cb;
typedef delegate<void (UINT8)> byte_write_cb;
- pc_fdc_interface(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) {}
+ pc_fdc_interface(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) {}
/* Note that the address map must cover and handle the whole 0-7
* range. The upd765, while conforming to the rest of the
@@ -95,7 +95,7 @@ class upd765_family_device : public pc_fdc_interface {
public:
enum { MODE_AT, MODE_PS2, MODE_M30 };
- upd765_family_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ upd765_family_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).intrq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).drq_cb.set_callback(object); }
@@ -417,77 +417,77 @@ protected:
class upd765a_device : public upd765_family_device {
public:
- upd765a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd765a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class upd765b_device : public upd765_family_device {
public:
- upd765b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd765b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class i8272a_device : public upd765_family_device {
public:
- i8272a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8272a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class smc37c78_device : public upd765_family_device {
public:
- smc37c78_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ smc37c78_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class upd72065_device : public upd765_family_device {
public:
- upd72065_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd72065_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class n82077aa_device : public upd765_family_device {
public:
- n82077aa_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ n82077aa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class pc_fdc_superio_device : public upd765_family_device {
public:
- pc_fdc_superio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pc_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class dp8473_device : public upd765_family_device {
public:
- dp8473_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ dp8473_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class pc8477a_device : public upd765_family_device {
public:
- pc8477a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ pc8477a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class wd37c65c_device : public upd765_family_device {
public:
- wd37c65c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ wd37c65c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
};
class mcs3201_device : public upd765_family_device {
public:
- mcs3201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mcs3201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_input_handler(device_t &device, _Object object) { return downcast<mcs3201_device &>(device).m_input_handler.set_callback(object); }
@@ -504,7 +504,7 @@ private:
class tc8566af_device : public upd765_family_device {
public:
- tc8566af_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ tc8566af_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual DECLARE_ADDRESS_MAP(map, 8) override;
diff --git a/src/devices/machine/v3021.cpp b/src/devices/machine/v3021.cpp
index 190d50f8ea0..ab0057d9951 100644
--- a/src/devices/machine/v3021.cpp
+++ b/src/devices/machine/v3021.cpp
@@ -33,7 +33,7 @@ const device_type v3021 = &device_creator<v3021_device>;
// v3021_device - constructor
//-------------------------------------------------
-v3021_device::v3021_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+v3021_device::v3021_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, v3021, "V3021 RTC", tag, owner, clock, "v3021", __FILE__), m_cal_mask(0), m_cal_com(0), m_cal_cnt(0), m_cal_val(0)
{
}
diff --git a/src/devices/machine/v3021.h b/src/devices/machine/v3021.h
index a99c09f2175..7e4844216c4 100644
--- a/src/devices/machine/v3021.h
+++ b/src/devices/machine/v3021.h
@@ -40,7 +40,7 @@ class v3021_device : public device_t
{
public:
// construction/destruction
- v3021_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ v3021_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/machine/vrc4373.cpp b/src/devices/machine/vrc4373.cpp
index f0ea9c894cc..c6797193c49 100644
--- a/src/devices/machine/vrc4373.cpp
+++ b/src/devices/machine/vrc4373.cpp
@@ -28,8 +28,8 @@ DEVICE_ADDRESS_MAP_START(target2_map, 32, vrc4373_device)
AM_RANGE(0x00000000, 0xFFFFFFFF) AM_READWRITE( target2_r, target2_w)
ADDRESS_MAP_END
-vrc4373_device::vrc4373_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
- : pci_host_device(mconfig, VRC4373, "NEC VRC4373 System Controller", tag, owner, clock, "vrc4373", __FILE__), m_cpu_space(nullptr), m_cpu(nullptr),
+vrc4373_device::vrc4373_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ : pci_host_device(mconfig, VRC4373, "NEC VRC4373 System Controller", tag, owner, clock, "vrc4373", __FILE__), m_cpu_space(nullptr), m_cpu(nullptr), cpu_tag(nullptr),
m_mem_config("memory_space", ENDIANNESS_LITTLE, 32, 32),
m_io_config("io_space", ENDIANNESS_LITTLE, 32, 32), m_ram_size(0), m_ram_base(0), m_simm_size(0), m_simm_base(0), m_pci1_laddr(0), m_pci2_laddr(0), m_pci_io_laddr(0), m_target1_laddr(0), m_target2_laddr(0)
@@ -96,13 +96,13 @@ void vrc4373_device::map_cpu_space()
m_cpu_space->install_ram(m_ram_base, m_ram_base+m_ram_size-1, &m_ram[0]);
m_cpu->add_fastram(m_ram_base, m_ram_size-1, FALSE, &m_ram[0]);
if (LOG_NILE)
- logerror("%s: map_cpu_space ram_size=%08X ram_base=%08X\n", tag().c_str(),m_ram_size,m_ram_base);
+ logerror("%s: map_cpu_space ram_size=%08X ram_base=%08X\n", tag(),m_ram_size,m_ram_base);
}
if (m_cpu_regs[NREG_SIMM1]&0x8) {
m_cpu_space->install_ram(m_simm_base, m_simm_base+m_simm_size-1, &m_simm[0]);
//m_cpu->add_fastram(m_simm_base, m_simm_size-1, FALSE, &m_simm[0]);
if (LOG_NILE)
- logerror("%s: map_cpu_space simm_size=%08X simm_base=%08X\n", tag().c_str(),m_simm_size,m_simm_base);
+ logerror("%s: map_cpu_space simm_size=%08X simm_base=%08X\n", tag(),m_simm_size,m_simm_base);
}
// PCI Master Window 1
@@ -113,7 +113,7 @@ void vrc4373_device::map_cpu_space()
m_cpu_space->install_read_handler(winStart, winEnd, 0, 0, read32_delegate(FUNC(vrc4373_device::master1_r), this));
m_cpu_space->install_write_handler(winStart, winEnd, 0, 0, write32_delegate(FUNC(vrc4373_device::master1_w), this));
if (LOG_NILE)
- logerror("%s: map_cpu_space Master Window 1 start=%08X end=%08X size=%08X laddr=%08X\n", tag().c_str(), winStart, winEnd, winSize, m_pci1_laddr);
+ logerror("%s: map_cpu_space Master Window 1 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_pci1_laddr);
}
// PCI Master Window 2
if (m_cpu_regs[NREG_PCIMW2]&0x1000) {
@@ -123,7 +123,7 @@ void vrc4373_device::map_cpu_space()
m_cpu_space->install_read_handler(winStart, winEnd, 0, 0, read32_delegate(FUNC(vrc4373_device::master2_r), this));
m_cpu_space->install_write_handler(winStart, winEnd, 0, 0, write32_delegate(FUNC(vrc4373_device::master2_w), this));
if (LOG_NILE)
- logerror("%s: map_cpu_space Master Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag().c_str(), winStart, winEnd, winSize, m_pci2_laddr);
+ logerror("%s: map_cpu_space Master Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_pci2_laddr);
}
// PCI IO Window
if (m_cpu_regs[NREG_PCIMIOW]&0x1000) {
@@ -133,7 +133,7 @@ void vrc4373_device::map_cpu_space()
m_cpu_space->install_read_handler(winStart, winEnd, 0, 0, read32_delegate(FUNC(vrc4373_device::master_io_r), this));
m_cpu_space->install_write_handler(winStart, winEnd, 0, 0, write32_delegate(FUNC(vrc4373_device::master_io_w), this));
if (LOG_NILE)
- logerror("%s: map_cpu_space IO Window start=%08X end=%08X size=%08X laddr=%08X\n", tag().c_str(), winStart, winEnd, winSize, m_pci_io_laddr);
+ logerror("%s: map_cpu_space IO Window start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_pci_io_laddr);
}
}
@@ -150,7 +150,7 @@ void vrc4373_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_
memory_space->install_read_handler(winStart, winEnd, 0, 0, read32_delegate(FUNC(vrc4373_device::target1_r), this));
memory_space->install_write_handler(winStart, winEnd, 0, 0, write32_delegate(FUNC(vrc4373_device::target1_w), this));
if (LOG_NILE)
- logerror("%s: map_extra Target Window 1 start=%08X end=%08X size=%08X laddr=%08X\n", tag().c_str(), winStart, winEnd, winSize, m_target1_laddr);
+ logerror("%s: map_extra Target Window 1 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_target1_laddr);
}
// PCI Target Window 2
if (m_cpu_regs[NREG_PCITW2]&0x1000) {
@@ -160,7 +160,7 @@ void vrc4373_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_
memory_space->install_read_handler(winStart, winEnd, 0, 0, read32_delegate(FUNC(vrc4373_device::target2_r), this));
memory_space->install_write_handler(winStart, winEnd, 0, 0, write32_delegate(FUNC(vrc4373_device::target2_w), this));
if (LOG_NILE)
- logerror("%s: map_extra Target Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag().c_str(), winStart, winEnd, winSize, m_target2_laddr);
+ logerror("%s: map_extra Target Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_target2_laddr);
}
}
@@ -169,10 +169,10 @@ void vrc4373_device::reset_all_mappings()
pci_device::reset_all_mappings();
}
-void vrc4373_device::set_cpu_tag(std::string _cpu_tag)
+void vrc4373_device::set_cpu_tag(const char *_cpu_tag)
{
if (LOG_NILE)
- logerror("%s: set_cpu_tag\n", tag().c_str());
+ logerror("%s: set_cpu_tag\n", tag());
cpu_tag = _cpu_tag;
}
// PCI bus control
diff --git a/src/devices/machine/vrc4373.h b/src/devices/machine/vrc4373.h
index 4af2e5e9e4a..bbd740b8084 100644
--- a/src/devices/machine/vrc4373.h
+++ b/src/devices/machine/vrc4373.h
@@ -61,13 +61,13 @@
class vrc4373_device : public pci_host_device {
public:
- vrc4373_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ vrc4373_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual void reset_all_mappings() override;
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override;
- void set_cpu_tag(std::string tag);
+ void set_cpu_tag(const char *tag);
virtual DECLARE_ADDRESS_MAP(config_map, 32) override;
@@ -103,7 +103,7 @@ protected:
private:
mips3_device *m_cpu;
- std::string cpu_tag;
+ const char *cpu_tag;
address_space_config m_mem_config, m_io_config;
diff --git a/src/devices/machine/vt82c496.cpp b/src/devices/machine/vt82c496.cpp
index fa6798c2858..8f24e2338fd 100644
--- a/src/devices/machine/vt82c496.cpp
+++ b/src/devices/machine/vt82c496.cpp
@@ -15,8 +15,8 @@
const device_type VT82C496 = &device_creator<vt82c496_device>;
-vt82c496_device::vt82c496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, VT82C496, "VIA VT82C496G system chipset", tag, owner, clock, "vt82c496", __FILE__), m_space(nullptr), m_ram(nullptr), m_rom(nullptr), m_reg_select(0)
+vt82c496_device::vt82c496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ : device_t(mconfig, VT82C496, "VIA VT82C496G system chipset", tag, owner, clock, "vt82c496", __FILE__), m_cpu_tag(nullptr), m_region_tag(nullptr), m_space(nullptr), m_ram(nullptr), m_rom(nullptr), m_reg_select(0)
{
}
diff --git a/src/devices/machine/vt82c496.h b/src/devices/machine/vt82c496.h
index 8ce78d8bdf8..d6c1c34e819 100644
--- a/src/devices/machine/vt82c496.h
+++ b/src/devices/machine/vt82c496.h
@@ -25,10 +25,10 @@ class vt82c496_device : public device_t
{
public:
// construction/destruction
- vt82c496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ vt82c496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- static void static_set_cpu(device_t &device, std::string tag) { dynamic_cast<vt82c496_device &>(device).m_cpu_tag = tag; }
- static void static_set_region(device_t &device, std::string tag) { dynamic_cast<vt82c496_device &>(device).m_region_tag = tag; }
+ static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast<vt82c496_device &>(device).m_cpu_tag = tag; }
+ static void static_set_region(device_t &device, const char *tag) { dynamic_cast<vt82c496_device &>(device).m_region_tag = tag; }
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
@@ -38,8 +38,8 @@ protected:
virtual void device_reset() override;
private:
- std::string m_cpu_tag;
- std::string m_region_tag;
+ const char* m_cpu_tag;
+ const char* m_region_tag;
// cpu_device* m_maincpu;
address_space* m_space;
ram_device* m_ram;
diff --git a/src/devices/machine/vt83c461.cpp b/src/devices/machine/vt83c461.cpp
index e27c3e58aa4..1957b848c9b 100644
--- a/src/devices/machine/vt83c461.cpp
+++ b/src/devices/machine/vt83c461.cpp
@@ -18,7 +18,7 @@
const device_type VT83C461 = &device_creator<vt83c461_device>;
-vt83c461_device::vt83c461_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+vt83c461_device::vt83c461_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
ide_controller_32_device(mconfig, VT83C461, "VIA VT83C461", tag, owner, clock, "vt83c461", __FILE__),
m_config_unknown(0),
m_config_register_num(0)
diff --git a/src/devices/machine/vt83c461.h b/src/devices/machine/vt83c461.h
index 6acc978b8c4..1fbe3a475bb 100644
--- a/src/devices/machine/vt83c461.h
+++ b/src/devices/machine/vt83c461.h
@@ -32,7 +32,7 @@
class vt83c461_device : public ide_controller_32_device
{
public:
- vt83c461_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ vt83c461_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ32_MEMBER(read_config);
DECLARE_WRITE32_MEMBER(write_config);
diff --git a/src/devices/machine/wd11c00_17.cpp b/src/devices/machine/wd11c00_17.cpp
index ca412f5122e..0f38c32c624 100644
--- a/src/devices/machine/wd11c00_17.cpp
+++ b/src/devices/machine/wd11c00_17.cpp
@@ -175,7 +175,7 @@ inline void wd11c00_17_device::select()
// wd11c00_17_device - constructor
//-------------------------------------------------
-wd11c00_17_device::wd11c00_17_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+wd11c00_17_device::wd11c00_17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, WD11C00_17, "Western Digital WD11C00-17", tag, owner, clock, "wd11c00_17", __FILE__),
m_out_irq5_cb(*this),
m_out_drq3_cb(*this),
@@ -245,7 +245,7 @@ READ8_MEMBER( wd11c00_17_device::io_r )
switch (offset)
{
case 0: // Read Data, Board to Host
- if (LOG) logerror("%s WD11C00-17 '%s' Read Data %03x:", machine().describe_context(), tag().c_str(), m_ra);
+ if (LOG) logerror("%s WD11C00-17 '%s' Read Data %03x:", machine().describe_context(), tag(), m_ra);
data = read_data();
if (LOG) logerror("%02x\n", data);
break;
@@ -276,23 +276,23 @@ WRITE8_MEMBER( wd11c00_17_device::io_w )
switch (offset)
{
case 0: // Write Data, Host to Board
- if (LOG) logerror("%s WD11C00-17 '%s' Write Data %03x:%02x\n", machine().describe_context(), tag().c_str(), m_ra, data);
+ if (LOG) logerror("%s WD11C00-17 '%s' Write Data %03x:%02x\n", machine().describe_context(), tag(), m_ra, data);
write_data(data);
break;
case 1: // Board Software Reset
- if (LOG) logerror("%s WD11C00-17 '%s' Software Reset\n", machine().describe_context(), tag().c_str());
+ if (LOG) logerror("%s WD11C00-17 '%s' Software Reset\n", machine().describe_context(), tag());
software_reset();
break;
case 2: // Board Select
- if (LOG) logerror("%s WD11C00-17 '%s' Select\n", machine().describe_context(), tag().c_str());
+ if (LOG) logerror("%s WD11C00-17 '%s' Select\n", machine().describe_context(), tag());
increment_address(); // HACK
select();
break;
case 3: // Set/Reset DMA, IRQ Masks
- if (LOG) logerror("%s WD11C00-17 '%s' Mask IRQ %u DMA %u\n", machine().describe_context(), tag().c_str(), BIT(data, 1), BIT(data, 0));
+ if (LOG) logerror("%s WD11C00-17 '%s' Mask IRQ %u DMA %u\n", machine().describe_context(), tag(), BIT(data, 1), BIT(data, 0));
m_mask = data;
check_interrupt();
break;
@@ -331,7 +331,7 @@ READ8_MEMBER( wd11c00_17_device::read )
switch (offset)
{
case 0x00:
- if (LOG) logerror("%s WD11C00-17 '%s' Read RAM %03x:", machine().describe_context(), tag().c_str(), m_ra);
+ if (LOG) logerror("%s WD11C00-17 '%s' Read RAM %03x:", machine().describe_context(), tag(), m_ra);
data = read_data();
if (LOG) logerror("%02x\n", data);
break;
@@ -354,7 +354,7 @@ WRITE8_MEMBER( wd11c00_17_device::write )
switch (offset)
{
case 0x00:
- if (LOG) logerror("%s WD11C00-17 '%s' Write RAM %03x:%02x\n", machine().describe_context(), tag().c_str(), m_ra, data);
+ if (LOG) logerror("%s WD11C00-17 '%s' Write RAM %03x:%02x\n", machine().describe_context(), tag(), m_ra, data);
write_data(data);
if (m_ra > 0x400) m_ecc_not_0 = 0; // HACK
break;
@@ -365,7 +365,7 @@ WRITE8_MEMBER( wd11c00_17_device::write )
case 0x60:
m_ra = (data & 0x07) << 8;
- if (LOG) logerror("%s WD11C00-17 '%s' RA %03x\n", machine().describe_context(), tag().c_str(), m_ra);
+ if (LOG) logerror("%s WD11C00-17 '%s' RA %03x\n", machine().describe_context(), tag(), m_ra);
check_interrupt();
break;
}
@@ -378,7 +378,7 @@ WRITE8_MEMBER( wd11c00_17_device::write )
WRITE_LINE_MEMBER( wd11c00_17_device::ireq_w )
{
- if (LOG) logerror("%s WD11C00-17 '%s' IREQ %u\n", machine().describe_context(), tag().c_str(), state);
+ if (LOG) logerror("%s WD11C00-17 '%s' IREQ %u\n", machine().describe_context(), tag(), state);
if (state) m_status |= STATUS_REQ; else m_status &= ~STATUS_REQ;
@@ -407,7 +407,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::ireq_w )
WRITE_LINE_MEMBER( wd11c00_17_device::io_w )
{
- if (LOG) logerror("%s WD11C00-17 '%s' I/O %u\n", machine().describe_context(), tag().c_str(), state);
+ if (LOG) logerror("%s WD11C00-17 '%s' I/O %u\n", machine().describe_context(), tag(), state);
if (state) m_status |= STATUS_I_O; else m_status &= ~STATUS_I_O;
}
@@ -419,7 +419,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::io_w )
WRITE_LINE_MEMBER( wd11c00_17_device::cd_w )
{
- if (LOG) logerror("%s WD11C00-17 '%s' C/D %u\n", machine().describe_context(), tag().c_str(), state);
+ if (LOG) logerror("%s WD11C00-17 '%s' C/D %u\n", machine().describe_context(), tag(), state);
if (state) m_status |= STATUS_C_D; else m_status &= ~STATUS_C_D;
}
@@ -431,7 +431,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::cd_w )
WRITE_LINE_MEMBER( wd11c00_17_device::clct_w )
{
- if (LOG) logerror("%s WD11C00-17 '%s' CLCT %u\n", machine().describe_context(), tag().c_str(), state);
+ if (LOG) logerror("%s WD11C00-17 '%s' CLCT %u\n", machine().describe_context(), tag(), state);
if (state)
{
@@ -447,7 +447,7 @@ WRITE_LINE_MEMBER( wd11c00_17_device::clct_w )
WRITE_LINE_MEMBER( wd11c00_17_device::mode_w )
{
- if (LOG) logerror("%s WD11C00-17 '%s' MODE %u\n", machine().describe_context(), tag().c_str(), state);
+ if (LOG) logerror("%s WD11C00-17 '%s' MODE %u\n", machine().describe_context(), tag(), state);
m_mode = state;
m_ecc_not_0 = state; // HACK
diff --git a/src/devices/machine/wd11c00_17.h b/src/devices/machine/wd11c00_17.h
index ac97a8617b0..7104e20c4dc 100644
--- a/src/devices/machine/wd11c00_17.h
+++ b/src/devices/machine/wd11c00_17.h
@@ -63,7 +63,7 @@ class wd11c00_17_device : public device_t
{
public:
// construction/destruction
- wd11c00_17_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ wd11c00_17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_irq5_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_irq5_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_drq3_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_drq3_cb.set_callback(object); }
diff --git a/src/devices/machine/wd2010.cpp b/src/devices/machine/wd2010.cpp
index 1c46377951d..a97b35b2517 100644
--- a/src/devices/machine/wd2010.cpp
+++ b/src/devices/machine/wd2010.cpp
@@ -142,7 +142,7 @@ const device_type WD2010 = &device_creator<wd2010_device>;
// wd2010_device - constructor
//-------------------------------------------------
-wd2010_device::wd2010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+wd2010_device::wd2010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, WD2010, "Western Digital WD2010", tag, owner, clock, "wd2010", __FILE__),
m_out_intrq_cb(*this),
m_out_bdrq_cb(*this),
@@ -245,10 +245,10 @@ READ8_MEMBER(wd2010_device::read)
if (offset == TASK_FILE_SDH_REGISTER)
{
- logerror("(READ) %s WD2010 '%s' SDH: %u\n", machine().describe_context(), tag().c_str(), data);
- logerror("(READ) %s WD2010 '%s' Head: %u\n", machine().describe_context(), tag().c_str(), HEAD);
- logerror("(READ) %s WD2010 '%s' Drive: %u\n", machine().describe_context(), tag().c_str(), DRIVE);
- logerror("(READ) %s WD2010 '%s' Sector Size: %u\n", machine().describe_context(), tag().c_str(), SECTOR_SIZE);
+ logerror("(READ) %s WD2010 '%s' SDH: %u\n", machine().describe_context(), tag(), data);
+ logerror("(READ) %s WD2010 '%s' Head: %u\n", machine().describe_context(), tag(), HEAD);
+ logerror("(READ) %s WD2010 '%s' Drive: %u\n", machine().describe_context(), tag(), DRIVE);
+ logerror("(READ) %s WD2010 '%s' Sector Size: %u\n", machine().describe_context(), tag(), SECTOR_SIZE);
}
break;
@@ -269,32 +269,32 @@ WRITE8_MEMBER(wd2010_device::write)
switch (offset)
{
case TASK_FILE_WRITE_PRECOMP_CYLINDER:
- if (LOG) logerror("%s WD2010 '%s' Write Precomp Cylinder: %u\n", machine().describe_context(), tag().c_str(), WRITE_PRECOMP_CYLINDER);
+ if (LOG) logerror("%s WD2010 '%s' Write Precomp Cylinder: %u\n", machine().describe_context(), tag(), WRITE_PRECOMP_CYLINDER);
break;
case TASK_FILE_SECTOR_COUNT:
- if (LOG) logerror("%s WD2010 '%s' Sector Count: %u\n", machine().describe_context(), tag().c_str(), SECTOR_COUNT);
+ if (LOG) logerror("%s WD2010 '%s' Sector Count: %u\n", machine().describe_context(), tag(), SECTOR_COUNT);
break;
case TASK_FILE_SECTOR_NUMBER:
- if (LOG) logerror("%s WD2010 '%s' Sector Number: %u\n", machine().describe_context(), tag().c_str(), SECTOR_NUMBER);
+ if (LOG) logerror("%s WD2010 '%s' Sector Number: %u\n", machine().describe_context(), tag(), SECTOR_NUMBER);
break;
case TASK_FILE_CYLINDER_LOW:
- if (LOG) logerror("%s WD2010 '%s' Cylinder (lower bits set): %u\n", machine().describe_context(), tag().c_str(), CYLINDER);
+ if (LOG) logerror("%s WD2010 '%s' Cylinder (lower bits set): %u\n", machine().describe_context(), tag(), CYLINDER);
break;
case TASK_FILE_CYLINDER_HIGH:
- if (LOG) logerror("%s WD2010 '%s' Cylinder (MSB bits set): %u\n", machine().describe_context(), tag().c_str(), CYLINDER);
+ if (LOG) logerror("%s WD2010 '%s' Cylinder (MSB bits set): %u\n", machine().describe_context(), tag(), CYLINDER);
break;
case TASK_FILE_SDH_REGISTER:
if (LOG)
{
- logerror("(WRITE) %s WD2010 '%s' SDH: %u\n", machine().describe_context(), tag().c_str(), data);
- logerror("(WRITE) %s WD2010 '%s' Head: %u\n", machine().describe_context(), tag().c_str(), HEAD);
- logerror("(WRITE) %s WD2010 '%s' Drive: %u\n", machine().describe_context(), tag().c_str(), DRIVE);
- logerror("(WRITE) %s WD2010 '%s' Sector Size: %u\n", machine().describe_context(), tag().c_str(), SECTOR_SIZE);
+ logerror("(WRITE) %s WD2010 '%s' SDH: %u\n", machine().describe_context(), tag(), data);
+ logerror("(WRITE) %s WD2010 '%s' Head: %u\n", machine().describe_context(), tag(), HEAD);
+ logerror("(WRITE) %s WD2010 '%s' Drive: %u\n", machine().describe_context(), tag(), DRIVE);
+ logerror("(WRITE) %s WD2010 '%s' Sector Size: %u\n", machine().describe_context(), tag(), SECTOR_SIZE);
}
break;
@@ -305,12 +305,12 @@ WRITE8_MEMBER(wd2010_device::write)
if (data == COMMAND_COMPUTE_CORRECTION)
{
- if (LOG) logerror("%s WD2010 '%s' COMPUTE CORRECTION\n", machine().describe_context(), tag().c_str());
+ if (LOG) logerror("%s WD2010 '%s' COMPUTE CORRECTION\n", machine().describe_context(), tag());
compute_correction(data);
}
else if ((data & COMMAND_SET_PARAMETER_MASK) == COMMAND_SET_PARAMETER)
{
- if (LOG) logerror("%s WD2010 '%s' SET PARAMETER\n", machine().describe_context(), tag().c_str());
+ if (LOG) logerror("%s WD2010 '%s' SET PARAMETER\n", machine().describe_context(), tag());
set_parameter(data);
}
else
@@ -318,32 +318,32 @@ WRITE8_MEMBER(wd2010_device::write)
switch (data & COMMAND_MASK)
{
case COMMAND_RESTORE:
- if (LOG) logerror("%s WD2010 '%s' RESTORE\n", machine().describe_context(), tag().c_str());
+ if (LOG) logerror("%s WD2010 '%s' RESTORE\n", machine().describe_context(), tag());
restore(data);
break;
case COMMAND_SEEK:
- if (LOG) logerror("%s WD2010 '%s' SEEK\n", machine().describe_context(), tag().c_str());
+ if (LOG) logerror("%s WD2010 '%s' SEEK\n", machine().describe_context(), tag());
seek(data);
break;
case COMMAND_READ_SECTOR:
- if (LOG) logerror("%s WD2010 '%s' READ SECTOR (I = %u) (M = %u)\n", machine().describe_context(), tag().c_str(), ((data & 8)>0), ((data & 4)>0));
+ if (LOG) logerror("%s WD2010 '%s' READ SECTOR (I = %u) (M = %u)\n", machine().describe_context(), tag(), ((data & 8)>0), ((data & 4)>0));
read_sector(data);
break;
case COMMAND_WRITE_SECTOR:
- if (LOG) logerror("%s WD2010 '%s' WRITE SECTOR (M = %u)\n", machine().describe_context(), tag().c_str(), ((data & 4) > 0));
+ if (LOG) logerror("%s WD2010 '%s' WRITE SECTOR (M = %u)\n", machine().describe_context(), tag(), ((data & 4) > 0));
write_sector(data);
break;
case COMMAND_SCAN_ID:
- if (LOG) logerror("%s WD2010 '%s' SCAN ID\n", machine().describe_context(), tag().c_str());
+ if (LOG) logerror("%s WD2010 '%s' SCAN ID\n", machine().describe_context(), tag());
scan_id(data);
break;
case COMMAND_WRITE_FORMAT:
- if (LOG) logerror("%s WD2010 '%s' WRITE FORMAT\n", machine().describe_context(), tag().c_str());
+ if (LOG) logerror("%s WD2010 '%s' WRITE FORMAT\n", machine().describe_context(), tag());
format(data);
break;
}
diff --git a/src/devices/machine/wd2010.h b/src/devices/machine/wd2010.h
index d30389dc381..204cb768385 100644
--- a/src/devices/machine/wd2010.h
+++ b/src/devices/machine/wd2010.h
@@ -75,7 +75,7 @@ class wd2010_device : public device_t
{
public:
// construction/destruction
- wd2010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ wd2010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_intrq_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_intrq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_bdrq_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_out_bdrq_cb.set_callback(object); }
diff --git a/src/devices/machine/wd33c93.cpp b/src/devices/machine/wd33c93.cpp
index 65dc4571ff6..2ae5f9d370a 100644
--- a/src/devices/machine/wd33c93.cpp
+++ b/src/devices/machine/wd33c93.cpp
@@ -723,7 +723,7 @@ READ8_MEMBER(wd33c93_device::read)
return 0;
}
-wd33c93_device::wd33c93_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+wd33c93_device::wd33c93_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
legacy_scsi_host_adapter(mconfig, WD33C93, "33C93 SCSI", tag, owner, clock, "wd33c93", __FILE__),
m_irq_cb(*this)
{
diff --git a/src/devices/machine/wd33c93.h b/src/devices/machine/wd33c93.h
index f006ee737c4..b749131d692 100644
--- a/src/devices/machine/wd33c93.h
+++ b/src/devices/machine/wd33c93.h
@@ -54,7 +54,7 @@ class wd33c93_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
- wd33c93_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ wd33c93_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<wd33c93_device &>(device).m_irq_cb.set_callback(object); }
diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp
index 5409e68aaef..63586c3d858 100644
--- a/src/devices/machine/wd7600.cpp
+++ b/src/devices/machine/wd7600.cpp
@@ -71,31 +71,31 @@ machine_config_constructor wd7600_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( wd7600 );
}
-void wd7600_device::static_set_cputag(device_t &device, std::string tag)
+void wd7600_device::static_set_cputag(device_t &device, const char *tag)
{
wd7600_device &chip = downcast<wd7600_device &>(device);
chip.m_cputag = tag;
}
-void wd7600_device::static_set_isatag(device_t &device, std::string tag)
+void wd7600_device::static_set_isatag(device_t &device, const char *tag)
{
wd7600_device &chip = downcast<wd7600_device &>(device);
chip.m_isatag = tag;
}
-void wd7600_device::static_set_biostag(device_t &device, std::string tag)
+void wd7600_device::static_set_biostag(device_t &device, const char *tag)
{
wd7600_device &chip = downcast<wd7600_device &>(device);
chip.m_biostag = tag;
}
-void wd7600_device::static_set_keybctag(device_t &device, std::string tag)
+void wd7600_device::static_set_keybctag(device_t &device, const char *tag)
{
wd7600_device &chip = downcast<wd7600_device &>(device);
chip.m_keybctag = tag;
}
-wd7600_device::wd7600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+wd7600_device::wd7600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, WD7600, "WD 7600 chipset", tag, owner, clock, "wd7600", __FILE__),
m_read_ior(*this),
m_write_iow(*this),
@@ -286,20 +286,20 @@ WRITE_LINE_MEMBER( wd7600_device::ctc_out2_w )
// Keyboard
WRITE8_MEMBER( wd7600_device::keyb_data_w )
{
-// if(LOG) logerror("WD7600 '%s': keyboard data write %02x\n", tag().c_str(), data);
+// if(LOG) logerror("WD7600 '%s': keyboard data write %02x\n", tag(), data);
m_keybc->data_w(space,0,data);
}
READ8_MEMBER( wd7600_device::keyb_data_r )
{
UINT8 ret = m_keybc->data_r(space,0);
-// if(LOG) logerror("WD7600 '%s': keyboard data read %02x\n", tag().c_str(), ret);
+// if(LOG) logerror("WD7600 '%s': keyboard data read %02x\n", tag(), ret);
return ret;
}
WRITE8_MEMBER( wd7600_device::keyb_cmd_w )
{
-// if(LOG) logerror("WD7600 '%s': keyboard command %02x\n", tag().c_str(), data);
+// if(LOG) logerror("WD7600 '%s': keyboard command %02x\n", tag(), data);
m_keybc->command_w(space,0,data);
}
@@ -443,7 +443,7 @@ WRITE8_MEMBER( wd7600_device::a20_reset_w )
{
m_write_cpureset(1);
m_write_cpureset(0);
- if(LOG) logerror("WD7600 '%s': System reset\n", tag().c_str());
+ if(LOG) logerror("WD7600 '%s': System reset\n",tag());
}
}
@@ -465,7 +465,7 @@ WRITE16_MEMBER(wd7600_device::refresh_w)
{
// TODO: select serial/parallel I/O port location
m_refresh_ctrl = data;
- if(LOG) logerror("WD7600 '%s': Refresh Control write %04x\n", tag().c_str(),data);
+ if(LOG) logerror("WD7600 '%s': Refresh Control write %04x\n",tag(),data);
}
// port 0x2872 - chip select
@@ -477,7 +477,7 @@ READ16_MEMBER(wd7600_device::chipsel_r)
WRITE16_MEMBER(wd7600_device::chipsel_w)
{
m_chip_sel = data;
- if(LOG) logerror("WD7600 '%s': Chip Select write %04x\n", tag().c_str(),data);
+ if(LOG) logerror("WD7600 '%s': Chip Select write %04x\n",tag(),data);
}
// port 0x3872 - Memory Control
@@ -489,7 +489,7 @@ READ16_MEMBER(wd7600_device::mem_ctrl_r)
WRITE16_MEMBER(wd7600_device::mem_ctrl_w)
{
m_memory_ctrl = data;
- if(LOG) logerror("WD7600 '%s': Memory Control write %04x\n", tag().c_str(),data);
+ if(LOG) logerror("WD7600 '%s': Memory Control write %04x\n",tag(),data);
}
// port 0x4872 - Bank 0 and 1 start address
@@ -503,12 +503,12 @@ WRITE16_MEMBER(wd7600_device::bank_01_start_w)
if(ACCESSING_BITS_0_7)
{
m_bank_start[0] = data & 0xff;
- if(LOG) logerror("WD7600 '%s': Bank 0 start address %08x\n", tag().c_str(),m_bank_start[0] << 16);
+ if(LOG) logerror("WD7600 '%s': Bank 0 start address %08x\n",tag(),m_bank_start[0] << 16);
}
if(ACCESSING_BITS_8_15)
{
m_bank_start[1] = (data & 0xff00) >> 8;
- if(LOG) logerror("WD7600 '%s': Bank 1 start address %08x\n", tag().c_str(),m_bank_start[1] << 16);
+ if(LOG) logerror("WD7600 '%s': Bank 1 start address %08x\n",tag(),m_bank_start[1] << 16);
}
}
@@ -523,12 +523,12 @@ WRITE16_MEMBER(wd7600_device::bank_23_start_w)
if(ACCESSING_BITS_0_7)
{
m_bank_start[2] = data & 0xff;
- if(LOG) logerror("WD7600 '%s': Bank 2 start address %08x\n", tag().c_str(),m_bank_start[2] << 16);
+ if(LOG) logerror("WD7600 '%s': Bank 2 start address %08x\n",tag(),m_bank_start[2] << 16);
}
if(ACCESSING_BITS_8_15)
{
m_bank_start[3] = (data & 0xff00) >> 8;
- if(LOG) logerror("WD7600 '%s': Bank 3 start address %08x\n", tag().c_str(),m_bank_start[3] << 16);
+ if(LOG) logerror("WD7600 '%s': Bank 3 start address %08x\n",tag(),m_bank_start[3] << 16);
}
}
@@ -541,7 +541,7 @@ READ16_MEMBER(wd7600_device::split_addr_r)
WRITE16_MEMBER(wd7600_device::split_addr_w)
{
m_split_start = data;
- if(LOG) logerror("WD7600 '%s': Split start address write %04x\n", tag().c_str(),data);
+ if(LOG) logerror("WD7600 '%s': Split start address write %04x\n",tag(),data);
}
// port 0x9872 - Diagnostic
@@ -553,5 +553,5 @@ READ16_MEMBER(wd7600_device::diag_r)
WRITE16_MEMBER(wd7600_device::diag_w)
{
m_diagnostic = data;
- if(LOG) logerror("WD7600 '%s': Diagnostic write %04x\n", tag().c_str(),data);
+ if(LOG) logerror("WD7600 '%s': Diagnostic write %04x\n",tag(),data);
}
diff --git a/src/devices/machine/wd7600.h b/src/devices/machine/wd7600.h
index e6c461079b1..25050c9fb0c 100644
--- a/src/devices/machine/wd7600.h
+++ b/src/devices/machine/wd7600.h
@@ -63,7 +63,7 @@ class wd7600_device : public device_t
{
public:
// construction/destruction
- wd7600_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ wd7600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -80,10 +80,10 @@ public:
template<class _spkr> void set_spkr_callback(_spkr spkr) { m_write_spkr.set_callback(spkr); }
// inline configuration
- static void static_set_cputag(device_t &device, std::string tag);
- static void static_set_isatag(device_t &device, std::string tag);
- static void static_set_biostag(device_t &device, std::string tag);
- static void static_set_keybctag(device_t &device, std::string tag);
+ static void static_set_cputag(device_t &device, const char *tag);
+ static void static_set_isatag(device_t &device, const char *tag);
+ static void static_set_biostag(device_t &device, const char *tag);
+ static void static_set_keybctag(device_t &device, const char *tag);
DECLARE_WRITE_LINE_MEMBER(rtc_irq_w);
DECLARE_WRITE_LINE_MEMBER( pic1_int_w ) { m_write_intr(state); }
@@ -203,10 +203,10 @@ private:
void a20m();
// internal state
- std::string m_cputag;
- std::string m_isatag;
- std::string m_biostag;
- std::string m_keybctag;
+ const char *m_cputag;
+ const char *m_isatag;
+ const char *m_biostag;
+ const char *m_keybctag;
UINT8 m_portb;
int m_iochck;
int m_nmi_mask;
diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp
index 3db68daeb20..32cda7b663c 100644
--- a/src/devices/machine/wd_fdc.cpp
+++ b/src/devices/machine/wd_fdc.cpp
@@ -65,7 +65,7 @@ const device_type WD1773 = &device_creator<wd1773_t>;
// Show state machine
#define TRACE_STATE 0
-wd_fdc_t::wd_fdc_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+wd_fdc_t::wd_fdc_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
intrq_cb(*this),
drq_cb(*this),
@@ -90,7 +90,7 @@ void wd_fdc_t::device_start()
enmf_cb.resolve();
if (!has_enmf && !enmf_cb.isnull())
- logerror("%s: Warning, this chip doesn't have an ENMF line.\n", tag().c_str());
+ logerror("%s: Warning, this chip doesn't have an ENMF line.\n", tag());
t_gen = timer_alloc(TM_GEN);
t_cmd = timer_alloc(TM_CMD);
@@ -190,13 +190,13 @@ void wd_fdc_t::set_floppy(floppy_image_device *_floppy)
void wd_fdc_t::dden_w(bool _dden)
{
if(disable_mfm) {
- logerror("%s: Error, this chip does not have a dden line\n", tag().c_str());
+ logerror("%s: Error, this chip does not have a dden line\n", tag());
return;
}
if(dden != _dden) {
dden = _dden;
- if (TRACE_LINES) logerror("%s: select %s\n", tag().c_str(), dden ? "fm" : "mfm");
+ if (TRACE_LINES) logerror("%s: select %s\n", tag(), dden ? "fm" : "mfm");
}
}
@@ -215,7 +215,7 @@ std::string wd_fdc_t::ttsn()
void wd_fdc_t::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
- if (TRACE_EVENT) logerror("%s: Event fired for timer %s\n", tag().c_str(), (id==TM_GEN)? "TM_GEN" : (id==TM_CMD)? "TM_CMD" : (id==TM_TRACK)? "TM_TRACK" : "TM_SECTOR");
+ if (TRACE_EVENT) logerror("%s: Event fired for timer %s\n", tag(), (id==TM_GEN)? "TM_GEN" : (id==TM_CMD)? "TM_CMD" : (id==TM_TRACK)? "TM_TRACK" : "TM_SECTOR");
live_sync();
switch(id) {
@@ -243,7 +243,7 @@ void wd_fdc_t::command_end()
void wd_fdc_t::seek_start(int state)
{
- if (TRACE_COMMAND) logerror("%s: seek %d (track=%d)\n", tag().c_str(), data, track);
+ if (TRACE_COMMAND) logerror("%s: seek %d (track=%d)\n", tag(), data, track);
main_state = state;
status &= ~(S_CRC|S_RNF|S_SPIN);
if(head_control) {
@@ -263,7 +263,7 @@ void wd_fdc_t::seek_continue()
for(;;) {
switch(sub_state) {
case SPINUP:
- if (TRACE_STATE) logerror("%s: SPINUP\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP\n", tag());
if(!(status & S_MON)) {
spinup();
return;
@@ -274,11 +274,11 @@ void wd_fdc_t::seek_continue()
break;
case SPINUP_WAIT:
- if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag());
return;
case SPINUP_DONE:
- if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag());
if(main_state == RESTORE && floppy && !floppy->trk00_r()) {
sub_state = SEEK_WAIT_STEP_TIME;
delay_cycles(t_gen, step_times[command & 3]);
@@ -296,7 +296,7 @@ void wd_fdc_t::seek_continue()
break;
case SEEK_MOVE:
- if (TRACE_STATE) logerror("%s: SEEK_MOVE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SEEK_MOVE\n", tag());
if(floppy) {
floppy->dir_w(last_dir);
floppy->stp_w(0);
@@ -312,11 +312,11 @@ void wd_fdc_t::seek_continue()
return;
case SEEK_WAIT_STEP_TIME:
- if (TRACE_STATE) logerror("%s: SEEK_WAIT_STEP_TIME\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SEEK_WAIT_STEP_TIME\n", tag());
return;
case SEEK_WAIT_STEP_TIME_DONE: {
- if (TRACE_STATE) logerror("%s: SEEK_WAIT_STEP_TIME_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SEEK_WAIT_STEP_TIME_DONE\n", tag());
bool done = false;
switch(main_state) {
case RESTORE:
@@ -349,16 +349,16 @@ void wd_fdc_t::seek_continue()
}
case SEEK_WAIT_STABILIZATION_TIME:
- if (TRACE_STATE) logerror("%s: SEEK_WAIT_STABILIZATION_TIME\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SEEK_WAIT_STABILIZATION_TIME\n", tag());
return;
case SEEK_WAIT_STABILIZATION_TIME_DONE:
- if (TRACE_STATE) logerror("%s: SEEK_WAIT_STABILIZATION_TIME_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SEEK_WAIT_STABILIZATION_TIME_DONE\n", tag());
sub_state = SEEK_DONE;
break;
case SEEK_DONE:
- if (TRACE_STATE) logerror("%s: SEEK_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SEEK_DONE\n", tag());
status |= S_HLD;
if(command & 0x04) {
if(!is_ready()) {
@@ -375,7 +375,7 @@ void wd_fdc_t::seek_continue()
return;
case SCAN_ID:
- if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag());
if(cur_live.idbuf[0] != track) {
live_start(SEARCH_ADDRESS_MARK_HEADER);
return;
@@ -389,7 +389,7 @@ void wd_fdc_t::seek_continue()
return;
case SCAN_ID_FAILED:
- if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag());
status |= S_RNF;
command_end();
return;
@@ -404,7 +404,7 @@ void wd_fdc_t::seek_continue()
bool wd_fdc_t::sector_matches() const
{
if(TRACE_MATCH)
- logerror("%s: matching read T=%02x H=%02x S=%02x L=%02x - searched T=%02x S=%02x\n", tag().c_str(),
+ logerror("%s: matching read T=%02x H=%02x S=%02x L=%02x - searched T=%02x S=%02x\n", tag(),
cur_live.idbuf[0], cur_live.idbuf[1], cur_live.idbuf[2], cur_live.idbuf[3],
track, sector);
@@ -425,7 +425,7 @@ bool wd_fdc_t::is_ready()
void wd_fdc_t::read_sector_start()
{
- if (TRACE_COMMAND) logerror("%s: read sector%s (c=%02x) t=%d, s=%d\n", tag().c_str(), command & 0x10 ? " multiple" : "", command, track, sector);
+ if (TRACE_COMMAND) logerror("%s: read sector%s (c=%02x) t=%d, s=%d\n", tag(), command & 0x10 ? " multiple" : "", command, track, sector);
if(!is_ready()) {
command_end();
return;
@@ -446,7 +446,7 @@ void wd_fdc_t::read_sector_continue()
for(;;) {
switch(sub_state) {
case SPINUP:
- if (TRACE_STATE) logerror("%s: SPINUP\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP\n", tag());
if(!(status & S_MON)) {
spinup();
return;
@@ -455,11 +455,11 @@ void wd_fdc_t::read_sector_continue()
break;
case SPINUP_WAIT:
- if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag());
return;
case SPINUP_DONE:
- if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag());
if(command & 4) {
sub_state = SETTLE_WAIT;
delay_cycles(t_gen, settle_time());
@@ -470,18 +470,18 @@ void wd_fdc_t::read_sector_continue()
}
case SETTLE_WAIT:
- if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag());
return;
case SETTLE_DONE:
- if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag());
sub_state = SCAN_ID;
counter = 0;
live_start(SEARCH_ADDRESS_MARK_HEADER);
return;
case SCAN_ID:
- if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag());
if(!sector_matches()) {
live_start(SEARCH_ADDRESS_MARK_HEADER);
return;
@@ -497,13 +497,13 @@ void wd_fdc_t::read_sector_continue()
return;
case SCAN_ID_FAILED:
- if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag());
status |= S_RNF;
command_end();
return;
case SECTOR_READ:
- if (TRACE_STATE) logerror("%s: SECTOR_READ\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SECTOR_READ\n", tag());
if(cur_live.crc)
status |= S_CRC;
@@ -525,7 +525,7 @@ void wd_fdc_t::read_sector_continue()
void wd_fdc_t::read_track_start()
{
- if (TRACE_COMMAND) logerror("%s: read track (c=%02x) t=%d\n", tag().c_str(), command, track);
+ if (TRACE_COMMAND) logerror("%s: read track (c=%02x) t=%d\n", tag(), command, track);
if(!is_ready()) {
command_end();
@@ -547,7 +547,7 @@ void wd_fdc_t::read_track_continue()
for(;;) {
switch(sub_state) {
case SPINUP:
- if (TRACE_STATE) logerror("%s: SPINUP\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP\n", tag());
if(!(status & S_MON)) {
spinup();
return;
@@ -556,11 +556,11 @@ void wd_fdc_t::read_track_continue()
break;
case SPINUP_WAIT:
- if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag());
return;
case SPINUP_DONE:
- if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag());
if(command & 4) {
sub_state = SETTLE_WAIT;
delay_cycles(t_gen, settle_time());
@@ -572,26 +572,26 @@ void wd_fdc_t::read_track_continue()
}
case SETTLE_WAIT:
- if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag());
return;
case SETTLE_DONE:
- if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag());
sub_state = WAIT_INDEX;
return;
case WAIT_INDEX:
- if (TRACE_STATE) logerror("%s: WAIT_INDEX\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: WAIT_INDEX\n", tag());
return;
case WAIT_INDEX_DONE:
- if (TRACE_STATE) logerror("%s: WAIT_INDEX_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: WAIT_INDEX_DONE\n", tag());
sub_state = TRACK_DONE;
live_start(READ_TRACK_DATA);
return;
case TRACK_DONE:
- if (TRACE_STATE) logerror("%s: TRACK_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: TRACK_DONE\n", tag());
command_end();
return;
@@ -604,7 +604,7 @@ void wd_fdc_t::read_track_continue()
void wd_fdc_t::read_id_start()
{
- if (TRACE_COMMAND) logerror("%s: read id (c=%02x)\n", tag().c_str(), command);
+ if (TRACE_COMMAND) logerror("%s: read id (c=%02x)\n", tag(), command);
if(!is_ready()) {
command_end();
return;
@@ -625,7 +625,7 @@ void wd_fdc_t::read_id_continue()
for(;;) {
switch(sub_state) {
case SPINUP:
- if (TRACE_STATE) logerror("%s: SPINUP\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP\n", tag());
if(!(status & S_MON)) {
spinup();
return;
@@ -634,11 +634,11 @@ void wd_fdc_t::read_id_continue()
break;
case SPINUP_WAIT:
- if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag());
return;
case SPINUP_DONE:
- if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag());
if(command & 4) {
sub_state = SETTLE_WAIT;
delay_cycles(t_gen, settle_time());
@@ -649,23 +649,23 @@ void wd_fdc_t::read_id_continue()
}
case SETTLE_WAIT:
- if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag());
return;
case SETTLE_DONE:
- if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag());
sub_state = SCAN_ID;
counter = 0;
live_start(SEARCH_ADDRESS_MARK_HEADER);
return;
case SCAN_ID:
- if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag());
command_end();
return;
case SCAN_ID_FAILED:
- if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag());
status |= S_RNF;
command_end();
return;
@@ -679,7 +679,7 @@ void wd_fdc_t::read_id_continue()
void wd_fdc_t::write_track_start()
{
- if (TRACE_COMMAND) logerror("%s: write track (c=%02x) t=%d\n", tag().c_str(), command, track);
+ if (TRACE_COMMAND) logerror("%s: write track (c=%02x) t=%d\n", tag(), command, track);
if(!is_ready()) {
command_end();
@@ -706,7 +706,7 @@ void wd_fdc_t::write_track_continue()
for(;;) {
switch(sub_state) {
case SPINUP:
- if (TRACE_STATE) logerror("%s: SPINUP\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP\n", tag());
if(!(status & S_MON)) {
spinup();
return;
@@ -715,11 +715,11 @@ void wd_fdc_t::write_track_continue()
break;
case SPINUP_WAIT:
- if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag());
return;
case SPINUP_DONE:
- if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag());
if(command & 4) {
sub_state = SETTLE_WAIT;
delay_cycles(t_gen, settle_time());
@@ -730,22 +730,22 @@ void wd_fdc_t::write_track_continue()
}
case SETTLE_WAIT:
- if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag());
return;
case SETTLE_DONE:
- if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag());
set_drq();
sub_state = DATA_LOAD_WAIT;
delay_cycles(t_gen, 192);
return;
case DATA_LOAD_WAIT:
- if (TRACE_STATE) logerror("%s: DATA_LOAD_WAIT\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: DATA_LOAD_WAIT\n", tag());
return;
case DATA_LOAD_WAIT_DONE:
- if (TRACE_STATE) logerror("%s: DATA_LOAD_WAIT_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: DATA_LOAD_WAIT_DONE\n", tag());
if(drq) {
status |= S_LOST;
drop_drq();
@@ -756,18 +756,18 @@ void wd_fdc_t::write_track_continue()
break;
case WAIT_INDEX:
- if (TRACE_STATE) logerror("%s: WAIT_INDEX\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: WAIT_INDEX\n", tag());
return;
case WAIT_INDEX_DONE:
- if (TRACE_STATE) logerror("%s: WAIT_INDEX_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: WAIT_INDEX_DONE\n", tag());
sub_state = TRACK_DONE;
live_start(WRITE_TRACK_DATA);
pll_start_writing(machine().time());
return;
case TRACK_DONE:
- if (TRACE_STATE) logerror("%s: TRACK_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: TRACK_DONE\n", tag());
if(format_last_byte_count) {
char buf[32];
if(format_last_byte_count > 1)
@@ -776,7 +776,7 @@ void wd_fdc_t::write_track_continue()
sprintf(buf, "%02x", format_last_byte);
format_description_string += buf;
}
- if (TRACE_DESC) logerror("%s: track description %s\n", tag().c_str(), format_description_string.c_str());
+ if (TRACE_DESC) logerror("%s: track description %s\n", tag(), format_description_string.c_str());
command_end();
return;
@@ -790,7 +790,7 @@ void wd_fdc_t::write_track_continue()
void wd_fdc_t::write_sector_start()
{
- if (TRACE_COMMAND) logerror("%s: write sector%s (c=%02x) t=%d, s=%d\n", tag().c_str(), command & 0x10 ? " multiple" : "", command, track, sector);
+ if (TRACE_COMMAND) logerror("%s: write sector%s (c=%02x) t=%d, s=%d\n", tag(), command & 0x10 ? " multiple" : "", command, track, sector);
if(!is_ready()) {
command_end();
@@ -812,7 +812,7 @@ void wd_fdc_t::write_sector_continue()
for(;;) {
switch(sub_state) {
case SPINUP:
- if (TRACE_STATE) logerror("%s: SPINUP\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP\n", tag());
if(!(status & S_MON)) {
spinup();
return;
@@ -821,11 +821,11 @@ void wd_fdc_t::write_sector_continue()
break;
case SPINUP_WAIT:
- if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP_WAIT\n", tag());
return;
case SPINUP_DONE:
- if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SPINUP_DONE\n", tag());
if(command & 4) {
sub_state = SETTLE_WAIT;
delay_cycles(t_gen, settle_time());
@@ -836,18 +836,18 @@ void wd_fdc_t::write_sector_continue()
}
case SETTLE_WAIT:
- if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SETTLE_WAIT\n", tag());
return;
case SETTLE_DONE:
- if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SETTLE_DONE\n", tag());
sub_state = SCAN_ID;
counter = 0;
live_start(SEARCH_ADDRESS_MARK_HEADER);
return;
case SCAN_ID:
- if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SCAN_ID\n", tag());
if(!sector_matches()) {
live_start(SEARCH_ADDRESS_MARK_HEADER);
return;
@@ -863,13 +863,13 @@ void wd_fdc_t::write_sector_continue()
return;
case SCAN_ID_FAILED:
- if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SCAN_ID_FAILED\n", tag());
status |= S_RNF;
command_end();
return;
case SECTOR_WRITE:
- if (TRACE_STATE) logerror("%s: SECTOR_WRITE\n", tag().c_str());
+ if (TRACE_STATE) logerror("%s: SECTOR_WRITE\n", tag());
if(command & 0x10) {
sector++;
sub_state = SPINUP_DONE;
@@ -888,7 +888,7 @@ void wd_fdc_t::write_sector_continue()
void wd_fdc_t::interrupt_start()
{
- if (TRACE_COMMAND) logerror("%s: Forced interrupt (c=%02x)\n", tag().c_str(), command);
+ if (TRACE_COMMAND) logerror("%s: Forced interrupt (c=%02x)\n", tag(), command);
if(status & S_BUSY) {
main_state = sub_state = cur_live.state = IDLE;
@@ -1052,7 +1052,7 @@ void wd_fdc_t::do_cmd_w()
void wd_fdc_t::cmd_w(UINT8 val)
{
- if (TRACE_COMP) logerror("%s: Initiating command %02x\n", tag().c_str(), val);
+ if (TRACE_COMP) logerror("%s: Initiating command %02x\n", tag(), val);
if (inverted_bus) val ^= 0xff;
if(intrq && !(intrq_cond & I_IMM)) {
@@ -1489,7 +1489,7 @@ bool wd_fdc_t::write_one_bit(const attotime &limit)
void wd_fdc_t::live_write_raw(UINT16 raw)
{
- if (TRACE_WRITE) logerror("%s: write raw %04x, CRC=%04x\n", tag().c_str(), raw, cur_live.crc);
+ if (TRACE_WRITE) logerror("%s: write raw %04x, CRC=%04x\n", tag(), raw, cur_live.crc);
cur_live.shift_reg = raw;
cur_live.data_bit_context = raw & 1;
}
@@ -1508,7 +1508,7 @@ void wd_fdc_t::live_write_mfm(UINT8 mfm)
}
cur_live.shift_reg = raw;
cur_live.data_bit_context = context;
- if (TRACE_WRITE) logerror("%s: live_write_mfm byte=%02x, raw=%04x, CRC=%04x\n", tag().c_str(), mfm, raw, cur_live.crc);
+ if (TRACE_WRITE) logerror("%s: live_write_mfm byte=%02x, raw=%04x, CRC=%04x\n", tag(), mfm, raw, cur_live.crc);
}
@@ -1521,7 +1521,7 @@ void wd_fdc_t::live_write_fm(UINT8 fm)
cur_live.data_reg = fm;
cur_live.shift_reg = raw;
cur_live.data_bit_context = fm & 1;
- if (TRACE_WRITE) logerror("%s: live_write_fm byte=%02x, raw=%04x, CRC=%04x\n", tag().c_str(), fm, raw, cur_live.crc);
+ if (TRACE_WRITE) logerror("%s: live_write_fm byte=%02x, raw=%04x, CRC=%04x\n", tag(), fm, raw, cur_live.crc);
}
void wd_fdc_t::live_run(attotime limit)
@@ -2125,7 +2125,7 @@ int wd_fdc_t::settle_time() const
return 60000;
}
-wd_fdc_analog_t::wd_fdc_analog_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+wd_fdc_analog_t::wd_fdc_analog_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
wd_fdc_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
clock_ratio = 1;
@@ -2177,7 +2177,7 @@ bool wd_fdc_analog_t::pll_write_next_bit(bool bit, attotime &tm, floppy_image_de
return cur_pll.write_next_bit(bit, tm, floppy, limit);
}
-wd_fdc_digital_t::wd_fdc_digital_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+wd_fdc_digital_t::wd_fdc_digital_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
wd_fdc_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
clock_ratio = 4;
@@ -2386,7 +2386,7 @@ void wd_fdc_digital_t::digital_pll_t::commit(floppy_image_device *floppy, const
write_position = 0;
}
-fd1771_t::fd1771_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1771, "FD1771", tag, owner, clock, "fd1771", __FILE__)
+fd1771_t::fd1771_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1771, "FD1771", tag, owner, clock, "fd1771", __FILE__)
{
const static int fd1771_step_times[4] = { 12000, 12000, 20000, 40000 };
@@ -2411,7 +2411,7 @@ int fd1771_t::calc_sector_size(UINT8 size, UINT8 command) const
return size ? size << 4 : 4096;
}
-fd1781_t::fd1781_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1781, "FD1781", tag, owner, clock, "fd1781", __FILE__)
+fd1781_t::fd1781_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1781, "FD1781", tag, owner, clock, "fd1781", __FILE__)
{
const static int fd1781_step_times[4] = { 6000, 12000, 20000, 40000 };
@@ -2439,7 +2439,7 @@ int fd1781_t::calc_sector_size(UINT8 size, UINT8 command) const
const int wd_fdc_t::fd179x_step_times[4] = { 6000, 12000, 20000, 30000 };
const int wd_fdc_t::fd176x_step_times[4] = { 12000, 24000, 40000, 60000 };
-fd1791_t::fd1791_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1791, "FD1791", tag, owner, clock, "fd1791", __FILE__)
+fd1791_t::fd1791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1791, "FD1791", tag, owner, clock, "fd1791", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2455,7 +2455,7 @@ fd1791_t::fd1791_t(const machine_config &mconfig, std::string tag, device_t *own
nonsticky_immint = false;
}
-fd1792_t::fd1792_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1792, "FD1792", tag, owner, clock, "fd1792", __FILE__)
+fd1792_t::fd1792_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1792, "FD1792", tag, owner, clock, "fd1792", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2471,7 +2471,7 @@ fd1792_t::fd1792_t(const machine_config &mconfig, std::string tag, device_t *own
nonsticky_immint = false;
}
-fd1793_t::fd1793_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1793, "FD1793", tag, owner, clock, "fd1793", __FILE__)
+fd1793_t::fd1793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1793, "FD1793", tag, owner, clock, "fd1793", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2487,7 +2487,7 @@ fd1793_t::fd1793_t(const machine_config &mconfig, std::string tag, device_t *own
nonsticky_immint = false;
}
-kr1818vg93_t::kr1818vg93_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, KR1818VG93, "KR1818VG93", tag, owner, clock, "kr1818vg93", __FILE__)
+kr1818vg93_t::kr1818vg93_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, KR1818VG93, "KR1818VG93", tag, owner, clock, "kr1818vg93", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2503,7 +2503,7 @@ kr1818vg93_t::kr1818vg93_t(const machine_config &mconfig, std::string tag, devic
nonsticky_immint = true;
}
-fd1794_t::fd1794_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1794, "FD1794", tag, owner, clock, "fd1794", __FILE__)
+fd1794_t::fd1794_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1794, "FD1794", tag, owner, clock, "fd1794", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2519,7 +2519,7 @@ fd1794_t::fd1794_t(const machine_config &mconfig, std::string tag, device_t *own
nonsticky_immint = false;
}
-fd1795_t::fd1795_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1795, "FD1795", tag, owner, clock, "fd1795", __FILE__)
+fd1795_t::fd1795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1795, "FD1795", tag, owner, clock, "fd1795", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2543,7 +2543,7 @@ int fd1795_t::calc_sector_size(UINT8 size, UINT8 command) const
return 128 << ((size + 1) & 3);
}
-fd1797_t::fd1797_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1797, "FD1797", tag, owner, clock, "fd1797", __FILE__)
+fd1797_t::fd1797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1797, "FD1797", tag, owner, clock, "fd1797", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2567,7 +2567,7 @@ int fd1797_t::calc_sector_size(UINT8 size, UINT8 command) const
return 128 << ((size + 1) & 3);
}
-mb8866_t::mb8866_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8866, "MB8866", tag, owner, clock, "mb8866", __FILE__)
+mb8866_t::mb8866_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8866, "MB8866", tag, owner, clock, "mb8866", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2583,7 +2583,7 @@ mb8866_t::mb8866_t(const machine_config &mconfig, std::string tag, device_t *own
nonsticky_immint = false;
}
-mb8876_t::mb8876_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8876, "MB8876", tag, owner, clock, "mb8876", __FILE__)
+mb8876_t::mb8876_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8876, "MB8876", tag, owner, clock, "mb8876", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2599,7 +2599,7 @@ mb8876_t::mb8876_t(const machine_config &mconfig, std::string tag, device_t *own
nonsticky_immint = false;
}
-mb8877_t::mb8877_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8877, "MB8877", tag, owner, clock, "mb8877", __FILE__)
+mb8877_t::mb8877_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8877, "MB8877", tag, owner, clock, "mb8877", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 4;
@@ -2615,7 +2615,7 @@ mb8877_t::mb8877_t(const machine_config &mconfig, std::string tag, device_t *own
nonsticky_immint = false;
}
-fd1761_t::fd1761_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1761, "FD1761", tag, owner, clock, "fd1761", __FILE__)
+fd1761_t::fd1761_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1761, "FD1761", tag, owner, clock, "fd1761", __FILE__)
{
step_times = fd176x_step_times;
delay_register_commit = 16;
@@ -2631,7 +2631,7 @@ fd1761_t::fd1761_t(const machine_config &mconfig, std::string tag, device_t *own
nonsticky_immint = false;
}
-fd1763_t::fd1763_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1763, "FD1763", tag, owner, clock, "fd1763", __FILE__)
+fd1763_t::fd1763_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1763, "FD1763", tag, owner, clock, "fd1763", __FILE__)
{
step_times = fd176x_step_times;
delay_register_commit = 16;
@@ -2647,7 +2647,7 @@ fd1763_t::fd1763_t(const machine_config &mconfig, std::string tag, device_t *own
nonsticky_immint = false;
}
-fd1765_t::fd1765_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1765, "FD1765", tag, owner, clock, "fd1765", __FILE__)
+fd1765_t::fd1765_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1765, "FD1765", tag, owner, clock, "fd1765", __FILE__)
{
step_times = fd176x_step_times;
delay_register_commit = 16;
@@ -2671,7 +2671,7 @@ int fd1765_t::calc_sector_size(UINT8 size, UINT8 command) const
return 128 << ((size + 1) & 3);
}
-fd1767_t::fd1767_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1767, "FD1767", tag, owner, clock, "fd1767", __FILE__)
+fd1767_t::fd1767_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1767, "FD1767", tag, owner, clock, "fd1767", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 16;
@@ -2695,7 +2695,7 @@ int fd1767_t::calc_sector_size(UINT8 size, UINT8 command) const
return 128 << ((size + 1) & 3);
}
-wd2791_t::wd2791_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2791, "WD2791", tag, owner, clock, "wd2791", __FILE__)
+wd2791_t::wd2791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2791, "WD2791", tag, owner, clock, "wd2791", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 16;
@@ -2711,7 +2711,7 @@ wd2791_t::wd2791_t(const machine_config &mconfig, std::string tag, device_t *own
nonsticky_immint = false;
}
-wd2793_t::wd2793_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2793, "WD2793", tag, owner, clock, "wd2793", __FILE__)
+wd2793_t::wd2793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2793, "WD2793", tag, owner, clock, "wd2793", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 16;
@@ -2727,7 +2727,7 @@ wd2793_t::wd2793_t(const machine_config &mconfig, std::string tag, device_t *own
nonsticky_immint = false;
}
-wd2795_t::wd2795_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2795, "WD2795", tag, owner, clock, "wd2795", __FILE__)
+wd2795_t::wd2795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2795, "WD2795", tag, owner, clock, "wd2795", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 16;
@@ -2751,7 +2751,7 @@ int wd2795_t::calc_sector_size(UINT8 size, UINT8 command) const
return 128 << ((size + 1) & 3);
}
-wd2797_t::wd2797_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2797, "WD2797", tag, owner, clock, "wd2797", __FILE__)
+wd2797_t::wd2797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2797, "WD2797", tag, owner, clock, "wd2797", __FILE__)
{
step_times = fd179x_step_times;
delay_register_commit = 16;
@@ -2775,7 +2775,7 @@ int wd2797_t::calc_sector_size(UINT8 size, UINT8 command) const
return 128 << ((size + 1) & 3);
}
-wd1770_t::wd1770_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1770, "WD1770", tag, owner, clock, "wd1770", __FILE__)
+wd1770_t::wd1770_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1770, "WD1770", tag, owner, clock, "wd1770", __FILE__)
{
step_times = wd_digital_step_times;
delay_register_commit = 32;
@@ -2791,7 +2791,7 @@ wd1770_t::wd1770_t(const machine_config &mconfig, std::string tag, device_t *own
nonsticky_immint = false;
}
-wd1772_t::wd1772_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1772, "WD1772", tag, owner, clock, "wd1772", __FILE__)
+wd1772_t::wd1772_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1772, "WD1772", tag, owner, clock, "wd1772", __FILE__)
{
const static int wd1772_step_times[4] = { 12000, 24000, 4000, 6000 };
@@ -2814,7 +2814,7 @@ int wd1772_t::settle_time() const
return 30000;
}
-wd1773_t::wd1773_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1773, "WD1773", tag, owner, clock, "wd1773", __FILE__)
+wd1773_t::wd1773_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1773, "WD1773", tag, owner, clock, "wd1773", __FILE__)
{
step_times = wd_digital_step_times;
delay_register_commit = 32;
diff --git a/src/devices/machine/wd_fdc.h b/src/devices/machine/wd_fdc.h
index d167017a737..4abc761e74b 100644
--- a/src/devices/machine/wd_fdc.h
+++ b/src/devices/machine/wd_fdc.h
@@ -133,7 +133,7 @@
class wd_fdc_t : public device_t {
public:
- wd_fdc_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ wd_fdc_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).intrq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<wd_fdc_t &>(device).drq_cb.set_callback(object); }
@@ -446,7 +446,7 @@ private:
class wd_fdc_analog_t : public wd_fdc_t {
public:
- wd_fdc_analog_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ wd_fdc_analog_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
virtual void pll_reset(bool fm, bool enmf, const attotime &when) override;
@@ -464,7 +464,7 @@ private:
class wd_fdc_digital_t : public wd_fdc_t {
public:
- wd_fdc_digital_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ wd_fdc_digital_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
protected:
static const int wd_digital_step_times[4];
@@ -508,7 +508,7 @@ private:
class fd1771_t : public wd_fdc_analog_t {
public:
- fd1771_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd1771_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -516,7 +516,7 @@ protected:
class fd1781_t : public wd_fdc_analog_t {
public:
- fd1781_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd1781_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -524,32 +524,32 @@ protected:
class fd1791_t : public wd_fdc_analog_t {
public:
- fd1791_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd1791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class fd1792_t : public wd_fdc_analog_t {
public:
- fd1792_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd1792_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class fd1793_t : public wd_fdc_analog_t {
public:
- fd1793_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd1793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class kr1818vg93_t : public wd_fdc_analog_t {
public:
- kr1818vg93_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ kr1818vg93_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class fd1794_t : public wd_fdc_analog_t {
public:
- fd1794_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd1794_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class fd1795_t : public wd_fdc_analog_t {
public:
- fd1795_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd1795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -557,7 +557,7 @@ protected:
class fd1797_t : public wd_fdc_analog_t {
public:
- fd1797_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd1797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -565,32 +565,32 @@ protected:
class mb8866_t : public wd_fdc_analog_t {
public:
- mb8866_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb8866_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class mb8876_t : public wd_fdc_analog_t {
public:
- mb8876_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb8876_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class mb8877_t : public wd_fdc_analog_t {
public:
- mb8877_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ mb8877_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class fd1761_t : public wd_fdc_analog_t {
public:
- fd1761_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd1761_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class fd1763_t : public wd_fdc_analog_t {
public:
- fd1763_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd1763_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class fd1765_t : public wd_fdc_analog_t {
public:
- fd1765_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd1765_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -598,7 +598,7 @@ protected:
class fd1767_t : public wd_fdc_analog_t {
public:
- fd1767_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ fd1767_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -606,19 +606,19 @@ protected:
class wd2791_t : public wd_fdc_analog_t {
public:
- wd2791_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ wd2791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER(enmf_w) { enmf = state ? false : true; }
};
class wd2793_t : public wd_fdc_analog_t {
public:
- wd2793_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ wd2793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER(enmf_w) { enmf = state ? false : true; }
};
class wd2795_t : public wd_fdc_analog_t {
public:
- wd2795_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ wd2795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -626,7 +626,7 @@ protected:
class wd2797_t : public wd_fdc_analog_t {
public:
- wd2797_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ wd2797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual int calc_sector_size(UINT8 size, UINT8 command) const override;
@@ -634,12 +634,12 @@ protected:
class wd1770_t : public wd_fdc_digital_t {
public:
- wd1770_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ wd1770_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class wd1772_t : public wd_fdc_digital_t {
public:
- wd1772_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ wd1772_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual int settle_time() const override;
@@ -647,7 +647,7 @@ protected:
class wd1773_t : public wd_fdc_digital_t {
public:
- wd1773_t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ wd1773_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type FD1771;
diff --git a/src/devices/machine/wozfdc.cpp b/src/devices/machine/wozfdc.cpp
index 9e91c1a3004..6428aae26c6 100644
--- a/src/devices/machine/wozfdc.cpp
+++ b/src/devices/machine/wozfdc.cpp
@@ -44,17 +44,17 @@ const rom_entry *wozfdc_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-wozfdc_device::wozfdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+wozfdc_device::wozfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-diskii_fdc::diskii_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+diskii_fdc::diskii_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
wozfdc_device(mconfig, DISKII_FDC, "Apple Disk II floppy controller", tag, owner, clock, "d2fdc", __FILE__)
{
}
-appleiii_fdc::appleiii_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+appleiii_fdc::appleiii_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
wozfdc_device(mconfig, DISKII_FDC, "Apple III floppy controller", tag, owner, clock, "a3fdc", __FILE__)
{
}
diff --git a/src/devices/machine/wozfdc.h b/src/devices/machine/wozfdc.h
index a9a82fce78d..75247f62c8b 100644
--- a/src/devices/machine/wozfdc.h
+++ b/src/devices/machine/wozfdc.h
@@ -30,7 +30,7 @@ class wozfdc_device:
public:
// construction/destruction
- wozfdc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ wozfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual const rom_entry *device_rom_region() const override;
@@ -83,7 +83,7 @@ private:
class diskii_fdc : public wozfdc_device
{
public:
- diskii_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ diskii_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual void device_reset() override;
@@ -93,7 +93,7 @@ public:
class appleiii_fdc : public wozfdc_device
{
public:
- appleiii_fdc(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ appleiii_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual void device_reset() override;
diff --git a/src/devices/machine/x2212.cpp b/src/devices/machine/x2212.cpp
index ecb54ee47cf..cb6fc2b57e9 100644
--- a/src/devices/machine/x2212.cpp
+++ b/src/devices/machine/x2212.cpp
@@ -38,7 +38,7 @@ const device_type X2210 = &device_creator<x2210_device>;
// x2212_device - constructor
//-------------------------------------------------
-x2212_device::x2212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+x2212_device::x2212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, X2212, "X2212 NVRAM", tag, owner, clock, "x2212", __FILE__),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -50,7 +50,7 @@ x2212_device::x2212_device(const machine_config &mconfig, std::string tag, devic
{
}
-x2212_device::x2212_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+x2212_device::x2212_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -129,9 +129,9 @@ void x2212_device::nvram_default()
if (m_region != nullptr)
{
if (m_region->bytes() != SIZE_DATA)
- fatalerror("x2212 region '%s' wrong size (expected size = 0x100)\n", tag().c_str());
+ fatalerror("x2212 region '%s' wrong size (expected size = 0x100)\n", tag());
if (m_region->bytewidth() != 1)
- fatalerror("x2212 region '%s' needs to be an 8-bit region\n", tag().c_str());
+ fatalerror("x2212 region '%s' needs to be an 8-bit region\n", tag());
UINT8 *default_data = m_region->base();
for (int byte = 0; byte < SIZE_DATA; byte++)
@@ -255,7 +255,7 @@ WRITE_LINE_MEMBER( x2212_device::recall )
}
-x2210_device::x2210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+x2210_device::x2210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: x2212_device(mconfig, X2210, "X2210", tag, owner, clock, "x2210", __FILE__)
{
}
diff --git a/src/devices/machine/x2212.h b/src/devices/machine/x2212.h
index 3c20543f462..161cf399457 100644
--- a/src/devices/machine/x2212.h
+++ b/src/devices/machine/x2212.h
@@ -48,8 +48,8 @@ class x2212_device : public device_t,
{
public:
// construction/destruction
- x2212_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
- x2212_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ x2212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ x2212_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// inline configuration helpers
static void static_set_auto_save(device_t &device);
@@ -97,7 +97,7 @@ protected:
class x2210_device : public x2212_device
{
public:
- x2210_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ x2210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
diff --git a/src/devices/machine/x76f041.cpp b/src/devices/machine/x76f041.cpp
index a2927d8db59..21dea0ae141 100644
--- a/src/devices/machine/x76f041.cpp
+++ b/src/devices/machine/x76f041.cpp
@@ -27,14 +27,14 @@ inline void ATTR_PRINTF( 3, 4 ) x76f041_device::verboselog( int n_level, const c
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: x76f041(%s) %s", machine().describe_context(), tag().c_str(), buf );
+ logerror( "%s: x76f041(%s) %s", machine().describe_context(), tag(), buf );
}
}
// device type definition
const device_type X76F041 = &device_creator<x76f041_device>;
-x76f041_device::x76f041_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+x76f041_device::x76f041_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: device_t( mconfig, X76F041, "X76F041 Flash", tag, owner, clock, "x76f041", __FILE__ ),
device_nvram_interface(mconfig, *this),
m_cs( 0 ),
@@ -500,11 +500,11 @@ void x76f041_device::nvram_default()
if( !m_region )
{
- logerror( "x76f041(%s) region not found\n", tag().c_str() );
+ logerror( "x76f041(%s) region not found\n", tag() );
}
else if( m_region->bytes() != expected_bytes )
{
- logerror( "x76f041(%s) region length 0x%x expected 0x%x\n", tag().c_str(), m_region->bytes(), expected_bytes );
+ logerror( "x76f041(%s) region length 0x%x expected 0x%x\n", tag(), m_region->bytes(), expected_bytes );
}
else
{
diff --git a/src/devices/machine/x76f041.h b/src/devices/machine/x76f041.h
index 9638325d346..228540969eb 100644
--- a/src/devices/machine/x76f041.h
+++ b/src/devices/machine/x76f041.h
@@ -22,7 +22,7 @@ class x76f041_device : public device_t,
{
public:
// construction/destruction
- x76f041_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
+ x76f041_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
DECLARE_WRITE_LINE_MEMBER( write_cs );
DECLARE_WRITE_LINE_MEMBER( write_rst );
diff --git a/src/devices/machine/x76f100.cpp b/src/devices/machine/x76f100.cpp
index d21dbad45a2..830a0e51448 100644
--- a/src/devices/machine/x76f100.cpp
+++ b/src/devices/machine/x76f100.cpp
@@ -25,14 +25,14 @@ inline void ATTR_PRINTF( 3, 4 ) x76f100_device::verboselog( int n_level, const c
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: x76f100(%s) %s", machine().describe_context(), tag().c_str(), buf );
+ logerror( "%s: x76f100(%s) %s", machine().describe_context(), tag(), buf );
}
}
// device type definition
const device_type X76F100 = &device_creator<x76f100_device>;
-x76f100_device::x76f100_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock )
+x76f100_device::x76f100_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
: device_t( mconfig, X76F100, "X76F100 Flash", tag, owner, clock, "x76f100", __FILE__ ),
device_nvram_interface(mconfig, *this),
m_cs( 0 ),
@@ -393,11 +393,11 @@ void x76f100_device::nvram_default()
if( !m_region )
{
- logerror( "x76f100(%s) region not found\n", tag().c_str() );
+ logerror( "x76f100(%s) region not found\n", tag() );
}
else if( m_region->bytes() != expected_size )
{
- logerror("x76f100(%s) region length 0x%x expected 0x%x\n", tag().c_str(), m_region->bytes(), expected_size );
+ logerror("x76f100(%s) region length 0x%x expected 0x%x\n", tag(), m_region->bytes(), expected_size );
}
else
{
diff --git a/src/devices/machine/x76f100.h b/src/devices/machine/x76f100.h
index adf103a8c55..287a4a17a56 100644
--- a/src/devices/machine/x76f100.h
+++ b/src/devices/machine/x76f100.h
@@ -22,7 +22,7 @@ class x76f100_device : public device_t,
{
public:
// construction/destruction
- x76f100_device( const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock );
+ x76f100_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock );
DECLARE_WRITE_LINE_MEMBER( write_cs );
DECLARE_WRITE_LINE_MEMBER( write_rst );
diff --git a/src/devices/machine/ym2148.cpp b/src/devices/machine/ym2148.cpp
index 0d533acda10..bdaef303d77 100644
--- a/src/devices/machine/ym2148.cpp
+++ b/src/devices/machine/ym2148.cpp
@@ -16,7 +16,7 @@ TODO:
const device_type YM2148 = &device_creator<ym2148_device>;
-ym2148_device::ym2148_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+ym2148_device::ym2148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YM2148, "YM2148", tag, owner, clock, "ym2148", __FILE__)
, device_serial_interface(mconfig, *this)
, m_txd_handler(*this)
diff --git a/src/devices/machine/ym2148.h b/src/devices/machine/ym2148.h
index db15f792196..729b28e8fc2 100644
--- a/src/devices/machine/ym2148.h
+++ b/src/devices/machine/ym2148.h
@@ -34,7 +34,7 @@ class ym2148_device : public device_t,
{
public:
// construction/destruction
- ym2148_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ ym2148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// static configuration helpers
template<class _Object> static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast<ym2148_device &>(device).m_txd_handler.set_callback(object); }
diff --git a/src/devices/machine/z80ctc.cpp b/src/devices/machine/z80ctc.cpp
index 90e7cd2bdcd..276254d96f1 100644
--- a/src/devices/machine/z80ctc.cpp
+++ b/src/devices/machine/z80ctc.cpp
@@ -78,7 +78,7 @@ const device_type Z80CTC = &device_creator<z80ctc_device>;
// z80ctc_device - constructor
//-------------------------------------------------
-z80ctc_device::z80ctc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80ctc_device::z80ctc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80CTC, "Z80 CTC", tag, owner, clock, "z80ctc", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_intr_cb(*this),
diff --git a/src/devices/machine/z80ctc.h b/src/devices/machine/z80ctc.h
index 2f01b4b4710..2c3002e1166 100644
--- a/src/devices/machine/z80ctc.h
+++ b/src/devices/machine/z80ctc.h
@@ -58,7 +58,7 @@ class z80ctc_device : public device_t,
{
public:
// construction/destruction
- z80ctc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80ctc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_intr_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_intr_cb.set_callback(object); }
template<class _Object> static devcb_base &set_zc0_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc0_cb.set_callback(object); }
diff --git a/src/devices/machine/z80dart.cpp b/src/devices/machine/z80dart.cpp
index 69a3c2de16f..e976080881f 100644
--- a/src/devices/machine/z80dart.cpp
+++ b/src/devices/machine/z80dart.cpp
@@ -86,7 +86,7 @@ machine_config_constructor z80dart_device::device_mconfig_additions() const
// z80dart_device - constructor
//-------------------------------------------------
-z80dart_device::z80dart_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+z80dart_device::z80dart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_z80daisy_interface(mconfig, *this),
m_chanA(*this, CHANA_TAG),
@@ -116,7 +116,7 @@ z80dart_device::z80dart_device(const machine_config &mconfig, device_type type,
elem = 0;
}
-z80dart_device::z80dart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80dart_device::z80dart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80DART, "Z80 DART", tag, owner, clock, "z80dart", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_chanA(*this, CHANA_TAG),
@@ -146,37 +146,37 @@ z80dart_device::z80dart_device(const machine_config &mconfig, std::string tag, d
elem = 0;
}
-z80sio0_device::z80sio0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80sio0_device::z80sio0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, Z80SIO0, "Z80 SIO/0", tag, owner, clock, TYPE_SIO0, "z80sio0", __FILE__)
{
}
-z80sio1_device::z80sio1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80sio1_device::z80sio1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, Z80SIO1, "Z80 SIO/1", tag, owner, clock, TYPE_SIO1, "z80sio1", __FILE__)
{
}
-z80sio2_device::z80sio2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80sio2_device::z80sio2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, Z80SIO2, "Z80 SIO/2", tag, owner, clock, TYPE_SIO2, "z80sio2", __FILE__)
{
}
-z80sio3_device::z80sio3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80sio3_device::z80sio3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, Z80SIO3, "Z80 SIO/3", tag, owner, clock, TYPE_SIO3, "z80sio3", __FILE__)
{
}
-z80sio4_device::z80sio4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80sio4_device::z80sio4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, Z80SIO4, "Z80 SIO/4", tag, owner, clock, TYPE_SIO4, "z80sio4", __FILE__)
{
}
-i8274_device::i8274_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+i8274_device::i8274_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, I8274, "I8274", tag, owner, clock, TYPE_I8274, "i8274", __FILE__)
{
}
-upd7201_device::upd7201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd7201_device::upd7201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80dart_device(mconfig, UPD7201, "uPD7201", tag, owner, clock, TYPE_UPD7201, "upd7201", __FILE__)
{
}
@@ -224,7 +224,7 @@ void z80dart_device::device_start()
void z80dart_device::device_reset()
{
- LOG(("Z80DART \"%s\" Reset\n", tag().c_str()));
+ LOG(("Z80DART \"%s\" Reset\n", tag()));
m_chanA->reset();
m_chanB->reset();
@@ -239,7 +239,7 @@ int z80dart_device::z80daisy_irq_state()
int state = 0;
int i;
- LOG(("Z80DART \"%s\" : Interrupt State A:%d%d%d%d B:%d%d%d%d\n", tag().c_str(),
+ LOG(("Z80DART \"%s\" : Interrupt State A:%d%d%d%d B:%d%d%d%d\n", tag(),
m_int_state[0], m_int_state[1], m_int_state[2], m_int_state[3],
m_int_state[4], m_int_state[5], m_int_state[6], m_int_state[7]));
@@ -255,7 +255,7 @@ int z80dart_device::z80daisy_irq_state()
state |= m_int_state[i];
}
- LOG(("Z80DART \"%s\" : Interrupt State %u\n", tag().c_str(), state));
+ LOG(("Z80DART \"%s\" : Interrupt State %u\n", tag(), state));
return state;
}
@@ -269,7 +269,7 @@ int z80dart_device::z80daisy_irq_ack()
{
int i;
- LOG(("Z80DART \"%s\" Interrupt Acknowledge\n", tag().c_str()));
+ LOG(("Z80DART \"%s\" Interrupt Acknowledge\n", tag()));
// loop over all interrupt sources
for (i = 0; i < 8; i++)
@@ -282,7 +282,7 @@ int z80dart_device::z80daisy_irq_ack()
m_chanA->m_rr[0] &= ~z80dart_channel::RR0_INTERRUPT_PENDING;
check_interrupts();
- LOG(("Z80DART \"%s\" : Interrupt Acknowledge Vector %02x\n", tag().c_str(), m_chanB->m_rr[2]));
+ LOG(("Z80DART \"%s\" : Interrupt Acknowledge Vector %02x\n", tag(), m_chanB->m_rr[2]));
return m_chanB->m_rr[2];
}
@@ -302,7 +302,7 @@ void z80dart_device::z80daisy_irq_reti()
{
int i;
- LOG(("Z80DART \"%s\" Return from Interrupt\n", tag().c_str()));
+ LOG(("Z80DART \"%s\" Return from Interrupt\n", tag()));
// loop over all interrupt sources
for (i = 0; i < 8; i++)
@@ -404,7 +404,7 @@ void z80dart_device::trigger_interrupt(int index, int state)
}
}
- LOG(("Z80DART \"%s\" Channel %c : Interrupt Request %u\n", tag().c_str(), 'A' + index, state));
+ LOG(("Z80DART \"%s\" Channel %c : Interrupt Request %u\n", tag(), 'A' + index, state));
// update vector register
m_chanB->m_rr[2] = vector;
@@ -499,7 +499,7 @@ WRITE8_MEMBER( z80dart_device::ba_cd_w )
// dart_channel - constructor
//-------------------------------------------------
-z80dart_channel::z80dart_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80dart_channel::z80dart_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80DART_CHANNEL, "Z80 DART channel", tag, owner, clock, "z80dart_channel", __FILE__),
device_serial_interface(mconfig, *this),
m_rx_error(0),
@@ -639,7 +639,7 @@ void z80dart_channel::tra_complete()
{
if ((m_wr[5] & WR5_TX_ENABLE) && !(m_wr[5] & WR5_SEND_BREAK) && !(m_rr[0] & RR0_TX_BUFFER_EMPTY))
{
- LOG(("Z80DART \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, m_tx_data));
+ LOG(("Z80DART \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag(), 'A' + m_index, m_tx_data));
transmit_register_setup(m_tx_data);
@@ -810,7 +810,7 @@ UINT8 z80dart_channel::control_read()
break;
}
- //LOG(("Z80DART \"%s\" Channel %c : Control Register Read '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ //LOG(("Z80DART \"%s\" Channel %c : Control Register Read '%02x'\n", m_owner->tag(), 'A' + m_index, data));
return data;
}
@@ -824,7 +824,7 @@ void z80dart_channel::control_write(UINT8 data)
{
int reg = m_wr[0] & WR0_REGISTER_MASK;
- LOG(("Z80DART \"%s\" Channel %c : Control Register Write '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Control Register Write '%02x'\n", m_owner->tag(), 'A' + m_index, data));
// write data to selected register
if (reg < 6)
@@ -842,12 +842,12 @@ void z80dart_channel::control_write(UINT8 data)
switch (data & WR0_COMMAND_MASK)
{
case WR0_NULL:
- LOG(("Z80DART \"%s\" Channel %c : Null\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Null\n", m_owner->tag(), 'A' + m_index));
break;
case WR0_SEND_ABORT:
- LOG(("Z80DART \"%s\" Channel %c : Send Abort\n", m_owner->tag().c_str(), 'A' + m_index));
- logerror("Z80DART \"%s\" Channel %c : unsupported command: Send Abort\n", m_owner->tag().c_str(), 'A' + m_index);
+ LOG(("Z80DART \"%s\" Channel %c : Send Abort\n", m_owner->tag(), 'A' + m_index));
+ logerror("Z80DART \"%s\" Channel %c : unsupported command: Send Abort\n", m_owner->tag(), 'A' + m_index);
break;
case WR0_RESET_EXT_STATUS:
@@ -860,65 +860,65 @@ void z80dart_channel::control_write(UINT8 data)
m_rx_rr0_latch = 0;
- LOG(("Z80DART \"%s\" Channel %c : Reset External/Status Interrupt\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Reset External/Status Interrupt\n", m_owner->tag(), 'A' + m_index));
break;
case WR0_CHANNEL_RESET:
// channel reset
- LOG(("Z80DART \"%s\" Channel %c : Channel Reset\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Channel Reset\n", m_owner->tag(), 'A' + m_index));
device_reset();
break;
case WR0_ENABLE_INT_NEXT_RX:
// enable interrupt on next receive character
- LOG(("Z80DART \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag(), 'A' + m_index));
m_rx_first = 1;
break;
case WR0_RESET_TX_INT:
// reset transmitter interrupt pending
- LOG(("Z80DART \"%s\" Channel %c : Reset Transmitter Interrupt Pending\n", m_owner->tag().c_str(), 'A' + m_index));
- logerror("Z80DART \"%s\" Channel %c : unsupported command: Reset Transmitter Interrupt Pending\n", m_owner->tag().c_str(), 'A' + m_index);
+ LOG(("Z80DART \"%s\" Channel %c : Reset Transmitter Interrupt Pending\n", m_owner->tag(), 'A' + m_index));
+ logerror("Z80DART \"%s\" Channel %c : unsupported command: Reset Transmitter Interrupt Pending\n", m_owner->tag(), 'A' + m_index);
break;
case WR0_ERROR_RESET:
// error reset
- LOG(("Z80DART \"%s\" Channel %c : Error Reset\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Error Reset\n", m_owner->tag(), 'A' + m_index));
m_rr[1] &= ~(RR1_CRC_FRAMING_ERROR | RR1_RX_OVERRUN_ERROR | RR1_PARITY_ERROR);
break;
case WR0_RETURN_FROM_INT:
// return from interrupt
- LOG(("Z80DART \"%s\" Channel %c : Return from Interrupt\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Return from Interrupt\n", m_owner->tag(), 'A' + m_index));
m_uart->z80daisy_irq_reti();
break;
}
break;
case 1:
- LOG(("Z80DART \"%s\" Channel %c : External Interrupt Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_EXT_INT_ENABLE) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Transmit Interrupt Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_TX_INT_ENABLE) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Status Affects Vector %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_STATUS_VECTOR) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Wait/Ready Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_WRDY_ENABLE) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Wait/Ready Function %s\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_WRDY_FUNCTION) ? "Ready" : "Wait"));
- LOG(("Z80DART \"%s\" Channel %c : Wait/Ready on %s\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_WRDY_ON_RX_TX) ? "Receive" : "Transmit"));
+ LOG(("Z80DART \"%s\" Channel %c : External Interrupt Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_EXT_INT_ENABLE) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Transmit Interrupt Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_TX_INT_ENABLE) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Status Affects Vector %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_STATUS_VECTOR) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Wait/Ready Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_ENABLE) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Wait/Ready Function %s\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_FUNCTION) ? "Ready" : "Wait"));
+ LOG(("Z80DART \"%s\" Channel %c : Wait/Ready on %s\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_ON_RX_TX) ? "Receive" : "Transmit"));
switch (data & WR1_RX_INT_MODE_MASK)
{
case WR1_RX_INT_DISABLE:
- LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag(), 'A' + m_index));
break;
case WR1_RX_INT_FIRST:
- LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag(), 'A' + m_index));
break;
case WR1_RX_INT_ALL_PARITY:
- LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on All Characters, Parity Affects Vector\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on All Characters, Parity Affects Vector\n", m_owner->tag(), 'A' + m_index));
break;
case WR1_RX_INT_ALL:
- LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80DART \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag(), 'A' + m_index));
break;
}
@@ -935,32 +935,32 @@ void z80dart_channel::control_write(UINT8 data)
m_rr[2] = m_wr[2];
}
m_uart->check_interrupts();
- LOG(("Z80DART \"%s\" Channel %c : Interrupt Vector %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Interrupt Vector %02x\n", m_owner->tag(), 'A' + m_index, data));
break;
case 3:
- LOG(("Z80DART \"%s\" Channel %c : Receiver Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR3_RX_ENABLE) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Auto Enables %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR3_AUTO_ENABLES) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Receiver Bits/Character %u\n", m_owner->tag().c_str(), 'A' + m_index, get_rx_word_length()));
+ LOG(("Z80DART \"%s\" Channel %c : Receiver Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR3_RX_ENABLE) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Auto Enables %u\n", m_owner->tag(), 'A' + m_index, (data & WR3_AUTO_ENABLES) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Receiver Bits/Character %u\n", m_owner->tag(), 'A' + m_index, get_rx_word_length()));
update_serial();
break;
case 4:
- LOG(("Z80DART \"%s\" Channel %c : Parity Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR4_PARITY_ENABLE) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Parity %s\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR4_PARITY_EVEN) ? "Even" : "Odd"));
- LOG(("Z80DART \"%s\" Channel %c : Stop Bits %s\n", m_owner->tag().c_str(), 'A' + m_index, stop_bits_tostring(get_stop_bits())));
- LOG(("Z80DART \"%s\" Channel %c : Clock Mode %uX\n", m_owner->tag().c_str(), 'A' + m_index, get_clock_mode()));
+ LOG(("Z80DART \"%s\" Channel %c : Parity Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR4_PARITY_ENABLE) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Parity %s\n", m_owner->tag(), 'A' + m_index, (data & WR4_PARITY_EVEN) ? "Even" : "Odd"));
+ LOG(("Z80DART \"%s\" Channel %c : Stop Bits %s\n", m_owner->tag(), 'A' + m_index, stop_bits_tostring(get_stop_bits())));
+ LOG(("Z80DART \"%s\" Channel %c : Clock Mode %uX\n", m_owner->tag(), 'A' + m_index, get_clock_mode()));
update_serial();
break;
case 5:
- LOG(("Z80DART \"%s\" Channel %c : Transmitter Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_TX_ENABLE) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Transmitter Bits/Character %u\n", m_owner->tag().c_str(), 'A' + m_index, get_tx_word_length()));
- LOG(("Z80DART \"%s\" Channel %c : Send Break %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_SEND_BREAK) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Request to Send %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_RTS) ? 1 : 0));
- LOG(("Z80DART \"%s\" Channel %c : Data Terminal Ready %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_DTR) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Transmitter Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_TX_ENABLE) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Transmitter Bits/Character %u\n", m_owner->tag(), 'A' + m_index, get_tx_word_length()));
+ LOG(("Z80DART \"%s\" Channel %c : Send Break %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_SEND_BREAK) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Request to Send %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_RTS) ? 1 : 0));
+ LOG(("Z80DART \"%s\" Channel %c : Data Terminal Ready %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_DTR) ? 1 : 0));
update_serial();
@@ -981,12 +981,12 @@ void z80dart_channel::control_write(UINT8 data)
break;
case 6:
- LOG(("Z80DART \"%s\" Channel %c : Transmit Sync %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Transmit Sync %02x\n", m_owner->tag(), 'A' + m_index, data));
m_sync = (m_sync & 0xff00) | data;
break;
case 7:
- LOG(("Z80DART \"%s\" Channel %c : Receive Sync %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Receive Sync %02x\n", m_owner->tag(), 'A' + m_index, data));
m_sync = (data << 8) | (m_sync & 0xff);
break;
}
@@ -1019,7 +1019,7 @@ UINT8 z80dart_channel::data_read()
}
}
- LOG(("Z80DART \"%s\" Channel %c : Data Register Read '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Data Register Read '%02x'\n", m_owner->tag(), 'A' + m_index, data));
return data;
}
@@ -1035,7 +1035,7 @@ void z80dart_channel::data_write(UINT8 data)
if ((m_wr[5] & WR5_TX_ENABLE) && is_transmit_register_empty())
{
- LOG(("Z80DART \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, m_tx_data));
+ LOG(("Z80DART \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag(), 'A' + m_index, m_tx_data));
transmit_register_setup(m_tx_data);
@@ -1052,7 +1052,7 @@ void z80dart_channel::data_write(UINT8 data)
m_rr[1] &= ~RR1_ALL_SENT;
- LOG(("Z80DART \"%s\" Channel %c : Data Register Write '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Data Register Write '%02x'\n", m_owner->tag(), 'A' + m_index, data));
}
@@ -1062,7 +1062,7 @@ void z80dart_channel::data_write(UINT8 data)
void z80dart_channel::receive_data(UINT8 data)
{
- LOG(("Z80DART \"%s\" Channel %c : Receive Data Byte '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80DART \"%s\" Channel %c : Receive Data Byte '%02x'\n", m_owner->tag(), 'A' + m_index, data));
if (m_rx_fifo == 2)
{
@@ -1121,7 +1121,7 @@ void z80dart_channel::receive_data(UINT8 data)
WRITE_LINE_MEMBER( z80dart_channel::cts_w )
{
- LOG(("Z80DART \"%s\" Channel %c : CTS %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
+ LOG(("Z80DART \"%s\" Channel %c : CTS %u\n", m_owner->tag(), 'A' + m_index, state));
if (m_cts != state)
{
@@ -1160,7 +1160,7 @@ WRITE_LINE_MEMBER( z80dart_channel::cts_w )
WRITE_LINE_MEMBER( z80dart_channel::dcd_w )
{
- LOG(("Z80DART \"%s\" Channel %c : DCD %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
+ LOG(("Z80DART \"%s\" Channel %c : DCD %u\n", m_owner->tag(), 'A' + m_index, state));
if (m_dcd != state)
{
@@ -1198,7 +1198,7 @@ WRITE_LINE_MEMBER( z80dart_channel::dcd_w )
WRITE_LINE_MEMBER( z80dart_channel::ri_w )
{
- LOG(("Z80DART \"%s\" Channel %c : RI %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
+ LOG(("Z80DART \"%s\" Channel %c : RI %u\n", m_owner->tag(), 'A' + m_index, state));
if (m_ri != state)
{
@@ -1231,7 +1231,7 @@ WRITE_LINE_MEMBER( z80dart_channel::ri_w )
WRITE_LINE_MEMBER( z80dart_channel::sync_w )
{
- LOG(("Z80DART \"%s\" Channel %c : SYNC %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
+ LOG(("Z80DART \"%s\" Channel %c : SYNC %u\n", m_owner->tag(), 'A' + m_index, state));
}
@@ -1241,7 +1241,7 @@ WRITE_LINE_MEMBER( z80dart_channel::sync_w )
WRITE_LINE_MEMBER( z80dart_channel::rxc_w )
{
- //LOG(("Z80DART \"%s\" Channel %c : Receiver Clock Pulse\n", m_owner->tag().c_str(), m_index + 'A'));
+ //LOG(("Z80DART \"%s\" Channel %c : Receiver Clock Pulse\n", m_owner->tag(), m_index + 'A'));
int clocks = get_clock_mode();
if (clocks == 1)
rx_clock_w(state);
@@ -1263,7 +1263,7 @@ WRITE_LINE_MEMBER( z80dart_channel::rxc_w )
WRITE_LINE_MEMBER( z80dart_channel::txc_w )
{
- //LOG(("Z80DART \"%s\" Channel %c : Transmitter Clock Pulse\n", m_owner->tag().c_str(), m_index + 'A'));
+ //LOG(("Z80DART \"%s\" Channel %c : Transmitter Clock Pulse\n", m_owner->tag(), m_index + 'A'));
int clocks = get_clock_mode();
if (clocks == 1)
tx_clock_w(state);
diff --git a/src/devices/machine/z80dart.h b/src/devices/machine/z80dart.h
index 8032ff49a58..d1efa05fd30 100644
--- a/src/devices/machine/z80dart.h
+++ b/src/devices/machine/z80dart.h
@@ -249,7 +249,7 @@ class z80dart_channel : public device_t,
friend class z80dart_device;
public:
- z80dart_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80dart_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -467,8 +467,8 @@ class z80dart_device : public device_t,
public:
// construction/destruction
- z80dart_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
- z80dart_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80dart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ z80dart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txda_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dtra_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_dtra_cb.set_callback(object); }
@@ -603,7 +603,7 @@ class z80sio0_device : public z80dart_device
{
public:
// construction/destruction
- z80sio0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80sio0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
@@ -613,7 +613,7 @@ class z80sio1_device : public z80dart_device
{
public:
// construction/destruction
- z80sio1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80sio1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
@@ -623,7 +623,7 @@ class z80sio2_device : public z80dart_device
{
public:
// construction/destruction
- z80sio2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80sio2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
@@ -633,7 +633,7 @@ class z80sio3_device : public z80dart_device
{
public:
// construction/destruction
- z80sio3_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80sio3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
@@ -643,7 +643,7 @@ class z80sio4_device : public z80dart_device
{
public:
// construction/destruction
- z80sio4_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80sio4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
@@ -653,7 +653,7 @@ class i8274_device : public z80dart_device
{
public:
// construction/destruction
- i8274_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ i8274_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( inta_r ) { return m1_r(); };
};
@@ -665,7 +665,7 @@ class upd7201_device : public z80dart_device
{
public:
// construction/destruction
- upd7201_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd7201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/machine/z80dma.cpp b/src/devices/machine/z80dma.cpp
index 9513774eef2..c1f3162bebd 100644
--- a/src/devices/machine/z80dma.cpp
+++ b/src/devices/machine/z80dma.cpp
@@ -146,7 +146,7 @@ const device_type Z80DMA = &device_creator<z80dma_device>;
// z80dma_device - constructor
//-------------------------------------------------
-z80dma_device::z80dma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80dma_device::z80dma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80DMA, "Z80 DMA", tag, owner, clock, "z80dma", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_out_busreq_cb(*this),
@@ -251,7 +251,7 @@ int z80dma_device::z80daisy_irq_state()
state = Z80_DAISY_IEO;
}
- if (LOG) logerror("Z80DMA '%s' Interrupt State: %u\n", tag().c_str(), state);
+ if (LOG) logerror("Z80DMA '%s' Interrupt State: %u\n", tag(), state);
return state;
}
@@ -266,7 +266,7 @@ int z80dma_device::z80daisy_irq_ack()
{
if (m_ip)
{
- if (LOG) logerror("Z80DMA '%s' Interrupt Acknowledge\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Interrupt Acknowledge\n", tag());
// clear interrupt pending flag
m_ip = 0;
@@ -293,7 +293,7 @@ void z80dma_device::z80daisy_irq_reti()
{
if (m_ius)
{
- if (LOG) logerror("Z80DMA '%s' Return from Interrupt\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Return from Interrupt\n", tag());
// clear interrupt under service flag
m_ius = 0;
@@ -354,7 +354,7 @@ void z80dma_device::trigger_interrupt(int level)
m_status &= ~0x08;
- if (LOG) logerror("Z80DMA '%s' Interrupt Pending\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Interrupt Pending\n", tag());
interrupt_check();
}
@@ -381,7 +381,7 @@ void z80dma_device::do_read()
else
m_latch = m_in_iorq_cb(m_addressA);
- if (DMA_LOG) logerror("Z80DMA '%s' A src: %04x %s -> data: %02x\n", tag().c_str(), m_addressA, PORTA_MEMORY ? "mem" : "i/o", m_latch);
+ if (DMA_LOG) logerror("Z80DMA '%s' A src: %04x %s -> data: %02x\n", tag(), m_addressA, PORTA_MEMORY ? "mem" : "i/o", m_latch);
}
else
{
@@ -390,7 +390,7 @@ void z80dma_device::do_read()
else
m_latch = m_in_iorq_cb(m_addressB);
- if (DMA_LOG) logerror("Z80DMA '%s' B src: %04x %s -> data: %02x\n", tag().c_str(), m_addressB, PORTB_MEMORY ? "mem" : "i/o", m_latch);
+ if (DMA_LOG) logerror("Z80DMA '%s' B src: %04x %s -> data: %02x\n", tag(), m_addressB, PORTB_MEMORY ? "mem" : "i/o", m_latch);
}
break;
default:
@@ -413,7 +413,7 @@ void z80dma_device::do_transfer_write()
else
m_out_iorq_cb((offs_t)m_addressB, m_latch);
- if (DMA_LOG) logerror("Z80DMA '%s' B dst: %04x %s\n", tag().c_str(), m_addressB, PORTB_MEMORY ? "mem" : "i/o");
+ if (DMA_LOG) logerror("Z80DMA '%s' B dst: %04x %s\n", tag(), m_addressB, PORTB_MEMORY ? "mem" : "i/o");
}
else
{
@@ -422,7 +422,7 @@ void z80dma_device::do_transfer_write()
else
m_out_iorq_cb((offs_t)m_addressA, m_latch);
- if (DMA_LOG) logerror("Z80DMA '%s' A dst: %04x %s\n", tag().c_str(), m_addressA, PORTA_MEMORY ? "mem" : "i/o");
+ if (DMA_LOG) logerror("Z80DMA '%s' A dst: %04x %s\n", tag(), m_addressA, PORTA_MEMORY ? "mem" : "i/o");
}
}
@@ -524,7 +524,7 @@ void z80dma_device::timerproc()
if(TRANSFER_MODE == TM_TRANSFER) m_status |= 0x10; // no match found
update_status();
- if (LOG) logerror("Z80DMA '%s' End of Block\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' End of Block\n", tag());
if (INT_ON_END_OF_BLOCK)
{
@@ -533,7 +533,7 @@ void z80dma_device::timerproc()
if (AUTO_RESTART)
{
- if (LOG) logerror("Z80DMA '%s' Auto Restart\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Auto Restart\n", tag());
m_dma_enabled = 1;
m_addressA = PORTA_ADDRESS;
@@ -606,7 +606,7 @@ UINT8 z80dma_device::read()
if(m_read_cur_follow >= m_read_num_follow)
m_read_cur_follow = 0;
- if (LOG) logerror("Z80DMA '%s' Read %02x\n", tag().c_str(), res);
+ if (LOG) logerror("Z80DMA '%s' Read %02x\n", tag(), res);
return res;
}
@@ -624,21 +624,21 @@ void z80dma_device::write(UINT8 data)
if ((data & 0x87) == 0) // WR2
{
- if (LOG) logerror("Z80DMA '%s' WR2 %02x\n", tag().c_str(), data);
+ if (LOG) logerror("Z80DMA '%s' WR2 %02x\n", tag(), data);
WR2 = data;
if (data & 0x40)
m_regs_follow[m_num_follow++] = GET_REGNUM(PORTB_TIMING);
}
else if ((data & 0x87) == 0x04) // WR1
{
- if (LOG) logerror("Z80DMA '%s' WR1 %02x\n", tag().c_str(), data);
+ if (LOG) logerror("Z80DMA '%s' WR1 %02x\n", tag(), data);
WR1 = data;
if (data & 0x40)
m_regs_follow[m_num_follow++] = GET_REGNUM(PORTA_TIMING);
}
else if ((data & 0x80) == 0) // WR0
{
- if (LOG) logerror("Z80DMA '%s' WR0 %02x\n", tag().c_str(), data);
+ if (LOG) logerror("Z80DMA '%s' WR0 %02x\n", tag(), data);
WR0 = data;
if (data & 0x08)
m_regs_follow[m_num_follow++] = GET_REGNUM(PORTA_ADDRESS_L);
@@ -651,7 +651,7 @@ void z80dma_device::write(UINT8 data)
}
else if ((data & 0x83) == 0x80) // WR3
{
- if (LOG) logerror("Z80DMA '%s' WR3 %02x\n", tag().c_str(), data);
+ if (LOG) logerror("Z80DMA '%s' WR3 %02x\n", tag(), data);
WR3 = data;
if (data & 0x08)
m_regs_follow[m_num_follow++] = GET_REGNUM(MASK_BYTE);
@@ -660,7 +660,7 @@ void z80dma_device::write(UINT8 data)
}
else if ((data & 0x83) == 0x81) // WR4
{
- if (LOG) logerror("Z80DMA '%s' WR4 %02x\n", tag().c_str(), data);
+ if (LOG) logerror("Z80DMA '%s' WR4 %02x\n", tag(), data);
WR4 = data;
if (data & 0x04)
m_regs_follow[m_num_follow++] = GET_REGNUM(PORTB_ADDRESS_L);
@@ -671,12 +671,12 @@ void z80dma_device::write(UINT8 data)
}
else if ((data & 0xC7) == 0x82) // WR5
{
- if (LOG) logerror("Z80DMA '%s' WR5 %02x\n", tag().c_str(), data);
+ if (LOG) logerror("Z80DMA '%s' WR5 %02x\n", tag(), data);
WR5 = data;
}
else if ((data & 0x83) == 0x83) // WR6
{
- if (LOG) logerror("Z80DMA '%s' WR6 %02x\n", tag().c_str(), data);
+ if (LOG) logerror("Z80DMA '%s' WR6 %02x\n", tag(), data);
m_dma_enabled = 0;
WR6 = data;
@@ -684,9 +684,9 @@ void z80dma_device::write(UINT8 data)
switch (data)
{
case COMMAND_ENABLE_AFTER_RETI:
- fatalerror("Z80DMA '%s' Unimplemented WR6 command %02x\n", tag().c_str(), data);
+ fatalerror("Z80DMA '%s' Unimplemented WR6 command %02x\n", tag(), data);
case COMMAND_READ_STATUS_BYTE:
- if (LOG) logerror("Z80DMA '%s' CMD Read status Byte\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' CMD Read status Byte\n", tag());
READ_MASK = 1;
m_read_regs_follow[0] = m_status;
break;
@@ -698,7 +698,7 @@ void z80dma_device::write(UINT8 data)
m_status |= 0x08;
break;
case COMMAND_INITIATE_READ_SEQUENCE:
- if (LOG) logerror("Z80DMA '%s' Initiate Read Sequence\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Initiate Read Sequence\n", tag());
m_read_cur_follow = m_read_num_follow = 0;
if(READ_MASK & 0x01) { m_read_regs_follow[m_read_num_follow++] = m_status; }
if(READ_MASK & 0x02) { m_read_regs_follow[m_read_num_follow++] = m_count & 0xff; } //byte counter (low)
@@ -709,7 +709,7 @@ void z80dma_device::write(UINT8 data)
if(READ_MASK & 0x40) { m_read_regs_follow[m_read_num_follow++] = m_addressB >> 8; } //port B address (high)
break;
case COMMAND_RESET:
- if (LOG) logerror("Z80DMA '%s' Reset\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Reset\n", tag());
m_dma_enabled = 0;
m_force_ready = 0;
m_ip = 0;
@@ -734,71 +734,71 @@ void z80dma_device::write(UINT8 data)
m_count = BLOCKLEN;
m_status |= 0x30;
- if (LOG) logerror("Z80DMA '%s' Load A: %x B: %x N: %x\n", tag().c_str(), m_addressA, m_addressB, m_count);
+ if (LOG) logerror("Z80DMA '%s' Load A: %x B: %x N: %x\n", tag(), m_addressA, m_addressB, m_count);
break;
case COMMAND_DISABLE_DMA:
- if (LOG) logerror("Z80DMA '%s' Disable DMA\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Disable DMA\n", tag());
m_dma_enabled = 0;
break;
case COMMAND_ENABLE_DMA:
- if (LOG) logerror("Z80DMA '%s' Enable DMA\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Enable DMA\n", tag());
m_dma_enabled = 1;
update_status();
break;
case COMMAND_READ_MASK_FOLLOWS:
- if (LOG) logerror("Z80DMA '%s' Set Read Mask\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Set Read Mask\n", tag());
m_regs_follow[m_num_follow++] = GET_REGNUM(READ_MASK);
break;
case COMMAND_CONTINUE:
- if (LOG) logerror("Z80DMA '%s' Continue\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Continue\n", tag());
m_count = BLOCKLEN;
m_dma_enabled = 1;
//"match not found" & "end of block" status flags zeroed here
m_status |= 0x30;
break;
case COMMAND_RESET_PORT_A_TIMING:
- if (LOG) logerror("Z80DMA '%s' Reset Port A Timing\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Reset Port A Timing\n", tag());
PORTA_TIMING = 0;
break;
case COMMAND_RESET_PORT_B_TIMING:
- if (LOG) logerror("Z80DMA '%s' Reset Port B Timing\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Reset Port B Timing\n", tag());
PORTB_TIMING = 0;
break;
case COMMAND_FORCE_READY:
- if (LOG) logerror("Z80DMA '%s' Force Ready\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Force Ready\n", tag());
m_force_ready = 1;
update_status();
break;
case COMMAND_ENABLE_INTERRUPTS:
- if (LOG) logerror("Z80DMA '%s' Enable IRQ\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Enable IRQ\n", tag());
WR3 |= 0x20;
break;
case COMMAND_DISABLE_INTERRUPTS:
- if (LOG) logerror("Z80DMA '%s' Disable IRQ\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Disable IRQ\n", tag());
WR3 &= ~0x20;
break;
case COMMAND_REINITIALIZE_STATUS_BYTE:
- if (LOG) logerror("Z80DMA '%s' Reinitialize status byte\n", tag().c_str());
+ if (LOG) logerror("Z80DMA '%s' Reinitialize status byte\n", tag());
m_status |= 0x30;
m_ip = 0;
break;
case 0xFB:
case 0xFF: // TODO: p8k triggers this, it probably crashed.
- if (LOG) logerror("Z80DMA '%s' undocumented command triggered 0x%02X!\n", tag().c_str(), data);
+ if (LOG) logerror("Z80DMA '%s' undocumented command triggered 0x%02X!\n", tag(), data);
break;
default:
- printf("Z80DMA '%s' Unknown WR6 command %02x\n", tag().c_str(), data);
+ printf("Z80DMA '%s' Unknown WR6 command %02x\n", tag(), data);
}
}
else if(data == 0x8e) //newtype on Sharp X1, unknown purpose
- printf("Z80DMA '%s' Unknown base register %02x\n", tag().c_str(), data);
+ printf("Z80DMA '%s' Unknown base register %02x\n", tag(), data);
else
- fatalerror("Z80DMA '%s' Unknown base register %02x\n", tag().c_str(), data);
+ fatalerror("Z80DMA '%s' Unknown base register %02x\n", tag(), data);
m_cur_follow = 0;
}
else
{
- if (LOG) logerror("Z80DMA '%s' Write %02x\n", tag().c_str(), data);
+ if (LOG) logerror("Z80DMA '%s' Write %02x\n", tag(), data);
int nreg = m_regs_follow[m_cur_follow];
m_regs[nreg] = data;
@@ -858,7 +858,7 @@ void z80dma_device::rdy_write_callback(int state)
WRITE_LINE_MEMBER(z80dma_device::rdy_w)
{
- if (LOG) logerror("Z80DMA '%s' RDY: %d Active High: %d\n", tag().c_str(), state, READY_ACTIVE_HIGH);
+ if (LOG) logerror("Z80DMA '%s' RDY: %d Active High: %d\n", tag(), state, READY_ACTIVE_HIGH);
machine().scheduler().synchronize(FUNC(static_rdy_write_callback), state, (void *)this);
}
diff --git a/src/devices/machine/z80dma.h b/src/devices/machine/z80dma.h
index 1513d9e6e24..fc1c3c1175c 100644
--- a/src/devices/machine/z80dma.h
+++ b/src/devices/machine/z80dma.h
@@ -73,7 +73,7 @@ class z80dma_device : public device_t,
{
public:
// construction/destruction
- z80dma_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80dma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_busreq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_busreq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_int_cb.set_callback(object); }
diff --git a/src/devices/machine/z80pio.cpp b/src/devices/machine/z80pio.cpp
index 6855e43d014..21541eb68ba 100644
--- a/src/devices/machine/z80pio.cpp
+++ b/src/devices/machine/z80pio.cpp
@@ -38,7 +38,7 @@ const device_type Z80PIO = &device_creator<z80pio_device>;
// z80pio_device - constructor
//-------------------------------------------------
-z80pio_device::z80pio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+z80pio_device::z80pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, Z80PIO, "Z80 PIO", tag, owner, clock, "z80pio", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_out_int_cb(*this),
@@ -131,7 +131,7 @@ int z80pio_device::z80daisy_irq_ack()
if (port.m_ip)
{
- if (LOG) logerror("Z80PIO '%s' Port %c Interrupt Acknowledge\n", tag().c_str(), 'A' + index);
+ if (LOG) logerror("Z80PIO '%s' Port %c Interrupt Acknowledge\n", tag(), 'A' + index);
// clear interrupt pending flag
port.m_ip = false;
@@ -164,7 +164,7 @@ void z80pio_device::z80daisy_irq_reti()
if (port.m_ius)
{
- if (LOG) logerror("Z80PIO '%s' Port %c Return from Interrupt\n", tag().c_str(), 'A' + index);
+ if (LOG) logerror("Z80PIO '%s' Port %c Return from Interrupt\n", tag(), 'A' + index);
// clear interrupt under service flag
port.m_ius = false;
@@ -251,7 +251,7 @@ void z80pio_device::check_interrupts()
for (int index = PORT_A; index < PORT_COUNT; index++)
{
- if (LOG) logerror("Z80PIO '%s' Port %c IE %s IP %s IUS %s\n", tag().c_str(), 'A' + index, m_port[index].m_ie ? "1":"0", m_port[index].m_ip ? "1":"0", m_port[index].m_ius ? "1":"0");
+ if (LOG) logerror("Z80PIO '%s' Port %c IE %s IP %s IUS %s\n", tag(), 'A' + index, m_port[index].m_ie ? "1":"0", m_port[index].m_ip ? "1":"0", m_port[index].m_ius ? "1":"0");
if (!ius && m_port[index].m_ie && m_port[index].m_ip)
{
@@ -259,7 +259,7 @@ void z80pio_device::check_interrupts()
}
}
- if (LOG) logerror("Z80PIO '%s' INT %u\n", tag().c_str(), state);
+ if (LOG) logerror("Z80PIO '%s' INT %u\n", tag(), state);
m_out_int_cb(state);
}
@@ -360,7 +360,7 @@ void z80pio_device::pio_port::reset()
void z80pio_device::pio_port::trigger_interrupt()
{
m_ip = true;
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Transfer Mode Interrupt Pending\n", m_device->tag().c_str(), 'A' + m_index);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Transfer Mode Interrupt Pending\n", m_device->tag(), 'A' + m_index);
check_interrupts();
}
@@ -374,7 +374,7 @@ void z80pio_device::pio_port::set_rdy(bool state)
{
if (m_rdy == state) return;
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Ready: %u\n", m_device->tag().c_str(), 'A' + m_index, state);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Ready: %u\n", m_device->tag(), 'A' + m_index, state);
m_rdy = state;
if (m_index == PORT_A)
@@ -390,7 +390,7 @@ void z80pio_device::pio_port::set_rdy(bool state)
void z80pio_device::pio_port::set_mode(int mode)
{
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Mode: %u\n", m_device->tag().c_str(), 'A' + m_index, mode);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Mode: %u\n", m_device->tag(), 'A' + m_index, mode);
switch (mode)
{
@@ -416,7 +416,7 @@ void z80pio_device::pio_port::set_mode(int mode)
case MODE_BIDIRECTIONAL:
if (m_index == PORT_B)
{
- m_device->logerror("Z80PIO '%s' Port %c Invalid Mode: %u!\n", m_device->tag().c_str(), 'A' + m_index, mode);
+ m_device->logerror("Z80PIO '%s' Port %c Invalid Mode: %u!\n", m_device->tag(), 'A' + m_index, mode);
}
else
{
@@ -455,7 +455,7 @@ void z80pio_device::pio_port::set_mode(int mode)
void z80pio_device::pio_port::strobe(bool state)
{
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Strobe: %u\n", m_device->tag().c_str(), 'A' + m_index, state);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Strobe: %u\n", m_device->tag(), 'A' + m_index, state);
if (m_device->m_port[PORT_A].m_mode == MODE_BIDIRECTIONAL)
{
@@ -573,7 +573,7 @@ void z80pio_device::pio_port::write(UINT8 data)
{
// trigger interrupt
m_ip = true;
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Bit Control Mode Interrupt Pending\n", m_device->tag().c_str(), 'A' + m_index);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Bit Control Mode Interrupt Pending\n", m_device->tag(), 'A' + m_index);
}
m_match = match;
@@ -596,7 +596,7 @@ void z80pio_device::pio_port::control_write(UINT8 data)
{
// load interrupt vector
m_vector = data;
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Interrupt Vector: %02x\n", m_device->tag().c_str(), 'A' + m_index, data);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Interrupt Vector: %02x\n", m_device->tag(), 'A' + m_index, data);
// set interrupt enable
m_icw |= ICW_ENABLE_INT;
@@ -616,10 +616,10 @@ void z80pio_device::pio_port::control_write(UINT8 data)
if (LOG)
{
- m_device->logerror("Z80PIO '%s' Port %c Interrupt Enable: %u\n", m_device->tag().c_str(), 'A' + m_index, BIT(data, 7));
- m_device->logerror("Z80PIO '%s' Port %c Logic: %s\n", m_device->tag().c_str(), 'A' + m_index, BIT(data, 6) ? "AND" : "OR");
- m_device->logerror("Z80PIO '%s' Port %c Active %s\n", m_device->tag().c_str(), 'A' + m_index, BIT(data, 5) ? "High" : "Low");
- m_device->logerror("Z80PIO '%s' Port %c Mask Follows: %u\n", m_device->tag().c_str(), 'A' + m_index, BIT(data, 4));
+ m_device->logerror("Z80PIO '%s' Port %c Interrupt Enable: %u\n", m_device->tag(), 'A' + m_index, BIT(data, 7));
+ m_device->logerror("Z80PIO '%s' Port %c Logic: %s\n", m_device->tag(), 'A' + m_index, BIT(data, 6) ? "AND" : "OR");
+ m_device->logerror("Z80PIO '%s' Port %c Active %s\n", m_device->tag(), 'A' + m_index, BIT(data, 5) ? "High" : "Low");
+ m_device->logerror("Z80PIO '%s' Port %c Mask Follows: %u\n", m_device->tag(), 'A' + m_index, BIT(data, 4));
}
if (m_icw & ICW_MASK_FOLLOWS)
@@ -647,7 +647,7 @@ void z80pio_device::pio_port::control_write(UINT8 data)
case 0x03: // set interrupt enable flip-flop
m_icw = (data & 0x80) | (m_icw & 0x7f);
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Interrupt Enable: %u\n", m_device->tag().c_str(), 'A' + m_index, BIT(data, 7));
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Interrupt Enable: %u\n", m_device->tag(), 'A' + m_index, BIT(data, 7));
// set interrupt enable
m_ie = BIT(m_icw, 7) ? true : false;
@@ -655,14 +655,14 @@ void z80pio_device::pio_port::control_write(UINT8 data)
break;
default:
- m_device->logerror("Z80PIO '%s' Port %c Invalid Control Word: %02x!\n", m_device->tag().c_str(), 'A' + m_index, data);
+ m_device->logerror("Z80PIO '%s' Port %c Invalid Control Word: %02x!\n", m_device->tag(), 'A' + m_index, data);
}
}
break;
case IOR: // data direction register
m_ior = data;
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c IOR: %02x\n", m_device->tag().c_str(), 'A' + m_index, data);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c IOR: %02x\n", m_device->tag(), 'A' + m_index, data);
// set interrupt enable
m_ie = BIT(m_icw, 7) ? true : false;
@@ -674,7 +674,7 @@ void z80pio_device::pio_port::control_write(UINT8 data)
case MASK: // interrupt mask
m_mask = data;
- if (LOG) m_device->logerror("Z80PIO '%s' Port %c Mask: %02x\n", m_device->tag().c_str(), 'A' + m_index, data);
+ if (LOG) m_device->logerror("Z80PIO '%s' Port %c Mask: %02x\n", m_device->tag(), 'A' + m_index, data);
// set interrupt enable
m_ie = BIT(m_icw, 7) ? true : false;
diff --git a/src/devices/machine/z80pio.h b/src/devices/machine/z80pio.h
index 815e2cd6029..623f586891f 100644
--- a/src/devices/machine/z80pio.h
+++ b/src/devices/machine/z80pio.h
@@ -80,7 +80,7 @@ public:
};
// construction/destruction
- z80pio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_int_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_in_pa_cb.set_callback(object); }
diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp
index 812d4e07870..d2aa4a5f5bd 100644
--- a/src/devices/machine/z80scc.cpp
+++ b/src/devices/machine/z80scc.cpp
@@ -128,7 +128,7 @@ machine_config_constructor z80scc_device::device_mconfig_additions() const
// z80scc_device - constructor
//-------------------------------------------------
-z80scc_device::z80scc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+z80scc_device::z80scc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_z80daisy_interface(mconfig, *this),
m_chanA(*this, CHANA_TAG),
@@ -158,7 +158,7 @@ z80scc_device::z80scc_device(const machine_config &mconfig, device_type type, co
elem = 0;
}
-z80scc_device::z80scc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80scc_device::z80scc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80SCC, "Z80 SCC", tag, owner, clock, "z80scc", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_chanA(*this, CHANA_TAG),
@@ -188,28 +188,28 @@ z80scc_device::z80scc_device(const machine_config &mconfig, std::string tag, dev
elem = 0;
}
-scc8030_device::scc8030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+scc8030_device::scc8030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC8030, "SCC 8030", tag, owner, clock, TYPE_SCC8030, "scc8030", __FILE__){ }
-scc80C30_device::scc80C30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+scc80C30_device::scc80C30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC80C30, "SCC 80C30", tag, owner, clock, TYPE_SCC80C30, "scc80C30", __FILE__){ }
-scc80230_device::scc80230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+scc80230_device::scc80230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC80230, "SCC 80230", tag, owner, clock, TYPE_SCC80230, "scc80230", __FILE__){ }
-scc8530_device::scc8530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+scc8530_device::scc8530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC8530N, "SCC 8530", tag, owner, clock, TYPE_SCC8530, "scc8530", __FILE__){ }
-scc85C30_device::scc85C30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+scc85C30_device::scc85C30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC85C30, "SCC 85C30", tag, owner, clock, TYPE_SCC85C30, "scc85C30", __FILE__){ }
-scc85230_device::scc85230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+scc85230_device::scc85230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC85230, "SCC 85230", tag, owner, clock, TYPE_SCC85230, "scc85230", __FILE__){ }
-scc85233_device::scc85233_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+scc85233_device::scc85233_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC85233, "SCC 85233", tag, owner, clock, TYPE_SCC85233, "scc85233", __FILE__){ }
-scc8523L_device::scc8523L_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+scc8523L_device::scc8523L_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: z80scc_device(mconfig, SCC8523L, "SCC 8523L", tag, owner, clock, TYPE_SCC8523L, "scc8523L", __FILE__){ }
//-------------------------------------------------
@@ -257,7 +257,7 @@ void z80scc_device::device_start()
void z80scc_device::device_reset()
{
- LOG(("%s %s \n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s \n",FUNCNAME, tag()));
m_chanA->reset();
m_chanB->reset();
@@ -277,7 +277,7 @@ int z80scc_device::z80daisy_irq_state()
int state = 0;
int i;
- LOG(("%s %s A:%d%d%d B:%d%d%d ",FUNCNAME, tag().c_str(),
+ LOG(("%s %s A:%d%d%d B:%d%d%d ",FUNCNAME, tag(),
m_int_state[0], m_int_state[1], m_int_state[2],
m_int_state[3], m_int_state[4], m_int_state[5]));
@@ -307,7 +307,7 @@ int z80scc_device::z80daisy_irq_ack()
{
int i;
- LOG(("%s %s - needs fixing for SCC\n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s - needs fixing for SCC\n",FUNCNAME, tag()));
// loop over all interrupt sources
for (i = 0; i < 6; i++)
@@ -320,7 +320,7 @@ int z80scc_device::z80daisy_irq_ack()
//m_chanA->m_rr0 &= ~z80scc_channel::RR0_INTERRUPT_PENDING;
check_interrupts();
- //LOG(("%s %s \n",FUNCNAME, tag().c_str(), m_chanB->m_rr2));
+ //LOG(("%s %s \n",FUNCNAME, tag(), m_chanB->m_rr2));
return m_chanB->m_rr2;
}
@@ -340,7 +340,7 @@ void z80scc_device::z80daisy_irq_reti()
{
int i;
- LOG(("%s %s \n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s \n",FUNCNAME, tag()));
// loop over all interrupt sources
for (i = 0; i < 6; i++)
@@ -366,7 +366,7 @@ void z80scc_device::z80daisy_irq_reti()
void z80scc_device::check_interrupts()
{
int state = (z80daisy_irq_state() & Z80_DAISY_INT) ? ASSERT_LINE : CLEAR_LINE;
- LOG(("%s %s \n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s \n",FUNCNAME, tag()));
m_out_int_cb(state);
}
@@ -377,7 +377,7 @@ void z80scc_device::check_interrupts()
void z80scc_device::reset_interrupts()
{
- LOG(("%s %s \n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s \n",FUNCNAME, tag()));
// reset internal interrupt sources
for (auto & elem : m_int_state)
{
@@ -430,7 +430,7 @@ void z80scc_device::trigger_interrupt(int index, int state)
int prio_level;
- LOG(("%s %s:%c %d \n",FUNCNAME, tag().c_str(), 'A' + index, state));
+ LOG(("%s %s:%c %d \n",FUNCNAME, tag(), 'A' + index, state));
/* The Master Interrupt Enable (MIE) bit, WR9 D3, must be set to enable the SCC to generate interrupts.*/
if (!(m_chanA->m_wr9 & z80scc_channel::WR9_BIT_MIE))
@@ -484,7 +484,7 @@ void z80scc_device::trigger_interrupt(int index, int state)
vector = modify_vector(vector, index, source);
}
- //LOG(("Z80SCC \"%s\": %c : Interrupt Request %u\n", tag().c_str(), 'A' + index, state));
+ //LOG(("Z80SCC \"%s\": %c : Interrupt Request %u\n", tag(), 'A' + index, state));
// update vector register // TODO: What if interrupts are nested? May we loose the modified vector or even get the wrong one?
m_chanB->m_wr2 = vector;
@@ -668,7 +668,7 @@ WRITE8_MEMBER( z80scc_device::ba_cd_inv_w )
// SCC_channel - constructor
//-------------------------------------------------
-z80scc_channel::z80scc_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80scc_channel::z80scc_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80SCC_CHANNEL, "Z80 SCC channel", tag, owner, clock, "z80scc_channel", __FILE__),
device_serial_interface(mconfig, *this),
m_rx_error(0),
@@ -840,7 +840,7 @@ void z80scc_channel::tra_callback()
{
if (!(m_wr5 & WR5_TX_ENABLE))
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
// transmit mark
if (m_index == z80scc_device::CHANNEL_A)
m_uart->m_out_txda_cb(1);
@@ -849,7 +849,7 @@ void z80scc_channel::tra_callback()
}
else if (m_wr5 & WR5_SEND_BREAK)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c send break 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c send break 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
// transmit break
if (m_index == z80scc_device::CHANNEL_A)
m_uart->m_out_txda_cb(0);
@@ -860,7 +860,7 @@ void z80scc_channel::tra_callback()
{
int db = transmit_register_get_data_bit();
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit data bit %d m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, db, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit data bit %d m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, db, m_wr5));
// transmit data
if (m_index == z80scc_device::CHANNEL_A)
m_uart->m_out_txda_cb(db);
@@ -869,8 +869,8 @@ void z80scc_channel::tra_callback()
}
else
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Failed to transmit m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
- logerror("%s \"%s \"Channel %c Failed to transmit\n", FUNCNAME, m_owner->tag().c_str(), 'A' + m_index);
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Failed to transmit m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
+ logerror("%s \"%s \"Channel %c Failed to transmit\n", FUNCNAME, m_owner->tag(), 'A' + m_index);
}
}
@@ -883,7 +883,7 @@ void z80scc_channel::tra_complete()
{
if ((m_wr5 & WR5_TX_ENABLE) && !(m_wr5 & WR5_SEND_BREAK) && !(m_rr0 & RR0_TX_BUFFER_EMPTY))
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Data Byte '%02x' m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_tx_data, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Data Byte '%02x' m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_tx_data, m_wr5));
transmit_register_setup(m_tx_data);
@@ -895,7 +895,7 @@ void z80scc_channel::tra_complete()
}
else if (m_wr5 & WR5_SEND_BREAK)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Break 0 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Break 0 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
// transmit break
if (m_index == z80scc_device::CHANNEL_A)
m_uart->m_out_txda_cb(0);
@@ -904,7 +904,7 @@ void z80scc_channel::tra_complete()
}
else
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
// transmit mark
if (m_index == z80scc_device::CHANNEL_A)
m_uart->m_out_txda_cb(1);
@@ -915,7 +915,7 @@ void z80scc_channel::tra_complete()
// if transmit buffer is empty
if (m_rr0 & RR0_TX_BUFFER_EMPTY)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit buffer empty m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit buffer empty m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
// then all characters have been sent
m_rr1 |= RR1_ALL_SENT;
@@ -939,8 +939,8 @@ void z80scc_channel::rcv_callback()
#if 1
else
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data Bit but receiver is disabled\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index));
- logerror("Z80SCC %s() \"%s \"Channel %c Received data dit but receiver is disabled\n", __func__, m_owner->tag().c_str(), 'A' + m_index);
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data Bit but receiver is disabled\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index));
+ logerror("Z80SCC %s() \"%s \"Channel %c Received data dit but receiver is disabled\n", __func__, m_owner->tag(), 'A' + m_index);
}
#endif
}
@@ -956,7 +956,7 @@ void z80scc_channel::rcv_complete()
receive_register_extract();
data = get_received_char();
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data %c\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data %c\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, data));
receive_data(data);
}
@@ -993,7 +993,7 @@ TODO:
*/
void z80scc_channel::set_rts(int state)
{
- LOG(("%s(%d) \"%s\": %c \n", FUNCNAME, state, m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("%s(%d) \"%s\": %c \n", FUNCNAME, state, m_owner->tag(), 'A' + m_index));
if (m_index == z80scc_device::CHANNEL_A)
m_uart->m_out_rtsa_cb(state);
else
@@ -1081,7 +1081,7 @@ int z80scc_channel::get_tx_word_length()
* Break/Abort latch. */
UINT8 z80scc_channel::do_sccreg_rr0()
{
- LOG(("%s %s\n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s\n",FUNCNAME, tag()));
return m_rr0;
}
@@ -1090,7 +1090,7 @@ UINT8 z80scc_channel::do_sccreg_rr0()
* codes for the I-Field in the SDLC Receive Mode. */
UINT8 z80scc_channel::do_sccreg_rr1()
{
- LOG(("%s %s\n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s\n",FUNCNAME, tag()));
return m_rr1;
}
@@ -1318,10 +1318,10 @@ UINT8 z80scc_channel::control_read()
case REG_RR14_WR7_OR_R10: data = do_sccreg_rr14(); break;
case REG_RR15_WR15_EXT_STAT: data = do_sccreg_rr15(); break;
default:
- logerror("Z80SCC \"%s\" %s: %c : Unsupported RRx register:%02x\n", m_owner->tag().c_str(), __func__, 'A' + m_index, reg);
+ logerror("Z80SCC \"%s\" %s: %c : Unsupported RRx register:%02x\n", m_owner->tag(), __func__, 'A' + m_index, reg);
}
- //LOG(("Z80SCC \"%s\": %c : Register R%d read '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, reg, data));
+ //LOG(("Z80SCC \"%s\": %c : Register R%d read '%02x'\n", m_owner->tag(), 'A' + m_index, reg, data));
return data;
}
@@ -1329,7 +1329,7 @@ UINT8 z80scc_channel::control_read()
Handle the WR0 CRC Reset/Init bits separatelly, needed by derived devices separatelly from the commands */
void z80scc_channel::do_sccreg_wr0_resets(UINT8 data)
{
- LOG(("%s(%02x) %s",FUNCNAME, data, tag().c_str()));
+ LOG(("%s(%02x) %s",FUNCNAME, data, tag()));
switch (data & WR0_CRC_RESET_CODE_MASK)
{
case WR0_CRC_RESET_NULL:
@@ -1368,12 +1368,12 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
addressing*/
if (m_uart->m_variant & SET_Z85X3X)
{
- LOG(("Z80SCC \"%s\" %s: %c : %s - Point High command\n", m_owner->tag().c_str(), __func__, 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\" %s: %c : %s - Point High command\n", m_owner->tag(), __func__, 'A' + m_index, __func__));
//m_ph = 8;
m_uart->m_wr0_ptrbits |= 8;
}
else
- LOG(("Z80SCC \"%s\" %s: %c : %s - NULL command 2\n", m_owner->tag().c_str(), __func__, 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\" %s: %c : %s - NULL command 2\n", m_owner->tag(), __func__, 'A' + m_index, __func__));
break;
case WR0_RESET_EXT_STATUS: // TODO: Take care of the Zero Count flag and the 2 slot fifo
/*After an External/Status interrupt (a change on a modem line or a break condition,
@@ -1392,14 +1392,14 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
{
m_rr0 |= RR0_ZC;
}
- LOG(("Z80SCC \"%s\" %s: %c : %s - Reset External/Status Interrupt\n", m_owner->tag().c_str(), __func__, 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\" %s: %c : %s - Reset External/Status Interrupt\n", m_owner->tag(), __func__, 'A' + m_index, __func__));
break;
case WR0_RESET_HIGHEST_IUS:
/* This command resets the highest priority Interrupt Under Service (IUS) bit, allowing lower
priority conditions to request interrupts. This command allows the use of the internal
daisy chain (even in systems without an external daisy chain) and is the last operation in
an interrupt service routine.TODO: Implement internal Daisychain */
- LOG(("Z80SCC \"%s\" %s: %c : Reset Highest IUS\n", m_owner->tag().c_str(), __func__, 'A' + m_index));
+ LOG(("Z80SCC \"%s\" %s: %c : Reset Highest IUS\n", m_owner->tag(), __func__, 'A' + m_index));
break;
case WR0_ERROR_RESET:
/*Error Reset Command (110). This command resets the error bits in RR1. If interrupt on first Rx
@@ -1407,7 +1407,7 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
data with the special condition is held in the Receive FIFO until this command is issued. If either
of these modes is selected and this command is issued before the data has been read from the
Receive FIFO, the data is lost */
- LOG(("Z80SCC \"%s\" %s: %c : WR0_ERROR_RESET\n", m_owner->tag().c_str(), __func__, 'A' + m_index));
+ LOG(("Z80SCC \"%s\" %s: %c : WR0_ERROR_RESET\n", m_owner->tag(), __func__, 'A' + m_index));
//do_sccreg_wr0(data); // reset status registers
m_rx_fifo_rp_step(); // Reset error state in fifo and unlock it. unlock == step to next slot in fifo.
break;
@@ -1415,17 +1415,17 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
data &= 0xef; // convert SCC SEND_ABORT command to a SIO SEND_ABORT command and fall through
/* The following commands relies on the SIO default behviour */
case WR0_NULL:
- LOG(("Z80SCC \"%s\" Channel %c : Null\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SCC \"%s\" Channel %c : Null\n", m_owner->tag(), 'A' + m_index));
break;
case WR0_ENABLE_INT_NEXT_RX:
// enable interrupt on next receive character
- LOG(("Z80SCC \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SCC \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag(), 'A' + m_index));
m_rx_first = 1;
break;
case WR0_RESET_TX_INT:
// reset transmitter interrupt pending
- LOG(("Z80SCC \"%s\" Channel %c : Reset Transmitter Interrupt Pending\n", m_owner->tag().c_str(), 'A' + m_index));
- logerror("Z80SCC \"%s\" Channel %c : unsupported command: Reset Transmitter Interrupt Pending\n", m_owner->tag().c_str(), 'A' + m_index);
+ LOG(("Z80SCC \"%s\" Channel %c : Reset Transmitter Interrupt Pending\n", m_owner->tag(), 'A' + m_index));
+ logerror("Z80SCC \"%s\" Channel %c : unsupported command: Reset Transmitter Interrupt Pending\n", m_owner->tag(), 'A' + m_index);
break;
default:
break;
@@ -1462,14 +1462,14 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
switch(data & WR0_Z_SHIFT_MASK)
{
case WR0_Z_SEL_SHFT_LEFT:
- LOG(("Z80SCC \"%s\": %c : %s - Shift Left Addressing Mode - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s - Shift Left Addressing Mode - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
break;
case WR0_Z_SEL_SHFT_RIGHT:
- LOG(("Z80SCC \"%s\": %c : %s - Shift Right Addressing Mode - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s - Shift Right Addressing Mode - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
break;
default:
break;
- // LOG(("Z80SCC \"%s\": %c : %s - Null commands\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
+ // LOG(("Z80SCC \"%s\": %c : %s - Null commands\n", m_owner->tag(), 'A' + m_index, __func__));
}
}
}
@@ -1477,7 +1477,7 @@ void z80scc_channel::do_sccreg_wr0(UINT8 data)
/* Write Register 1 is the control register for the various SCC interrupt and Wait/Request modes.*/
void z80scc_channel::do_sccreg_wr1(UINT8 data)
{
- LOG(("%s(%02x) \"%s\": %c : %s - %02x\n", FUNCNAME, data, m_owner->tag().c_str(), 'A' + m_index, __func__, data));
+ LOG(("%s(%02x) \"%s\": %c : %s - %02x\n", FUNCNAME, data, m_owner->tag(), 'A' + m_index, __func__, data));
/* TODO: Sort out SCC specific behaviours from legacy SIO behaviours:
- Channel B only bits vs
- Parity Is Special Condition, bit2 */
@@ -1568,7 +1568,7 @@ void z80scc_channel::do_sccreg_wr7(UINT8 data)
/* WR8 is the transmit buffer register */
void z80scc_channel::do_sccreg_wr8(UINT8 data)
{
- LOG(("%s(%d) \"%s\": %c : Transmit Buffer read %02x\n", FUNCNAME, data, m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("%s(%d) \"%s\": %c : Transmit Buffer read %02x\n", FUNCNAME, data, m_owner->tag(), 'A' + m_index, data));
data_write(data);
}
@@ -1589,18 +1589,18 @@ void z80scc_channel::do_sccreg_wr9(UINT8 data)
switch (data & WR9_CMD_MASK)
{
case WR9_CMD_NORESET:
- LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - No reset %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - No reset %02x\n", m_owner->tag(), 'A' + m_index, data));
break;
case WR9_CMD_CHNB_RESET:
- LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Channel B reset %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Channel B reset %02x\n", m_owner->tag(), 'A' + m_index, data));
m_uart->m_chanB->reset();
break;
case WR9_CMD_CHNA_RESET:
- LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Channel A reset %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Channel A reset %02x\n", m_owner->tag(), 'A' + m_index, data));
m_uart->m_chanA->reset();
break;
case WR9_CMD_HW_RESET:
- LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Device reset %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80SCC \"%s\": %c : Master Interrupt Control - Device reset %02x\n", m_owner->tag(), 'A' + m_index, data));
/*"The effects of this command are identical to those of a hardware reset, except that the Shift Right/Shift Left bit is
not changed and the MIE, Status High/Status Low and DLC bits take the programmed values that accompany this command."
The Shift Right/Shift Left bits of the WR0 is only valid on SCC8030 device hence not implemented yet, just the SCC8530 */
@@ -1618,7 +1618,7 @@ enabled, this register may be read as RR11.*/
void z80scc_channel::do_sccreg_wr10(UINT8 data)
{
m_wr10 = data;
- LOG(("Z80SCC \"%s\": %c : %s Misc Tx/Rx Control %02x - not implemented \n", m_owner->tag().c_str(), 'A' + m_index, __func__, data));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Tx/Rx Control %02x - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data));
}
/* WR11 is the Clock Mode Control register. The bits in this register control the sources of both the
@@ -1626,7 +1626,7 @@ receive and transmit clocks, the type of signal on the /SYNC and /RTxC pins, and
the /TRxC pin.*/
void z80scc_channel::do_sccreg_wr11(UINT8 data)
{
- LOG(("Z80SCC \"%s\": %c : %s Clock Mode Control %02x - not implemented \n", m_owner->tag().c_str(), 'A' + m_index, __func__, data));
+ LOG(("Z80SCC \"%s\": %c : %s Clock Mode Control %02x - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data));
m_wr11 = data;
/*Bit 7: This bit controls the type of input signal the SCC expects to see on the /RTxC pin. If this bit is set
to 0, the SCC expects a TTL-compatible signal as an input to this pin. If this bit is set to 1, the SCC
@@ -1710,14 +1710,14 @@ void z80scc_channel::do_sccreg_wr11(UINT8 data)
void z80scc_channel::do_sccreg_wr12(UINT8 data)
{
m_wr12 = data;
- LOG(("Z80SCC \"%s\": %c : %s %02x Low byte of Time Constant for Baudrate generator - not implemented \n", m_owner->tag().c_str(), 'A' + m_index, __func__, data));
+ LOG(("Z80SCC \"%s\": %c : %s %02x Low byte of Time Constant for Baudrate generator - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data));
}
/* WR13 contains the upper byte of the time constant for the baud rate generator. */
void z80scc_channel::do_sccreg_wr13(UINT8 data)
{
m_wr13 = data;
- LOG(("Z80SCC \"%s\": %c : %s %02x High byte of Time Constant for Baudrate generator - not implemented \n", m_owner->tag().c_str(), 'A' + m_index, __func__, data));
+ LOG(("Z80SCC \"%s\": %c : %s %02x High byte of Time Constant for Baudrate generator - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data));
}
/*
@@ -1727,7 +1727,7 @@ void z80scc_channel::do_sccreg_wr14(UINT8 data)
switch (data & WR14_DPLL_CMD_MASK)
{
case WR14_CMD_NULL:
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Null Command %02x\n", m_owner->tag().c_str(), 'A' + m_index, __func__, data));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Null Command %02x\n", m_owner->tag(), 'A' + m_index, __func__, data));
break;
case WR14_CMD_ESM:
/* Issuing this command causes the DPLL to enter the Search mode, where the DPLL searches for a locking edge in the
@@ -1749,36 +1749,36 @@ void z80scc_channel::do_sccreg_wr14(UINT8 data)
see an edge during the expected window, the one clock missing bit in RR10 is set. If the DPLL does not see an edge
after two successive attempts, the two clocks missing bits in RR10 are set and the DPLL automatically enters the
Search mode. This command resets both clocks missing latches.*/
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Enter Search Mode Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Enter Search Mode Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
break;
case WR14_CMD_RMC:
/* Issuing this command disables the DPLL, resets the clock missing latches in RR10, and forces a continuous Search mode state */
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Reset Missing Clocks Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Reset Missing Clocks Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
break;
case WR14_CMD_DISABLE_DPLL:
/* Issuing this command disables the DPLL, resets the clock missing latches in RR10, and forces a continuous Search mode state.*/
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Disable DPLL Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Disable DPLL Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
break;
case WR14_CMD_SS_BGR:
/* Issuing this command forces the clock for the DPLL to come from the output of the BRG. */
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Baudrate Generator Input DPLL Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Baudrate Generator Input DPLL Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
break;
case WR14_CMD_SS_RTXC:
/* Issuing the command forces the clock for the DPLL to come from the /RTxC pin or the crystal oscillator, depending on
the state of the XTAL/no XTAL bit in WR11. This mode is selected by a channel or hardware reset*/
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits RTxC Input DPLL Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits RTxC Input DPLL Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
break;
case WR14_CMD_SET_FM:
/* This command forces the DPLL to operate in the FM mode and is used to recover the clock from FM or Manchester-Encoded
data. (Manchester is decoded by placing the receiver in NRZ mode while the DPLL is in FM mode.)*/
- LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Set FM Mode Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Misc Control Bits Set FM Mode Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
break;
case WR14_CMD_SET_NRZI:
/* Issuing this command forces the DPLL to operate in the NRZI mode. This mode is also selected by a hardware or channel reset.*/
- LOG(("Z80SCC \"%s\": %c : %s Mics Control Bits Set NRZI Mode Command - not implemented\n", m_owner->tag().c_str(), 'A' + m_index, __func__));
+ LOG(("Z80SCC \"%s\": %c : %s Mics Control Bits Set NRZI Mode Command - not implemented\n", m_owner->tag(), 'A' + m_index, __func__));
break;
default:
- logerror("Z80SCC \"%s\": %c : %s Mics Control Bits command %02x - not implemented \n", m_owner->tag().c_str(), 'A' + m_index, __func__, data);
+ logerror("Z80SCC \"%s\": %c : %s Mics Control Bits command %02x - not implemented \n", m_owner->tag(), 'A' + m_index, __func__, data);
}
// TODO: Add info on the other bits of this register
m_wr14 = data;
@@ -1791,7 +1791,7 @@ void z80scc_channel::do_sccreg_wr14(UINT8 data)
void z80scc_channel::do_sccreg_wr15(UINT8 data)
{
LOG(("%s(%d) \"%s\": %c : External/Status Control Bits - not implemented\n",
- FUNCNAME, data, m_owner->tag().c_str(), 'A' + m_index));
+ FUNCNAME, data, m_owner->tag(), 'A' + m_index));
m_wr15 = data;
}
@@ -1872,7 +1872,7 @@ void z80scc_channel::control_write(UINT8 data)
case REG_WR14_MISC_CTRL: do_sccreg_wr14(data); break;
case REG_WR15_EXT_ST_INT_CTRL:do_sccreg_wr15(data); break;
default:
- logerror("Z80SCC \"%s\": %c : Unsupported WRx register:%02x\n", m_owner->tag().c_str(), 'A' + m_index, reg);
+ logerror("Z80SCC \"%s\": %c : Unsupported WRx register:%02x\n", m_owner->tag(), 'A' + m_index, reg);
}
}
@@ -1885,7 +1885,7 @@ UINT8 z80scc_channel::data_read()
{
UINT8 data = 0;
- LOG(("%s \"%s\": %c : Data Register Read: \n", FUNCNAME, m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("%s \"%s\": %c : Data Register Read: \n", FUNCNAME, m_owner->tag(), 'A' + m_index));
if (m_rx_fifo_wp != m_rx_fifo_rp)
{
@@ -1986,7 +1986,7 @@ void z80scc_channel::data_write(UINT8 data)
if ((m_wr5 & WR5_TX_ENABLE) && is_transmit_register_empty())
{
- LOG(("%s(%d) \"%s\": %c : Transmit Data Byte '%02x'\n", FUNCNAME, data, m_owner->tag().c_str(), 'A' + m_index, m_tx_data));
+ LOG(("%s(%d) \"%s\": %c : Transmit Data Byte '%02x'\n", FUNCNAME, data, m_owner->tag(), 'A' + m_index, m_tx_data));
transmit_register_setup(m_tx_data);
@@ -2001,7 +2001,7 @@ void z80scc_channel::data_write(UINT8 data)
else
{
m_rr0 &= ~RR0_TX_BUFFER_EMPTY;
- LOG(("%s(%d) \"%s\": %c : failed to send %c,(%02x)\n", FUNCNAME, data, m_owner->tag().c_str(), 'A' + m_index, isascii(data) ? data : ' ', data));
+ LOG(("%s(%d) \"%s\": %c : failed to send %c,(%02x)\n", FUNCNAME, data, m_owner->tag(), 'A' + m_index, isascii(data) ? data : ' ', data));
}
m_rr1 &= ~RR1_ALL_SENT;
@@ -2014,7 +2014,7 @@ void z80scc_channel::data_write(UINT8 data)
void z80scc_channel::receive_data(UINT8 data)
{
- LOG(("Z80SCC \"%s\": %c : Receive Data Byte '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80SCC \"%s\": %c : Receive Data Byte '%02x'\n", m_owner->tag(), 'A' + m_index, data));
if (m_rx_fifo_wp + 1 == m_rx_fifo_rp ||
( (m_rx_fifo_wp + 1 == m_rx_fifo_sz) && (m_rx_fifo_rp == 0) ))
@@ -2065,7 +2065,7 @@ void z80scc_channel::receive_data(UINT8 data)
WRITE_LINE_MEMBER( z80scc_channel::cts_w )
{
- LOG(("Z80SCC \"%s\" %s: %c : CTS %u\n", m_owner->tag().c_str(), __func__, 'A' + m_index, state));
+ LOG(("Z80SCC \"%s\" %s: %c : CTS %u\n", m_owner->tag(), __func__, 'A' + m_index, state));
if (m_cts != state)
{
@@ -2104,7 +2104,7 @@ WRITE_LINE_MEMBER( z80scc_channel::cts_w )
WRITE_LINE_MEMBER( z80scc_channel::dcd_w )
{
- LOG(("Z80SCC \"%s\": %c : DCD %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
+ LOG(("Z80SCC \"%s\": %c : DCD %u\n", m_owner->tag(), 'A' + m_index, state));
if (m_dcd != state)
{
@@ -2142,7 +2142,7 @@ WRITE_LINE_MEMBER( z80scc_channel::dcd_w )
WRITE_LINE_MEMBER( z80scc_channel::ri_w )
{
- LOG(("Z80SCC \"%s\": %c : RI %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
+ LOG(("Z80SCC \"%s\": %c : RI %u\n", m_owner->tag(), 'A' + m_index, state));
if (m_ri != state)
{
@@ -2173,7 +2173,7 @@ WRITE_LINE_MEMBER( z80scc_channel::ri_w )
//-------------------------------------------------
WRITE_LINE_MEMBER( z80scc_channel::sync_w )
{
- LOG(("Z80SCC \"%s\": %c : SYNC %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
+ LOG(("Z80SCC \"%s\": %c : SYNC %u\n", m_owner->tag(), 'A' + m_index, state));
}
//-------------------------------------------------
@@ -2181,7 +2181,7 @@ WRITE_LINE_MEMBER( z80scc_channel::sync_w )
//-------------------------------------------------
WRITE_LINE_MEMBER( z80scc_channel::rxc_w )
{
- //LOG(("Z80SCC \"%s\": %c : Receiver Clock Pulse\n", m_owner->tag().c_str(), m_index + 'A'));
+ //LOG(("Z80SCC \"%s\": %c : Receiver Clock Pulse\n", m_owner->tag(), m_index + 'A'));
if (m_wr3 & WR3_RX_ENABLE)
{
int clocks = get_clock_mode();
@@ -2204,7 +2204,7 @@ WRITE_LINE_MEMBER( z80scc_channel::rxc_w )
//-------------------------------------------------
WRITE_LINE_MEMBER( z80scc_channel::txc_w )
{
- //LOG(("Z80SCC \"%s\": %c : Transmitter Clock Pulse\n", m_owner->tag().c_str(), m_index + 'A'));
+ //LOG(("Z80SCC \"%s\": %c : Transmitter Clock Pulse\n", m_owner->tag(), m_index + 'A'));
if (m_wr5 & WR5_TX_ENABLE)
{
int clocks = get_clock_mode();
@@ -2240,7 +2240,7 @@ void z80scc_channel::update_serial()
else
parity = PARITY_NONE;
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c setting data frame %d+%d%c%d\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, 1,
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c setting data frame %d+%d%c%d\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, 1,
data_bit_count, parity == PARITY_NONE ? 'N' : parity == PARITY_EVEN ? 'E' : 'O', (stop_bits + 1) / 2));
set_data_frame(1, data_bit_count, parity, stop_bits);
diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h
index f5b6bebaf40..7f956ec9b74 100644
--- a/src/devices/machine/z80scc.h
+++ b/src/devices/machine/z80scc.h
@@ -115,7 +115,7 @@ class z80scc_channel : public device_t,
friend class z80scc_device;
public:
- z80scc_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80scc_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -523,8 +523,8 @@ class z80scc_device : public device_t
public:
// construction/destruction
- z80scc_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
- z80scc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80scc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ z80scc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<z80scc_device &>(device).m_out_txda_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dtra_callback(device_t &device, _Object object) { return downcast<z80scc_device &>(device).m_out_dtra_cb.set_callback(object); }
@@ -670,49 +670,49 @@ protected:
class scc8030_device : public z80scc_device
{
public :
- scc8030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scc8030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class scc80C30_device : public z80scc_device
{
public :
- scc80C30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scc80C30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class scc80230_device : public z80scc_device
{
public :
- scc80230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scc80230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class scc8530_device : public z80scc_device
{
public :
- scc8530_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scc8530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class scc85C30_device : public z80scc_device
{
public :
- scc85C30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scc85C30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class scc85230_device : public z80scc_device
{
public :
- scc85230_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scc85230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class scc85233_device : public z80scc_device
{
public :
- scc85233_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scc85233_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class scc8523L_device : public z80scc_device
{
public :
- scc8523L_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ scc8523L_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
// device type definition
diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp
index a83f235d4d6..64d9480dfbf 100644
--- a/src/devices/machine/z80sio.cpp
+++ b/src/devices/machine/z80sio.cpp
@@ -103,7 +103,7 @@ machine_config_constructor z80sio_device::device_mconfig_additions() const
// z80sio_device - constructor
//-------------------------------------------------
-z80sio_device::z80sio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+z80sio_device::z80sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_z80daisy_interface(mconfig, *this),
m_chanA(*this, CHANA_TAG),
@@ -133,7 +133,7 @@ z80sio_device::z80sio_device(const machine_config &mconfig, device_type type, co
elem = 0;
}
-z80sio_device::z80sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80sio_device::z80sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80SIO, "Z80 SIO", tag, owner, clock, "z80sio", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_chanA(*this, CHANA_TAG),
@@ -204,7 +204,7 @@ void z80sio_device::device_start()
//-------------------------------------------------
void z80sio_device::device_reset()
{
- LOG(("%s \"%s\" \n", FUNCNAME, tag().c_str()));
+ LOG(("%s \"%s\" \n", FUNCNAME, tag()));
m_chanA->reset();
m_chanB->reset();
@@ -219,7 +219,7 @@ int z80sio_device::z80daisy_irq_state()
int i;
- LOG(("%s %s A:%d%d%d%d B:%d%d%d%d ",FUNCNAME, tag().c_str(),
+ LOG(("%s %s A:%d%d%d%d B:%d%d%d%d ",FUNCNAME, tag(),
m_int_state[0], m_int_state[1], m_int_state[2], m_int_state[3],
m_int_state[4], m_int_state[5], m_int_state[6], m_int_state[7]));
@@ -248,7 +248,7 @@ int z80sio_device::z80daisy_irq_ack()
{
int i;
- LOG(("%s %s \n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s \n",FUNCNAME, tag()));
// loop over all interrupt sources
for (i = 0; i < 8; i++)
@@ -261,7 +261,7 @@ int z80sio_device::z80daisy_irq_ack()
m_chanA->m_rr0 &= ~z80sio_channel::RR0_INTERRUPT_PENDING;
check_interrupts();
- //LOG(("%s %s \n",FUNCNAME, tag().c_str(), m_chanB->m_rr2));
+ //LOG(("%s %s \n",FUNCNAME, tag(), m_chanB->m_rr2));
return m_chanB->m_rr2;
}
@@ -280,7 +280,7 @@ void z80sio_device::z80daisy_irq_reti()
{
int i;
- LOG(("%s %s \n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s \n",FUNCNAME, tag()));
// loop over all interrupt sources
for (i = 0; i < 8; i++)
@@ -304,7 +304,7 @@ void z80sio_device::z80daisy_irq_reti()
//-------------------------------------------------
void z80sio_device::check_interrupts()
{
- LOG(("%s %s \n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s \n",FUNCNAME, tag()));
int state = (z80daisy_irq_state() & Z80_DAISY_INT) ? ASSERT_LINE : CLEAR_LINE;
m_out_int_cb(state);
}
@@ -315,7 +315,7 @@ void z80sio_device::check_interrupts()
//-------------------------------------------------
void z80sio_device::reset_interrupts()
{
- LOG(("%s %s \n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s \n",FUNCNAME, tag()));
// reset internal interrupt sources
for (auto & elem : m_int_state)
{
@@ -334,7 +334,7 @@ void z80sio_device::trigger_interrupt(int index, int state)
UINT8 vector = m_chanB->m_wr2;
int priority;
- LOG(("%s %s \n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s \n",FUNCNAME, tag()));
#if 0
if((m_variant == TYPE_I8274) || (m_variant == TYPE_UPD7201))
@@ -402,7 +402,7 @@ void z80sio_device::trigger_interrupt(int index, int state)
//-------------------------------------------------
int z80sio_device::m1_r()
{
- LOG(("%s %s \n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s \n",FUNCNAME, tag()));
return z80daisy_irq_ack();
}
@@ -416,7 +416,7 @@ READ8_MEMBER( z80sio_device::cd_ba_r )
int cd = BIT(offset, 1);
z80sio_channel *channel = ba ? m_chanB : m_chanA;
- //LOG(("%s %s %c %s read\n",FUNCNAME, tag().c_str(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
+ //LOG(("%s %s %c %s read\n",FUNCNAME, tag(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
return cd ? channel->control_read() : channel->data_read();
}
@@ -431,7 +431,7 @@ WRITE8_MEMBER( z80sio_device::cd_ba_w )
int cd = BIT(offset, 1);
z80sio_channel *channel = ba ? m_chanB : m_chanA;
- LOG(("%s %s %c %s write\n",FUNCNAME, tag().c_str(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
+ LOG(("%s %s %c %s write\n",FUNCNAME, tag(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
if (cd)
channel->control_write(data);
@@ -449,7 +449,7 @@ READ8_MEMBER( z80sio_device::ba_cd_r )
int cd = BIT(offset, 0);
z80sio_channel *channel = ba ? m_chanB : m_chanA;
- //LOG(("%s %s %c %s read\n",FUNCNAME, tag().c_str(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
+ //LOG(("%s %s %c %s read\n",FUNCNAME, tag(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
return cd ? channel->control_read() : channel->data_read();
}
@@ -464,7 +464,7 @@ WRITE8_MEMBER( z80sio_device::ba_cd_w )
int cd = BIT(offset, 0);
z80sio_channel *channel = ba ? m_chanB : m_chanA;
- LOG(("%s %s %c %s write\n",FUNCNAME, tag().c_str(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
+ LOG(("%s %s %c %s write\n",FUNCNAME, tag(), 'A' + ba ? 1 : 0 , cd ? "control" : "data" ));
if (cd)
channel->control_write(data);
@@ -479,7 +479,7 @@ WRITE8_MEMBER( z80sio_device::ba_cd_w )
//-------------------------------------------------
// z80sio_channel - constructor
//-------------------------------------------------
-z80sio_channel::z80sio_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80sio_channel::z80sio_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80SIO_CHANNEL, "Z80 SIO channel", tag, owner, clock, "z80sio_channel", __FILE__),
device_serial_interface(mconfig, *this),
m_rx_error(0),
@@ -596,7 +596,7 @@ void z80sio_channel::tra_callback()
{
if (!(m_wr5 & WR5_TX_ENABLE))
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
// transmit mark
if (m_index == z80sio_device::CHANNEL_A)
m_uart->m_out_txda_cb(1);
@@ -605,7 +605,7 @@ void z80sio_channel::tra_callback()
}
else if (m_wr5 & WR5_SEND_BREAK)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c send break 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c send break 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
// transmit break
if (m_index == z80sio_device::CHANNEL_A)
m_uart->m_out_txda_cb(0);
@@ -616,7 +616,7 @@ void z80sio_channel::tra_callback()
{
int db = transmit_register_get_data_bit();
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit data bit %d m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, db, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c transmit data bit %d m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, db, m_wr5));
// transmit data
if (m_index == z80sio_device::CHANNEL_A)
m_uart->m_out_txda_cb(db);
@@ -625,8 +625,8 @@ void z80sio_channel::tra_callback()
}
else
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Failed to transmit m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
- logerror("%s \"%s \"Channel %c Failed to transmit\n", FUNCNAME, m_owner->tag().c_str(), 'A' + m_index);
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Failed to transmit m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
+ logerror("%s \"%s \"Channel %c Failed to transmit\n", FUNCNAME, m_owner->tag(), 'A' + m_index);
}
}
@@ -636,10 +636,10 @@ void z80sio_channel::tra_callback()
//-------------------------------------------------
void z80sio_channel::tra_complete()
{
- LOG(("%s %s\n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s\n",FUNCNAME, tag()));
if ((m_wr5 & WR5_TX_ENABLE) && !(m_wr5 & WR5_SEND_BREAK) && !(m_rr0 & RR0_TX_BUFFER_EMPTY))
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Data Byte '%02x' m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_tx_data, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Data Byte '%02x' m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_tx_data, m_wr5));
transmit_register_setup(m_tx_data);
@@ -651,7 +651,7 @@ void z80sio_channel::tra_complete()
}
else if (m_wr5 & WR5_SEND_BREAK)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Break 0 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Break 0 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
// transmit break
if (m_index == z80sio_device::CHANNEL_A)
m_uart->m_out_txda_cb(0);
@@ -660,7 +660,7 @@ void z80sio_channel::tra_complete()
}
else
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit Mark 1 m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
// transmit mark
if (m_index == z80sio_device::CHANNEL_A)
m_uart->m_out_txda_cb(1);
@@ -671,7 +671,7 @@ void z80sio_channel::tra_complete()
// if transmit buffer is empty
if (m_rr0 & RR0_TX_BUFFER_EMPTY)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit buffer empty m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_wr5));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Transmit buffer empty m_wr5:%02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_wr5));
// then all characters have been sent
m_rr1 |= RR1_ALL_SENT;
@@ -689,13 +689,13 @@ void z80sio_channel::rcv_callback()
{
if (m_wr3 & WR3_RX_ENABLE)
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data Bit %d\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, m_rxd));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data Bit %d\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, m_rxd));
receive_register_update_bit(m_rxd);
}
#if 0
else
{
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data Bit but receiver is disabled\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data Bit but receiver is disabled\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index));
logerror("Z80SIO %s() \"%s \"Channel %c Received data dit but receiver is disabled\n", __func__, m_owner->tag(), 'A' + m_index);
}
#endif
@@ -711,7 +711,7 @@ void z80sio_channel::rcv_complete()
receive_register_extract();
data = get_received_char();
- LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data %02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("%" I64FMT "d %s() \"%s \"Channel %c Received Data %02x\n", machine().firstcpu->total_cycles(), FUNCNAME, m_owner->tag(), 'A' + m_index, data));
receive_data(data);
}
@@ -722,7 +722,7 @@ void z80sio_channel::rcv_complete()
int z80sio_channel::get_clock_mode()
{
- LOG(("%s %s\n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s\n",FUNCNAME, tag()));
int clocks = 1;
switch (m_wr4 & WR4_CLOCK_RATE_MASK)
@@ -749,7 +749,7 @@ CR5 = m_wr5 and SR1 = m_rr1
void z80sio_channel::set_rts(int state)
{
- LOG(("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag(), 'A' + m_index));
if (m_index == z80sio_device::CHANNEL_A)
m_uart->m_out_rtsa_cb(state);
else
@@ -758,8 +758,8 @@ void z80sio_channel::set_rts(int state)
void z80sio_channel::update_rts()
{
- // LOG(("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag().c_str(), 'A' + m_index));
- LOG(("%s() \"%s\" Channel %c \n", FUNCNAME, m_owner->tag().c_str(), 'A' + m_index));
+ // LOG(("%s(%d) \"%s\" Channel %c \n", FUNCNAME, state, m_owner->tag(), 'A' + m_index));
+ LOG(("%s() \"%s\" Channel %c \n", FUNCNAME, m_owner->tag(), 'A' + m_index));
if (m_wr5 & WR5_RTS)
{
// when the RTS bit is set, the _RTS output goes low
@@ -782,7 +782,7 @@ void z80sio_channel::update_rts()
device_serial_interface::stop_bits_t z80sio_channel::get_stop_bits()
{
- LOG(("%s %s\n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s\n",FUNCNAME, tag()));
switch (m_wr4 & WR4_STOP_BITS_MASK)
{
case WR4_STOP_BITS_1: return STOP_BITS_1;
@@ -800,7 +800,7 @@ device_serial_interface::stop_bits_t z80sio_channel::get_stop_bits()
int z80sio_channel::get_rx_word_length()
{
- LOG(("%s %s\n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s\n",FUNCNAME, tag()));
int bits = 5;
switch (m_wr3 & WR3_RX_WORD_LENGTH_MASK)
@@ -821,7 +821,7 @@ int z80sio_channel::get_rx_word_length()
int z80sio_channel::get_tx_word_length()
{
- LOG(("%s %s\n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s\n",FUNCNAME, tag()));
int bits = 5;
switch (m_wr5 & WR5_TX_WORD_LENGTH_MASK)
@@ -841,7 +841,7 @@ int z80sio_channel::get_tx_word_length()
* Break/Abort latch. */
UINT8 z80sio_channel::do_sioreg_rr0()
{
- LOG(("%s %s\n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s\n",FUNCNAME, tag()));
return m_rr0;
}
/*
@@ -849,7 +849,7 @@ UINT8 z80sio_channel::do_sioreg_rr0()
* codes for the I-Field in the SDLC Receive Mode. */
UINT8 z80sio_channel::do_sioreg_rr1()
{
- LOG(("%s %s\n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s\n",FUNCNAME, tag()));
return m_rr1;
}
/*
@@ -862,7 +862,7 @@ no interrupts are pending, the vector is modified with V3 = 0, V2 = 1, and
V1 = 1. This register is read only through Channel B. */
UINT8 z80sio_channel::do_sioreg_rr2()
{
- LOG(("%s %s\n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s\n",FUNCNAME, tag()));
// channel B only
return m_index == z80sio_device::CHANNEL_B ? m_rr2 : 0;
}
@@ -877,7 +877,7 @@ UINT8 z80sio_channel::control_read()
UINT8 data = 0;
UINT8 reg = m_wr0 & WR0_REGISTER_MASK;
- //LOG(("%s %s\n",FUNCNAME, tag().c_str()));
+ //LOG(("%s %s\n",FUNCNAME, tag()));
if (reg != 0)
{
// mask out register index
@@ -890,8 +890,8 @@ UINT8 z80sio_channel::control_read()
case REG_RR1_SPEC_RCV_COND: data = do_sioreg_rr1(); break;
case REG_RR2_INTERRUPT_VECT: data = do_sioreg_rr2(); break;
default:
- logerror("Z80SIO \"%s\" Channel %c : Unsupported RRx register:%02x\n", m_owner->tag().c_str(), 'A' + m_index, reg);
- LOG(("%s %s unsupported register:%02x\n",FUNCNAME, tag().c_str(), reg));
+ logerror("Z80SIO \"%s\" Channel %c : Unsupported RRx register:%02x\n", m_owner->tag(), 'A' + m_index, reg);
+ LOG(("%s %s unsupported register:%02x\n",FUNCNAME, tag(), reg));
}
return data;
@@ -901,23 +901,23 @@ UINT8 z80sio_channel::control_read()
Handle the WR0 CRC Reset/Init bits separatelly, needed by derived devices separatelly from the commands */
void z80sio_channel::do_sioreg_wr0_resets(UINT8 data)
{
- LOG(("%s %s\n",FUNCNAME, tag().c_str()));
+ LOG(("%s %s\n",FUNCNAME, tag()));
switch (data & WR0_CRC_RESET_CODE_MASK)
{
case WR0_CRC_RESET_NULL:
- LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_NULL\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_NULL\n", m_owner->tag(), 'A' + m_index));
break;
case WR0_CRC_RESET_RX: /* In Synchronous mode: all Os (zeros) (CCITT-O CRC-16) */
- LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_RX - not implemented\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_RX - not implemented\n", m_owner->tag(), 'A' + m_index));
break;
case WR0_CRC_RESET_TX: /* In HDLC mode: all 1s (ones) (CCITT-1) */
- LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_TX - not implemented\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_TX - not implemented\n", m_owner->tag(), 'A' + m_index));
break;
case WR0_CRC_RESET_TX_UNDERRUN: /* Resets Tx underrun/EOM bit (D6 of the SRO register) */
- LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_TX_UNDERRUN - not implemented\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : CRC_RESET_TX_UNDERRUN - not implemented\n", m_owner->tag(), 'A' + m_index));
break;
default: /* Will not happen unless someone messes with the mask */
- logerror("Z80SIO \"%s\" Channel %c : %s Wrong CRC reset/init command:%02x\n", m_owner->tag().c_str(), 'A' + m_index, FUNCNAME, data & WR0_CRC_RESET_CODE_MASK);
+ logerror("Z80SIO \"%s\" Channel %c : %s Wrong CRC reset/init command:%02x\n", m_owner->tag(), 'A' + m_index, FUNCNAME, data & WR0_CRC_RESET_CODE_MASK);
}
}
@@ -927,7 +927,7 @@ void z80sio_channel::do_sioreg_wr0(UINT8 data)
switch (data & WR0_COMMAND_MASK)
{
case WR0_NULL:
- LOG(("Z80SIO \"%s\" Channel %c : Null\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Null\n", m_owner->tag(), 'A' + m_index));
break;
case WR0_RESET_EXT_STATUS:
// reset external/status interrupt
@@ -939,35 +939,35 @@ void z80sio_channel::do_sioreg_wr0(UINT8 data)
if (m_sync) m_rr0 |= RR0_SYNC_HUNT;
if (m_cts) m_rr0 |= RR0_CTS;
- LOG(("Z80SIO \"%s\" Channel %c : Reset External/Status Interrupt\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Reset External/Status Interrupt\n", m_owner->tag(), 'A' + m_index));
break;
case WR0_CHANNEL_RESET:
// channel reset
- LOG(("Z80SIO \"%s\" Channel %c : Channel Reset\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Channel Reset\n", m_owner->tag(), 'A' + m_index));
device_reset();
break;
case WR0_ENABLE_INT_NEXT_RX:
// enable interrupt on next receive character
- LOG(("Z80SIO \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Enable Interrupt on Next Received Character\n", m_owner->tag(), 'A' + m_index));
m_rx_first = 1;
break;
case WR0_RESET_TX_INT:
// reset transmitter interrupt pending
- LOG(("Z80SIO \"%s\" Channel %c : Reset Transmitter Interrupt Pending\n", m_owner->tag().c_str(), 'A' + m_index));
- logerror("Z80SIO \"%s\" Channel %c : unsupported command: Reset Transmitter Interrupt Pending\n", m_owner->tag().c_str(), 'A' + m_index);
+ LOG(("Z80SIO \"%s\" Channel %c : Reset Transmitter Interrupt Pending\n", m_owner->tag(), 'A' + m_index));
+ logerror("Z80SIO \"%s\" Channel %c : unsupported command: Reset Transmitter Interrupt Pending\n", m_owner->tag(), 'A' + m_index);
break;
case WR0_ERROR_RESET:
// error reset
- LOG(("Z80SIO \"%s\" Channel %c : Error Reset\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Error Reset\n", m_owner->tag(), 'A' + m_index));
m_rr1 &= ~(RR1_CRC_FRAMING_ERROR | RR1_RX_OVERRUN_ERROR | RR1_PARITY_ERROR);
break;
case WR0_RETURN_FROM_INT:
// return from interrupt
- LOG(("Z80SIO \"%s\" Channel %c : Return from Interrupt\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Return from Interrupt\n", m_owner->tag(), 'A' + m_index));
m_uart->z80daisy_irq_reti();
break;
default:
- LOG(("Z80SIO \"%s\" Channel %c : Unsupported WR0 command %02x mask %02x\n", m_owner->tag().c_str(), 'A' + m_index, data, WR0_REGISTER_MASK));
+ LOG(("Z80SIO \"%s\" Channel %c : Unsupported WR0 command %02x mask %02x\n", m_owner->tag(), 'A' + m_index, data, WR0_REGISTER_MASK));
}
do_sioreg_wr0_resets(data);
@@ -977,29 +977,29 @@ void z80sio_channel::do_sioreg_wr1(UINT8 data)
{
/* TODO: implement vector modifications when WR1 bit D2 is changed */
m_wr1 = data;
- LOG(("Z80SIO \"%s\" Channel %c : External Interrupt Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_EXT_INT_ENABLE) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Transmit Interrupt Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_TX_INT_ENABLE) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Status Affects Vector %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_STATUS_VECTOR) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_WRDY_ENABLE) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready Function %s\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_WRDY_FUNCTION) ? "Ready" : "Wait"));
- LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready on %s\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR1_WRDY_ON_RX_TX) ? "Receive" : "Transmit"));
+ LOG(("Z80SIO \"%s\" Channel %c : External Interrupt Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_EXT_INT_ENABLE) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Transmit Interrupt Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_TX_INT_ENABLE) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Status Affects Vector %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_STATUS_VECTOR) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_ENABLE) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready Function %s\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_FUNCTION) ? "Ready" : "Wait"));
+ LOG(("Z80SIO \"%s\" Channel %c : Wait/Ready on %s\n", m_owner->tag(), 'A' + m_index, (data & WR1_WRDY_ON_RX_TX) ? "Receive" : "Transmit"));
switch (data & WR1_RX_INT_MODE_MASK)
{
case WR1_RX_INT_DISABLE:
- LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt Disabled\n", m_owner->tag(), 'A' + m_index));
break;
case WR1_RX_INT_FIRST:
- LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on First Character\n", m_owner->tag(), 'A' + m_index));
break;
case WR1_RX_INT_ALL_PARITY:
- LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters, Parity Affects Vector\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters, Parity Affects Vector\n", m_owner->tag(), 'A' + m_index));
break;
case WR1_RX_INT_ALL:
- LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag().c_str(), 'A' + m_index));
+ LOG(("Z80SIO \"%s\" Channel %c : Receiver Interrupt on All Characters\n", m_owner->tag(), 'A' + m_index));
break;
}
}
@@ -1015,45 +1015,45 @@ void z80sio_channel::do_sioreg_wr2(UINT8 data)
m_rr2 = m_wr2;
}
m_uart->check_interrupts();
- LOG(("Z80SIO \"%s\" Channel %c : Interrupt Vector %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80SIO \"%s\" Channel %c : Interrupt Vector %02x\n", m_owner->tag(), 'A' + m_index, data));
}
void z80sio_channel::do_sioreg_wr3(UINT8 data)
{
m_wr3 = data;
- LOG(("Z80SIO \"%s\" Channel %c : Receiver Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR3_RX_ENABLE) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Auto Enables %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR3_AUTO_ENABLES) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Receiver Bits/Character %u\n", m_owner->tag().c_str(), 'A' + m_index, get_rx_word_length()));
+ LOG(("Z80SIO \"%s\" Channel %c : Receiver Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR3_RX_ENABLE) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Auto Enables %u\n", m_owner->tag(), 'A' + m_index, (data & WR3_AUTO_ENABLES) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Receiver Bits/Character %u\n", m_owner->tag(), 'A' + m_index, get_rx_word_length()));
}
void z80sio_channel::do_sioreg_wr4(UINT8 data)
{
m_wr4 = data;
- LOG(("Z80SIO \"%s\" Channel %c : Parity Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR4_PARITY_ENABLE) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Parity %s\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR4_PARITY_EVEN) ? "Even" : "Odd"));
- LOG(("Z80SIO \"%s\" Channel %c : Stop Bits %s\n", m_owner->tag().c_str(), 'A' + m_index, stop_bits_tostring(get_stop_bits())));
- LOG(("Z80SIO \"%s\" Channel %c : Clock Mode %uX\n", m_owner->tag().c_str(), 'A' + m_index, get_clock_mode()));
+ LOG(("Z80SIO \"%s\" Channel %c : Parity Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR4_PARITY_ENABLE) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Parity %s\n", m_owner->tag(), 'A' + m_index, (data & WR4_PARITY_EVEN) ? "Even" : "Odd"));
+ LOG(("Z80SIO \"%s\" Channel %c : Stop Bits %s\n", m_owner->tag(), 'A' + m_index, stop_bits_tostring(get_stop_bits())));
+ LOG(("Z80SIO \"%s\" Channel %c : Clock Mode %uX\n", m_owner->tag(), 'A' + m_index, get_clock_mode()));
}
void z80sio_channel::do_sioreg_wr5(UINT8 data)
{
m_wr5 = data;
- LOG(("Z80SIO \"%s\" Channel %c : Transmitter Enable %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_TX_ENABLE) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Transmitter Bits/Character %u\n", m_owner->tag().c_str(), 'A' + m_index, get_tx_word_length()));
- LOG(("Z80SIO \"%s\" Channel %c : Send Break %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_SEND_BREAK) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Request to Send %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_RTS) ? 1 : 0));
- LOG(("Z80SIO \"%s\" Channel %c : Data Terminal Ready %u\n", m_owner->tag().c_str(), 'A' + m_index, (data & WR5_DTR) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Transmitter Enable %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_TX_ENABLE) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Transmitter Bits/Character %u\n", m_owner->tag(), 'A' + m_index, get_tx_word_length()));
+ LOG(("Z80SIO \"%s\" Channel %c : Send Break %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_SEND_BREAK) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Request to Send %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_RTS) ? 1 : 0));
+ LOG(("Z80SIO \"%s\" Channel %c : Data Terminal Ready %u\n", m_owner->tag(), 'A' + m_index, (data & WR5_DTR) ? 1 : 0));
}
void z80sio_channel::do_sioreg_wr6(UINT8 data)
{
- LOG(("Z80SIO \"%s\" Channel %c : Transmit Sync %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80SIO \"%s\" Channel %c : Transmit Sync %02x\n", m_owner->tag(), 'A' + m_index, data));
m_sync = (m_sync & 0xff00) | data;
}
void z80sio_channel::do_sioreg_wr7(UINT8 data)
{
- LOG(("Z80SIO \"%s\" Channel %c : Receive Sync %02x\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80SIO \"%s\" Channel %c : Receive Sync %02x\n", m_owner->tag(), 'A' + m_index, data));
m_sync = (data << 8) | (m_sync & 0xff);
}
@@ -1083,7 +1083,7 @@ void z80sio_channel::control_write(UINT8 data)
case REG_WR6_SYNC_OR_SDLC_A: do_sioreg_wr6(data); break;
case REG_WR7_SYNC_OR_SDLC_F: do_sioreg_wr7(data); break;
default:
- logerror("Z80SIO \"%s\" Channel %c : Unsupported WRx register:%02x\n", m_owner->tag().c_str(), 'A' + m_index, reg);
+ logerror("Z80SIO \"%s\" Channel %c : Unsupported WRx register:%02x\n", m_owner->tag(), 'A' + m_index, reg);
}
}
@@ -1113,7 +1113,7 @@ UINT8 z80sio_channel::data_read()
}
}
- LOG(("Z80SIO \"%s\" Channel %c : Data Register Read '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, data));
+ LOG(("Z80SIO \"%s\" Channel %c : Data Register Read '%02x'\n", m_owner->tag(), 'A' + m_index, data));
return data;
}
@@ -1128,7 +1128,7 @@ void z80sio_channel::data_write(UINT8 data)
if ((m_wr5 & WR5_TX_ENABLE) && is_transmit_register_empty())
{
- LOG(("Z80SIO \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag().c_str(), 'A' + m_index, m_tx_data));
+ LOG(("Z80SIO \"%s\" Channel %c : Transmit Data Byte '%02x'\n", m_owner->tag(), 'A' + m_index, m_tx_data));
transmit_register_setup(m_tx_data);
@@ -1153,7 +1153,7 @@ void z80sio_channel::data_write(UINT8 data)
//-------------------------------------------------
void z80sio_channel::receive_data(UINT8 data)
{
- LOG(("%s(%02x) %s:%c\n",FUNCNAME, data, tag().c_str(), 'A' + m_index));
+ LOG(("%s(%02x) %s:%c\n",FUNCNAME, data, tag(), 'A' + m_index));
if (m_rx_fifo == 2)
{
@@ -1215,7 +1215,7 @@ void z80sio_channel::receive_data(UINT8 data)
WRITE_LINE_MEMBER( z80sio_channel::cts_w )
{
- LOG(("%s(%02x) %s:%c\n",FUNCNAME, state, tag().c_str(), 'A' + m_index));
+ LOG(("%s(%02x) %s:%c\n",FUNCNAME, state, tag(), 'A' + m_index));
if (m_cts != state)
{
@@ -1254,7 +1254,7 @@ WRITE_LINE_MEMBER( z80sio_channel::cts_w )
WRITE_LINE_MEMBER( z80sio_channel::dcd_w )
{
- LOG(("Z80SIO \"%s\" Channel %c : DCD %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
+ LOG(("Z80SIO \"%s\" Channel %c : DCD %u\n", m_owner->tag(), 'A' + m_index, state));
if (m_dcd != state)
{
@@ -1292,7 +1292,7 @@ WRITE_LINE_MEMBER( z80sio_channel::dcd_w )
WRITE_LINE_MEMBER( z80sio_channel::sync_w )
{
- LOG(("Z80SIO \"%s\" Channel %c : Sync %u\n", m_owner->tag().c_str(), 'A' + m_index, state));
+ LOG(("Z80SIO \"%s\" Channel %c : Sync %u\n", m_owner->tag(), 'A' + m_index, state));
if (m_sh != state)
{
@@ -1325,7 +1325,7 @@ WRITE_LINE_MEMBER( z80sio_channel::sync_w )
WRITE_LINE_MEMBER( z80sio_channel::rxc_w )
{
- //LOG(("Z80SIO \"%s\" Channel %c : Receiver Clock Pulse\n", m_owner->tag().c_str(), m_index + 'A'));
+ //LOG(("Z80SIO \"%s\" Channel %c : Receiver Clock Pulse\n", m_owner->tag(), m_index + 'A'));
int clocks = get_clock_mode();
if (clocks == 1)
rx_clock_w(state);
@@ -1347,7 +1347,7 @@ WRITE_LINE_MEMBER( z80sio_channel::rxc_w )
WRITE_LINE_MEMBER( z80sio_channel::txc_w )
{
- //LOG(("Z80SIO \"%s\" Channel %c : Transmitter Clock Pulse\n", m_owner->tag().c_str(), m_index + 'A'));
+ //LOG(("Z80SIO \"%s\" Channel %c : Transmitter Clock Pulse\n", m_owner->tag(), m_index + 'A'));
int clocks = get_clock_mode();
if (clocks == 1)
tx_clock_w(state);
diff --git a/src/devices/machine/z80sio.h b/src/devices/machine/z80sio.h
index b22c12e8275..3eac1e98d69 100644
--- a/src/devices/machine/z80sio.h
+++ b/src/devices/machine/z80sio.h
@@ -129,7 +129,7 @@ class z80sio_channel : public device_t,
friend class z80sio_device;
public:
- z80sio_channel(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80sio_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_start() override;
@@ -405,8 +405,8 @@ class z80sio_device : public device_t,
public:
// construction/destruction
- z80sio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
- z80sio_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ z80sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_txda_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_out_txda_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dtra_callback(device_t &device, _Object object) { return downcast<z80sio_device &>(device).m_out_dtra_cb.set_callback(object); }
diff --git a/src/devices/machine/z80sti.cpp b/src/devices/machine/z80sti.cpp
index bdc4c1bfefa..e8900abd021 100644
--- a/src/devices/machine/z80sti.cpp
+++ b/src/devices/machine/z80sti.cpp
@@ -82,7 +82,7 @@ const int z80sti_device::PRESCALER[] = { 0, 4, 10, 16, 50, 64, 100, 200 };
// z80sti_device - constructor
//-------------------------------------------------
-z80sti_device::z80sti_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+z80sti_device::z80sti_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, Z80STI, "Mostek MK3801", tag, owner, clock, "z80sti", __FILE__),
device_serial_interface(mconfig, *this),
device_z80daisy_interface(mconfig, *this),
@@ -249,7 +249,7 @@ int z80sti_device::z80daisy_irq_state()
}
}
- LOG(("Z80STI '%s' Interrupt State: %u\n", tag().c_str(), state));
+ LOG(("Z80STI '%s' Interrupt State: %u\n", tag(), state));
return state;
}
@@ -282,7 +282,7 @@ int z80sti_device::z80daisy_irq_ack()
check_interrupts();
- LOG(("Z80STI '%s' Interrupt Acknowledge Vector: %02x\n", tag().c_str(), vector));
+ LOG(("Z80STI '%s' Interrupt Acknowledge Vector: %02x\n", tag(), vector));
return vector;
}
@@ -302,7 +302,7 @@ void z80sti_device::z80daisy_irq_reti()
{
int i;
- LOG(("Z80STI '%s' Return from Interrupt\n", tag().c_str()));
+ LOG(("Z80STI '%s' Return from Interrupt\n", tag()));
// loop over all interrupt sources
for (i = 15; i >= 0; i--)
@@ -421,39 +421,39 @@ WRITE8_MEMBER( z80sti_device::write )
switch (m_pvr & 0x07)
{
case REGISTER_IR_SCR:
- LOG(("Z80STI '%s' Sync Character Register: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Sync Character Register: %x\n", tag(), data));
m_scr = data;
break;
case REGISTER_IR_TDDR:
- LOG(("Z80STI '%s' Timer D Data Register: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Timer D Data Register: %x\n", tag(), data));
m_tdr[TIMER_D] = data;
break;
case REGISTER_IR_TCDR:
- LOG(("Z80STI '%s' Timer C Data Register: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Timer C Data Register: %x\n", tag(), data));
m_tdr[TIMER_C] = data;
break;
case REGISTER_IR_AER:
- LOG(("Z80STI '%s' Active Edge Register: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Active Edge Register: %x\n", tag(), data));
m_aer = data;
break;
case REGISTER_IR_IERB:
- LOG(("Z80STI '%s' Interrupt Enable Register B: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Interrupt Enable Register B: %x\n", tag(), data));
m_ier = (m_ier & 0xff00) | data;
check_interrupts();
break;
case REGISTER_IR_IERA:
- LOG(("Z80STI '%s' Interrupt Enable Register A: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Interrupt Enable Register A: %x\n", tag(), data));
m_ier = (data << 8) | (m_ier & 0xff);
check_interrupts();
break;
case REGISTER_IR_DDR:
- LOG(("Z80STI '%s' Data Direction Register: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Data Direction Register: %x\n", tag(), data));
m_ddr = data;
break;
@@ -464,8 +464,8 @@ WRITE8_MEMBER( z80sti_device::write )
m_tcdc = data;
- LOG(("Z80STI '%s' Timer C Prescaler: %u\n", tag().c_str(), tcc));
- LOG(("Z80STI '%s' Timer D Prescaler: %u\n", tag().c_str(), tdc));
+ LOG(("Z80STI '%s' Timer C Prescaler: %u\n", tag(), tcc));
+ LOG(("Z80STI '%s' Timer D Prescaler: %u\n", tag(), tdc));
if (tcc)
m_timer[TIMER_C]->adjust(attotime::from_hz(clock() / tcc), TIMER_C, attotime::from_hz(clock() / tcc));
@@ -479,7 +479,7 @@ WRITE8_MEMBER( z80sti_device::write )
if (BIT(data, 7))
{
- LOG(("Z80STI '%s' Timer A Reset\n", tag().c_str()));
+ LOG(("Z80STI '%s' Timer A Reset\n", tag()));
m_to[TIMER_A] = 0;
m_out_tao_cb(m_to[TIMER_A]);
@@ -487,7 +487,7 @@ WRITE8_MEMBER( z80sti_device::write )
if (BIT(data, 3))
{
- LOG(("Z80STI '%s' Timer B Reset\n", tag().c_str()));
+ LOG(("Z80STI '%s' Timer B Reset\n", tag()));
m_to[TIMER_B] = 0;
m_out_tbo_cb(m_to[TIMER_B]);
@@ -498,7 +498,7 @@ WRITE8_MEMBER( z80sti_device::write )
break;
case REGISTER_GPIP:
- LOG(("Z80STI '%s' General Purpose I/O Register: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' General Purpose I/O Register: %x\n", tag(), data));
m_gpip = data & m_ddr;
m_out_gpio_cb((offs_t)0, m_gpip);
break;
@@ -506,7 +506,7 @@ WRITE8_MEMBER( z80sti_device::write )
case REGISTER_IPRB:
{
int i;
- LOG(("Z80STI '%s' Interrupt Pending Register B: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Interrupt Pending Register B: %x\n", tag(), data));
m_ipr &= (m_ipr & 0xff00) | data;
for (i = 0; i < 16; i++)
@@ -521,7 +521,7 @@ WRITE8_MEMBER( z80sti_device::write )
case REGISTER_IPRA:
{
int i;
- LOG(("Z80STI '%s' Interrupt Pending Register A: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Interrupt Pending Register A: %x\n", tag(), data));
m_ipr &= (data << 8) | (m_ipr & 0xff);
for (i = 0; i < 16; i++)
@@ -534,32 +534,32 @@ WRITE8_MEMBER( z80sti_device::write )
break;
case REGISTER_ISRB:
- LOG(("Z80STI '%s' Interrupt In-Service Register B: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Interrupt In-Service Register B: %x\n", tag(), data));
m_isr &= (m_isr & 0xff00) | data;
break;
case REGISTER_ISRA:
- LOG(("Z80STI '%s' Interrupt In-Service Register A: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Interrupt In-Service Register A: %x\n", tag(), data));
m_isr &= (data << 8) | (m_isr & 0xff);
break;
case REGISTER_IMRB:
- LOG(("Z80STI '%s' Interrupt Mask Register B: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Interrupt Mask Register B: %x\n", tag(), data));
m_imr = (m_imr & 0xff00) | data;
m_isr &= m_imr;
check_interrupts();
break;
case REGISTER_IMRA:
- LOG(("Z80STI '%s' Interrupt Mask Register A: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Interrupt Mask Register A: %x\n", tag(), data));
m_imr = (data << 8) | (m_imr & 0xff);
m_isr &= m_imr;
check_interrupts();
break;
case REGISTER_PVR:
- LOG(("Z80STI '%s' Interrupt Vector: %02x\n", tag().c_str(), data & 0xe0));
- LOG(("Z80STI '%s' IR Address: %01x\n", tag().c_str(), data & 0x07));
+ LOG(("Z80STI '%s' Interrupt Vector: %02x\n", tag(), data & 0xe0));
+ LOG(("Z80STI '%s' IR Address: %01x\n", tag(), data & 0x07));
m_pvr = data;
break;
@@ -570,8 +570,8 @@ WRITE8_MEMBER( z80sti_device::write )
m_tabc = data;
- LOG(("Z80STI '%s' Timer A Prescaler: %u\n", tag().c_str(), tac));
- LOG(("Z80STI '%s' Timer B Prescaler: %u\n", tag().c_str(), tbc));
+ LOG(("Z80STI '%s' Timer A Prescaler: %u\n", tag(), tac));
+ LOG(("Z80STI '%s' Timer B Prescaler: %u\n", tag(), tbc));
if (tac)
m_timer[TIMER_A]->adjust(attotime::from_hz(clock() / tac), TIMER_A, attotime::from_hz(clock() / tac));
@@ -586,32 +586,32 @@ WRITE8_MEMBER( z80sti_device::write )
break;
case REGISTER_TBDR:
- LOG(("Z80STI '%s' Timer B Data Register: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Timer B Data Register: %x\n", tag(), data));
m_tdr[TIMER_B] = data;
break;
case REGISTER_TADR:
- LOG(("Z80STI '%s' Timer A Data Register: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Timer A Data Register: %x\n", tag(), data));
m_tdr[TIMER_A] = data;
break;
case REGISTER_UCR:
- LOG(("Z80STI '%s' USART Control Register: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' USART Control Register: %x\n", tag(), data));
m_ucr = data;
break;
case REGISTER_RSR:
- LOG(("Z80STI '%s' Receiver Status Register: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Receiver Status Register: %x\n", tag(), data));
m_rsr = data;
break;
case REGISTER_TSR:
- LOG(("Z80STI '%s' Transmitter Status Register: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' Transmitter Status Register: %x\n", tag(), data));
m_tsr = data;
break;
case REGISTER_UDR:
- LOG(("Z80STI '%s' USART Data Register: %x\n", tag().c_str(), data));
+ LOG(("Z80STI '%s' USART Data Register: %x\n", tag(), data));
m_udr = data;
break;
}
@@ -626,7 +626,7 @@ void z80sti_device::timer_count(int index)
{
if (m_tmc[index] == 0x01)
{
- //LOG(("Z80STI '%s' Timer %c Expired\n", tag().c_str(), 'A' + index));
+ //LOG(("Z80STI '%s' Timer %c Expired\n", tag(), 'A' + index));
// toggle timer output signal
m_to[index] = !m_to[index];
@@ -649,7 +649,7 @@ void z80sti_device::timer_count(int index)
if (m_ier & (1 << INT_LEVEL_TIMER[index]))
{
- LOG(("Z80STI '%s' Interrupt Pending for Timer %c\n", tag().c_str(), 'A' + index));
+ LOG(("Z80STI '%s' Interrupt Pending for Timer %c\n", tag(), 'A' + index));
// signal timer elapsed interrupt
take_interrupt(INT_LEVEL_TIMER[index]);
@@ -677,11 +677,11 @@ void z80sti_device::gpip_input(int bit, int state)
if ((old_state ^ aer) && !(state ^ aer))
{
- LOG(("Z80STI '%s' Edge Transition Detected on Bit: %u\n", tag().c_str(), bit));
+ LOG(("Z80STI '%s' Edge Transition Detected on Bit: %u\n", tag(), bit));
if (m_ier & (1 << INT_LEVEL_GPIP[bit]))
{
- LOG(("Z80STI '%s' Interrupt Pending for P%u\n", tag().c_str(), bit));
+ LOG(("Z80STI '%s' Interrupt Pending for P%u\n", tag(), bit));
take_interrupt(INT_LEVEL_GPIP[bit]);
}
diff --git a/src/devices/machine/z80sti.h b/src/devices/machine/z80sti.h
index a41b1a78161..f0db981ac9e 100644
--- a/src/devices/machine/z80sti.h
+++ b/src/devices/machine/z80sti.h
@@ -81,7 +81,7 @@ class z80sti_device : public device_t,
{
public:
// construction/destruction
- z80sti_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z80sti_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_int_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_gpio_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_in_gpio_cb.set_callback(object); }
diff --git a/src/devices/machine/z8536.cpp b/src/devices/machine/z8536.cpp
index 02e027e404f..f10b1c8f97a 100644
--- a/src/devices/machine/z8536.cpp
+++ b/src/devices/machine/z8536.cpp
@@ -238,7 +238,7 @@ void z8536_device::check_interrupt()
if (m_irq != state)
{
- if (LOG) logerror("%s Z8536 '%s' Interrupt: %u\n", machine().describe_context(), tag().c_str(), state);
+ if (LOG) logerror("%s Z8536 '%s' Interrupt: %u\n", machine().describe_context(), tag(), state);
m_irq = state;
m_write_irq(state);
}
@@ -343,7 +343,7 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
case MASTER_INTERRUPT_CONTROL:
if (data & MICR_RESET)
{
- if (LOG) logerror("%s Z8536 '%s' Reset\n", machine().describe_context(), tag().c_str());
+ if (LOG) logerror("%s Z8536 '%s' Reset\n", machine().describe_context(), tag());
device_reset();
}
else
@@ -355,13 +355,13 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
if (LOG)
{
- if (LOG) logerror("%s Z8536 '%s' Master Interrupt Enable: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_MIE) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Disable Lower Chain: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_DLC) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' No Vector: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_NV) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Port A Vector Includes Status: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_PA_VIS) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Port B Vector Includes Status: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_PB_VIS) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer Vector Includes Status: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_CT_VIS) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Right Justified Address: %u\n", machine().describe_context(), tag().c_str(), (data & MICR_RJA) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Master Interrupt Enable: %u\n", machine().describe_context(), tag(), (data & MICR_MIE) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Disable Lower Chain: %u\n", machine().describe_context(), tag(), (data & MICR_DLC) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' No Vector: %u\n", machine().describe_context(), tag(), (data & MICR_NV) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Port A Vector Includes Status: %u\n", machine().describe_context(), tag(), (data & MICR_PA_VIS) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Port B Vector Includes Status: %u\n", machine().describe_context(), tag(), (data & MICR_PB_VIS) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer Vector Includes Status: %u\n", machine().describe_context(), tag(), (data & MICR_CT_VIS) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Right Justified Address: %u\n", machine().describe_context(), tag(), (data & MICR_RJA) ? 1 : 0);
}
m_register[offset] = data;
@@ -371,13 +371,13 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
case MASTER_CONFIGURATION_CONTROL:
if (LOG)
{
- if (LOG) logerror("%s Z8536 '%s' Port B Enable: %u\n", machine().describe_context(), tag().c_str(), (data & MCCR_PBE) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer 1 Enable: %u\n", machine().describe_context(), tag().c_str(), (data & MCCR_CT1E) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer 2 Enable: %u\n", machine().describe_context(), tag().c_str(), (data & MCCR_CT2E) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Port C and Counter/Timer 3 Enable: %u\n", machine().describe_context(), tag().c_str(), (data & MCCR_PCE_CT3E) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Port A Enable: %u\n", machine().describe_context(), tag().c_str(), (data & MCCR_PAE) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Port Link Control: %u\n", machine().describe_context(), tag().c_str(), (data & MCCR_PLC) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer Link Controls: %u\n", machine().describe_context(), tag().c_str(), data & MCCR_LC_MASK);
+ if (LOG) logerror("%s Z8536 '%s' Port B Enable: %u\n", machine().describe_context(), tag(), (data & MCCR_PBE) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer 1 Enable: %u\n", machine().describe_context(), tag(), (data & MCCR_CT1E) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer 2 Enable: %u\n", machine().describe_context(), tag(), (data & MCCR_CT2E) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Port C and Counter/Timer 3 Enable: %u\n", machine().describe_context(), tag(), (data & MCCR_PCE_CT3E) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Port A Enable: %u\n", machine().describe_context(), tag(), (data & MCCR_PAE) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Port Link Control: %u\n", machine().describe_context(), tag(), (data & MCCR_PLC) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer Link Controls: %u\n", machine().describe_context(), tag(), data & MCCR_LC_MASK);
}
m_register[offset] = data;
@@ -390,32 +390,32 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
break;
case PORT_A_INTERRUPT_VECTOR:
- if (LOG) logerror("%s Z8536 '%s' Port A Interrupt Vector: %02x\n", machine().describe_context(), tag().c_str(), data);
+ if (LOG) logerror("%s Z8536 '%s' Port A Interrupt Vector: %02x\n", machine().describe_context(), tag(), data);
m_register[offset] = data;
break;
case PORT_B_INTERRUPT_VECTOR:
- if (LOG) logerror("%s Z8536 '%s' Port B Interrupt Vector: %02x\n", machine().describe_context(), tag().c_str(), data);
+ if (LOG) logerror("%s Z8536 '%s' Port B Interrupt Vector: %02x\n", machine().describe_context(), tag(), data);
m_register[offset] = data;
break;
case COUNTER_TIMER_INTERRUPT_VECTOR:
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer Interrupt Vector: %02x\n", machine().describe_context(), tag().c_str(), data);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer Interrupt Vector: %02x\n", machine().describe_context(), tag(), data);
m_register[offset] = data;
break;
case PORT_C_DATA_PATH_POLARITY:
- if (LOG) logerror("%s Z8536 '%s' Port C Data Path Polarity: %02x\n", machine().describe_context(), tag().c_str(), data);
+ if (LOG) logerror("%s Z8536 '%s' Port C Data Path Polarity: %02x\n", machine().describe_context(), tag(), data);
m_register[offset] = data;
break;
case PORT_C_DATA_DIRECTION:
- if (LOG) logerror("%s Z8536 '%s' Port C Data Direction: %02x\n", machine().describe_context(), tag().c_str(), data);
+ if (LOG) logerror("%s Z8536 '%s' Port C Data Direction: %02x\n", machine().describe_context(), tag(), data);
m_register[offset] = data;
break;
case PORT_C_SPECIAL_IO_CONTROL:
- if (LOG) logerror("%s Z8536 '%s' Port C Special I/O Control: %02x\n", machine().describe_context(), tag().c_str(), data);
+ if (LOG) logerror("%s Z8536 '%s' Port C Special I/O Control: %02x\n", machine().describe_context(), tag(), data);
m_register[offset] = data;
break;
@@ -424,17 +424,17 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
{
char port = 'A' + offset - PORT_A_COMMAND_AND_STATUS;
- if (LOG) logerror("%s Z8536 '%s' Port %c Interrupt on Error: %u\n", machine().describe_context(), tag().c_str(), port, (data & PCS_IOE) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Interrupt on Error: %u\n", machine().describe_context(), tag(), port, (data & PCS_IOE) ? 1 : 0);
switch (data >> 5)
{
- case IC_CLEAR_IP_IUS: m_register[offset] &= ~(PCS_IP | PCS_IUS); if (LOG) logerror("%s Z8536 '%s' Port %c Clear IP/IUS\n", machine().describe_context(), tag().c_str(), port); break;
- case IC_SET_IUS: m_register[offset] |= PCS_IUS; if (LOG) logerror("%s Z8536 '%s' Port %c Set IUS\n", machine().describe_context(), tag().c_str(), port); break;
- case IC_CLEAR_IUS: m_register[offset] &= ~PCS_IUS; if (LOG) logerror("%s Z8536 '%s' Port %c Clear IUS\n", machine().describe_context(), tag().c_str(), port); break;
- case IC_SET_IP: m_register[offset] |= PCS_IP; if (LOG) logerror("%s Z8536 '%s' Port %c Set IP\n", machine().describe_context(), tag().c_str(), port); break;
- case IC_CLEAR_IP: m_register[offset] &= ~PCS_IP; if (LOG) logerror("%s Z8536 '%s' Port %c Clear IP\n", machine().describe_context(), tag().c_str(), port); break;
- case IC_SET_IE: m_register[offset] |= PCS_IE; if (LOG) logerror("%s Z8536 '%s' Port %c Set IE\n", machine().describe_context(), tag().c_str(), port); break;
- case IC_CLEAR_IE: m_register[offset] &= ~PCS_IE; if (LOG) logerror("%s Z8536 '%s' Port %c Clear IE\n", machine().describe_context(), tag().c_str(), port); break;
+ case IC_CLEAR_IP_IUS: m_register[offset] &= ~(PCS_IP | PCS_IUS); if (LOG) logerror("%s Z8536 '%s' Port %c Clear IP/IUS\n", machine().describe_context(), tag(), port); break;
+ case IC_SET_IUS: m_register[offset] |= PCS_IUS; if (LOG) logerror("%s Z8536 '%s' Port %c Set IUS\n", machine().describe_context(), tag(), port); break;
+ case IC_CLEAR_IUS: m_register[offset] &= ~PCS_IUS; if (LOG) logerror("%s Z8536 '%s' Port %c Clear IUS\n", machine().describe_context(), tag(), port); break;
+ case IC_SET_IP: m_register[offset] |= PCS_IP; if (LOG) logerror("%s Z8536 '%s' Port %c Set IP\n", machine().describe_context(), tag(), port); break;
+ case IC_CLEAR_IP: m_register[offset] &= ~PCS_IP; if (LOG) logerror("%s Z8536 '%s' Port %c Clear IP\n", machine().describe_context(), tag(), port); break;
+ case IC_SET_IE: m_register[offset] |= PCS_IE; if (LOG) logerror("%s Z8536 '%s' Port %c Set IE\n", machine().describe_context(), tag(), port); break;
+ case IC_CLEAR_IE: m_register[offset] &= ~PCS_IE; if (LOG) logerror("%s Z8536 '%s' Port %c Clear IE\n", machine().describe_context(), tag(), port); break;
}
m_register[offset] = (m_register[offset] & ~PCS_IOE) | (data & PCS_IOE);
@@ -452,20 +452,20 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
if (LOG)
{
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Trigger Command Bit: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTCS_TCB) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Gate Command Bit: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTCS_GCB) ? 1 : 0);
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Read Counter Control: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTCS_RCC) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Trigger Command Bit: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTCS_TCB) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Gate Command Bit: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTCS_GCB) ? 1 : 0);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Read Counter Control: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTCS_RCC) ? 1 : 0);
}
switch (data >> 5)
{
- case IC_CLEAR_IP_IUS: m_register[offset] &= ~(CTCS_IP | CTCS_IUS);if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IP/IUS\n", machine().describe_context(), tag().c_str(), counter + 1); break;
- case IC_SET_IUS: m_register[offset] |= CTCS_IUS; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Set IUS\n", machine().describe_context(), tag().c_str(), counter + 1); break;
- case IC_CLEAR_IUS: m_register[offset] &= ~CTCS_IUS; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IUS\n", machine().describe_context(), tag().c_str(), counter + 1); break;
- case IC_SET_IP: m_register[offset] |= CTCS_IP; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Set IP\n", machine().describe_context(), tag().c_str(), counter + 1); break;
- case IC_CLEAR_IP: m_register[offset] &= ~CTCS_IP; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IP\n", machine().describe_context(), tag().c_str(), counter + 1); break;
- case IC_SET_IE: m_register[offset] |= CTCS_IE; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Set IE\n", machine().describe_context(), tag().c_str(), counter + 1); break;
- case IC_CLEAR_IE: m_register[offset] &= ~CTCS_IE; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IE\n", machine().describe_context(), tag().c_str(), counter + 1); break;
+ case IC_CLEAR_IP_IUS: m_register[offset] &= ~(CTCS_IP | CTCS_IUS);if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IP/IUS\n", machine().describe_context(), tag(), counter + 1); break;
+ case IC_SET_IUS: m_register[offset] |= CTCS_IUS; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Set IUS\n", machine().describe_context(), tag(), counter + 1); break;
+ case IC_CLEAR_IUS: m_register[offset] &= ~CTCS_IUS; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IUS\n", machine().describe_context(), tag(), counter + 1); break;
+ case IC_SET_IP: m_register[offset] |= CTCS_IP; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Set IP\n", machine().describe_context(), tag(), counter + 1); break;
+ case IC_CLEAR_IP: m_register[offset] &= ~CTCS_IP; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IP\n", machine().describe_context(), tag(), counter + 1); break;
+ case IC_SET_IE: m_register[offset] |= CTCS_IE; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Set IE\n", machine().describe_context(), tag(), counter + 1); break;
+ case IC_CLEAR_IE: m_register[offset] &= ~CTCS_IE; if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Clear IE\n", machine().describe_context(), tag(), counter + 1); break;
}
// gate command bit
@@ -514,7 +514,7 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
if (LOG)
{
int counter = (offset - COUNTER_TIMER_1_TIME_CONSTANT_MS_BYTE) >> 1;
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Time Constant MSB: %02x\n", machine().describe_context(), tag().c_str(), counter + 1, data);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Time Constant MSB: %02x\n", machine().describe_context(), tag(), counter + 1, data);
}
m_register[offset] = data;
@@ -526,7 +526,7 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
if (LOG)
{
int counter = (offset - COUNTER_TIMER_1_TIME_CONSTANT_LS_BYTE) >> 1;
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Time Constant LSB: %02x\n", machine().describe_context(), tag().c_str(), counter + 1, data);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Time Constant LSB: %02x\n", machine().describe_context(), tag(), counter + 1, data);
}
m_register[offset] = data;
@@ -540,13 +540,13 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
int counter = offset - COUNTER_TIMER_1_MODE_SPECIFICATION;
int dcs = data & CTMS_DCS_MASK;
- logerror("%s Z8536 '%s' Counter/Timer %u Mode: %s\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTMS_CSC) ? "Continuous" : "Single Cycle");
- logerror("%s Z8536 '%s' Counter/Timer %u External Output Enable: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTMS_EOE) ? 1 : 0);
- logerror("%s Z8536 '%s' Counter/Timer %u External Count Enable: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTMS_ECE) ? 1 : 0);
- logerror("%s Z8536 '%s' Counter/Timer %u External Trigger Enable: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTMS_ETE) ? 1 : 0);
- logerror("%s Z8536 '%s' Counter/Timer %u External Gate Enable: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTMS_EDE) ? 1 : 0);
- logerror("%s Z8536 '%s' Counter/Timer %u Retrigger Enable: %u\n", machine().describe_context(), tag().c_str(), counter + 1, (data & CTMS_REB) ? 1 : 0);
- logerror("%s Z8536 '%s' Counter/Timer %u Output Duty Cycle: %s\n", machine().describe_context(), tag().c_str(), counter + 1, CTMS_DCS[dcs]);
+ logerror("%s Z8536 '%s' Counter/Timer %u Mode: %s\n", machine().describe_context(), tag(), counter + 1, (data & CTMS_CSC) ? "Continuous" : "Single Cycle");
+ logerror("%s Z8536 '%s' Counter/Timer %u External Output Enable: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTMS_EOE) ? 1 : 0);
+ logerror("%s Z8536 '%s' Counter/Timer %u External Count Enable: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTMS_ECE) ? 1 : 0);
+ logerror("%s Z8536 '%s' Counter/Timer %u External Trigger Enable: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTMS_ETE) ? 1 : 0);
+ logerror("%s Z8536 '%s' Counter/Timer %u External Gate Enable: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTMS_EDE) ? 1 : 0);
+ logerror("%s Z8536 '%s' Counter/Timer %u Retrigger Enable: %u\n", machine().describe_context(), tag(), counter + 1, (data & CTMS_REB) ? 1 : 0);
+ logerror("%s Z8536 '%s' Counter/Timer %u Output Duty Cycle: %s\n", machine().describe_context(), tag(), counter + 1, CTMS_DCS[dcs]);
}
m_register[offset] = data;
@@ -560,16 +560,16 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
int pts = (data & PMS_PTS_MASK) >> 6;
int pms = (data & PMS_PMS_MASK) >> 1;
- logerror("%s Z8536 '%s' Port %c Port Type: %s\n", machine().describe_context(), tag().c_str(), port, PMS_PTS[pts]);
- logerror("%s Z8536 '%s' Port %c Interrupt on 2 Bytes: %u\n", machine().describe_context(), tag().c_str(), port, (data & PMS_ITB) ? 1 : 0);
- logerror("%s Z8536 '%s' Port %c Single Buffer: %u\n", machine().describe_context(), tag().c_str(), port, (data & PMS_SB) ? 1 : 0);
- logerror("%s Z8536 '%s' Port %c Interrupt on Match Only: %u\n", machine().describe_context(), tag().c_str(), port, (data & PMS_IMO) ? 1 : 0);
- logerror("%s Z8536 '%s' Port %c Pattern Mode: %s\n", machine().describe_context(), tag().c_str(), port, PMS_PMS[pms]);
+ logerror("%s Z8536 '%s' Port %c Port Type: %s\n", machine().describe_context(), tag(), port, PMS_PTS[pts]);
+ logerror("%s Z8536 '%s' Port %c Interrupt on 2 Bytes: %u\n", machine().describe_context(), tag(), port, (data & PMS_ITB) ? 1 : 0);
+ logerror("%s Z8536 '%s' Port %c Single Buffer: %u\n", machine().describe_context(), tag(), port, (data & PMS_SB) ? 1 : 0);
+ logerror("%s Z8536 '%s' Port %c Interrupt on Match Only: %u\n", machine().describe_context(), tag(), port, (data & PMS_IMO) ? 1 : 0);
+ logerror("%s Z8536 '%s' Port %c Pattern Mode: %s\n", machine().describe_context(), tag(), port, PMS_PMS[pms]);
if (pts == PTS_BIT)
- logerror("%s Z8536 '%s' Port %c Latch on Pattern Match: %u\n", machine().describe_context(), tag().c_str(), port, (data & PMS_LPM) ? 1 : 0);
+ logerror("%s Z8536 '%s' Port %c Latch on Pattern Match: %u\n", machine().describe_context(), tag(), port, (data & PMS_LPM) ? 1 : 0);
else
- logerror("%s Z8536 '%s' Port %c Deskew Timer Enable: %u\n", machine().describe_context(), tag().c_str(), port, (data & PMS_DTE) ? 1 : 0);
+ logerror("%s Z8536 '%s' Port %c Deskew Timer Enable: %u\n", machine().describe_context(), tag(), port, (data & PMS_DTE) ? 1 : 0);
}
m_register[offset] = data;
@@ -582,44 +582,44 @@ void z8536_device::write_register(offs_t offset, UINT8 data)
case PORT_A_DATA_PATH_POLARITY:
case PORT_B_DATA_PATH_POLARITY:
- if (LOG) logerror("%s Z8536 '%s' Port %c Data Path Polarity: %02x\n", machine().describe_context(), tag().c_str(), BIT(offset, 3) ? 'B' : 'A', data);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Data Path Polarity: %02x\n", machine().describe_context(), tag(), BIT(offset, 3) ? 'B' : 'A', data);
m_register[offset] = data;
break;
case PORT_A_DATA_DIRECTION:
case PORT_B_DATA_DIRECTION:
- if (LOG) logerror("%s Z8536 '%s' Port %c Data Direction: %02x\n", machine().describe_context(), tag().c_str(), BIT(offset, 3) ? 'B' : 'A', data);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Data Direction: %02x\n", machine().describe_context(), tag(), BIT(offset, 3) ? 'B' : 'A', data);
m_register[offset] = data;
break;
case PORT_A_SPECIAL_IO_CONTROL:
case PORT_B_SPECIAL_IO_CONTROL:
- if (LOG) logerror("%s Z8536 '%s' Port %c Special I/O Control: %02x\n", machine().describe_context(), tag().c_str(), BIT(offset, 3) ? 'B' : 'A', data);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Special I/O Control: %02x\n", machine().describe_context(), tag(), BIT(offset, 3) ? 'B' : 'A', data);
m_register[offset] = data;
break;
case PORT_A_PATTERN_POLARITY:
case PORT_B_PATTERN_POLARITY:
- if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Polarity: %02x\n", machine().describe_context(), tag().c_str(), BIT(offset, 3) ? 'B' : 'A', data);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Polarity: %02x\n", machine().describe_context(), tag(), BIT(offset, 3) ? 'B' : 'A', data);
m_register[offset] = data;
break;
case PORT_A_PATTERN_TRANSITION:
case PORT_B_PATTERN_TRANSITION:
- if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Transition: %02x\n", machine().describe_context(), tag().c_str(), BIT(offset, 3) ? 'B' : 'A', data);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Transition: %02x\n", machine().describe_context(), tag(), BIT(offset, 3) ? 'B' : 'A', data);
m_register[offset] = data;
break;
case PORT_A_PATTERN_MASK:
case PORT_B_PATTERN_MASK:
- if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Mask: %02x\n", machine().describe_context(), tag().c_str(), BIT(offset, 3) ? 'B' : 'A', data);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Pattern Mask: %02x\n", machine().describe_context(), tag(), BIT(offset, 3) ? 'B' : 'A', data);
m_register[offset] = data;
match_pattern(BIT(offset, 3));
check_interrupt();
break;
default:
- logerror("%s: Z8536 '%s' Unimplemented write %02x to register %u\n", machine().describe_context(), tag().c_str(), data, offset);
+ logerror("%s: Z8536 '%s' Unimplemented write %02x to register %u\n", machine().describe_context(), tag(), data, offset);
m_register[offset] = data;
}
}
@@ -735,7 +735,7 @@ void z8536_device::count(device_timer_id id)
}
else
{
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Interrupt Pending\n", machine().describe_context(), tag().c_str(), id + 1);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Interrupt Pending\n", machine().describe_context(), tag(), id + 1);
// set interrupt pending bit
m_register[COUNTER_TIMER_1_COMMAND_AND_STATUS + id] |= CTCS_IP;
@@ -748,7 +748,7 @@ void z8536_device::count(device_timer_id id)
}
else
{
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Terminal Count\n", machine().describe_context(), tag().c_str(), id + 1);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Terminal Count\n", machine().describe_context(), tag(), id + 1);
// clear count in progress bit
m_register[COUNTER_TIMER_1_COMMAND_AND_STATUS + id] &= ~CTCS_CIP;
@@ -768,7 +768,7 @@ void z8536_device::trigger(device_timer_id id)
// ignore triggers during countdown if retrigger is disabled
if (!(m_register[COUNTER_TIMER_1_MODE_SPECIFICATION + id] & CTMS_REB) && (m_register[COUNTER_TIMER_1_COMMAND_AND_STATUS + id] & CTCS_CIP)) return;
- if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Trigger\n", machine().describe_context(), tag().c_str(), id + 1);
+ if (LOG) logerror("%s Z8536 '%s' Counter/Timer %u Trigger\n", machine().describe_context(), tag(), id + 1);
// load counter with time constant
m_counter[id] = (m_register[COUNTER_TIMER_1_TIME_CONSTANT_MS_BYTE + (id << 1)] << 8) | m_register[COUNTER_TIMER_1_TIME_CONSTANT_LS_BYTE + (id << 1)];
@@ -805,7 +805,7 @@ void z8536_device::match_pattern(int port)
if (m_match[port])
{
- if (LOG) logerror("%s Z8536 '%s' Port %c Interrupt Pending\n", machine().describe_context(), tag().c_str(), 'A' + port);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Interrupt Pending\n", machine().describe_context(), tag(), 'A' + port);
m_register[PORT_A_COMMAND_AND_STATUS + port] |= PCS_IP;
check_interrupt();
}
@@ -830,7 +830,7 @@ void z8536_device::external_port_w(int port, int bit, int state)
if (!BIT(ddr, bit)) return;
- if (LOG) logerror("%s Z8536 '%s' Port %c Bit %u: %u\n", machine().describe_context(), tag().c_str(), 'A' + port, bit, state);
+ if (LOG) logerror("%s Z8536 '%s' Port %c Bit %u: %u\n", machine().describe_context(), tag(), 'A' + port, bit, state);
m_input[port] = (m_input[port] & ~(1 << bit)) | (state << bit);
@@ -853,7 +853,7 @@ void z8536_device::external_port_w(int port, int bit, int state)
// z8536_device - constructor
//-------------------------------------------------
-z8536_device::z8536_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+z8536_device::z8536_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, Z8536, "Zilog Z8536", tag, owner, clock, "z8536", __FILE__),
device_z80daisy_interface(mconfig, *this),
m_write_irq(*this),
@@ -1087,7 +1087,7 @@ int z8536_device::intack_r()
get_interrupt_vector();
int data = m_register[CURRENT_VECTOR];
- if (LOG) logerror("%s Z8536 '%s' Interrupt Acknowledge: %02x\n", machine().describe_context(), tag().c_str(), data);
+ if (LOG) logerror("%s Z8536 '%s' Interrupt Acknowledge: %02x\n", machine().describe_context(), tag(), data);
// set interrupt under service bit
if ((m_register[COUNTER_TIMER_3_COMMAND_AND_STATUS] & (CTCS_IP | CTCS_IE)) == (CTCS_IP | CTCS_IE))
diff --git a/src/devices/machine/z8536.h b/src/devices/machine/z8536.h
index f007da8d374..45be2aab010 100644
--- a/src/devices/machine/z8536.h
+++ b/src/devices/machine/z8536.h
@@ -77,7 +77,7 @@ class z8536_device : public device_t,
{
public:
// construction/destruction
- z8536_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ z8536_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_pa_rd_callback(device_t &device, _Object object) { return downcast<z8536_device &>(device).m_read_pa.set_callback(object); }