summaryrefslogtreecommitdiffstats
path: root/src/mame/machine/nextkbd.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/nextkbd.cpp')
-rw-r--r--src/mame/machine/nextkbd.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mame/machine/nextkbd.cpp b/src/mame/machine/nextkbd.cpp
index db5e0066185..7ff946b7916 100644
--- a/src/mame/machine/nextkbd.cpp
+++ b/src/mame/machine/nextkbd.cpp
@@ -14,7 +14,7 @@ DEVICE_ADDRESS_MAP_START(amap, 32, nextkbd_device)
AM_RANGE(0x8, 0xb) AM_READWRITE(kmdata_r, kmdata_w)
ADDRESS_MAP_END
-nextkbd_device::nextkbd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) :
+nextkbd_device::nextkbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NEXTKBD, "NEXTKBD", tag, owner, clock, "nextkbd", __FILE__),
int_change_cb(*this),
int_power_cb(*this),
@@ -161,31 +161,31 @@ bool nextkbd_device::fifo_empty() const
READ8_MEMBER( nextkbd_device::status_snd_r )
{
- logerror("%s: status_snd_r %02x (%08x)\n", tag().c_str(), ctrl_snd, (unsigned int)space.device().safe_pc());
+ logerror("%s: status_snd_r %02x (%08x)\n", tag(), ctrl_snd, (unsigned int)space.device().safe_pc());
return ctrl_snd;
}
READ8_MEMBER( nextkbd_device::status_kms_r )
{
- logerror("%s: status_kms_r %02x (%08x)\n", tag().c_str(), ctrl_kms, (unsigned int)space.device().safe_pc());
+ logerror("%s: status_kms_r %02x (%08x)\n", tag(), ctrl_kms, (unsigned int)space.device().safe_pc());
return ctrl_kms;
}
READ8_MEMBER( nextkbd_device::status_dma_r )
{
- logerror("%s: status_dma_r %02x (%08x)\n", tag().c_str(), ctrl_dma, (unsigned int)space.device().safe_pc());
+ logerror("%s: status_dma_r %02x (%08x)\n", tag(), ctrl_dma, (unsigned int)space.device().safe_pc());
return ctrl_dma;
}
READ8_MEMBER( nextkbd_device::status_cmd_r )
{
- logerror("%s: status_cmd_r %02x (%08x)\n", tag().c_str(), ctrl_cmd, (unsigned int)space.device().safe_pc());
+ logerror("%s: status_cmd_r %02x (%08x)\n", tag(), ctrl_cmd, (unsigned int)space.device().safe_pc());
return ctrl_cmd;
}
READ32_MEMBER( nextkbd_device::cdata_r )
{
- logerror("%s: cdata_r %08x @ %08x (%08x)\n", tag().c_str(), cdata, mem_mask, (unsigned int)space.device().safe_pc());
+ logerror("%s: cdata_r %08x @ %08x (%08x)\n", tag(), cdata, mem_mask, (unsigned int)space.device().safe_pc());
return cdata;
}
@@ -195,7 +195,7 @@ READ32_MEMBER( nextkbd_device::kmdata_r )
ctrl_kms &= ~(C_KBD_INTERRUPT|C_KBD_DATA);
if(old & C_KBD_INTERRUPT)
int_change_cb(false);
- logerror("%s: kmdata_r %08x @ %08x (%08x)\n", tag().c_str(), kmdata, mem_mask, (unsigned int)space.device().safe_pc());
+ logerror("%s: kmdata_r %08x @ %08x (%08x)\n", tag(), kmdata, mem_mask, (unsigned int)space.device().safe_pc());
return kmdata;
}
@@ -205,7 +205,7 @@ WRITE8_MEMBER( nextkbd_device::ctrl_snd_w )
ctrl_snd = (ctrl_snd & ~C_SOUND_WMASK) | (data & C_SOUND_WMASK);
UINT8 diff = old ^ ctrl_snd;
- logerror("%s: ctrl_snd_w %02x | %02x (%08x)\n", tag().c_str(), ctrl_snd, diff, (unsigned int)space.device().safe_pc());
+ logerror("%s: ctrl_snd_w %02x | %02x (%08x)\n", tag(), ctrl_snd, diff, (unsigned int)space.device().safe_pc());
}
WRITE8_MEMBER( nextkbd_device::ctrl_kms_w )
@@ -214,7 +214,7 @@ WRITE8_MEMBER( nextkbd_device::ctrl_kms_w )
ctrl_kms = (ctrl_kms & ~C_KMS_WMASK) | (data & C_KMS_WMASK);
UINT8 diff = old ^ ctrl_kms;
- logerror("%s: ctrl_kms_w %02x | %02x (%08x)\n", tag().c_str(), ctrl_kms, diff, (unsigned int)space.device().safe_pc());
+ logerror("%s: ctrl_kms_w %02x | %02x (%08x)\n", tag(), ctrl_kms, diff, (unsigned int)space.device().safe_pc());
}
WRITE8_MEMBER( nextkbd_device::ctrl_dma_w )
@@ -223,25 +223,25 @@ WRITE8_MEMBER( nextkbd_device::ctrl_dma_w )
ctrl_dma = (ctrl_dma & ~C_WMASK) | (data & C_WMASK);
UINT8 diff = old ^ ctrl_dma;
- logerror("%s: ctrl_dma_w %02x | %02x (%08x)\n", tag().c_str(), ctrl_dma, diff, (unsigned int)space.device().safe_pc());
+ logerror("%s: ctrl_dma_w %02x | %02x (%08x)\n", tag(), ctrl_dma, diff, (unsigned int)space.device().safe_pc());
}
WRITE8_MEMBER( nextkbd_device::ctrl_cmd_w )
{
ctrl_cmd = data;
- logerror("%s: ctrl_cmd_w %02x (%08x)\n", tag().c_str(), ctrl_cmd, (unsigned int)space.device().safe_pc());
+ logerror("%s: ctrl_cmd_w %02x (%08x)\n", tag(), ctrl_cmd, (unsigned int)space.device().safe_pc());
}
WRITE32_MEMBER( nextkbd_device::cdata_w )
{
COMBINE_DATA(&cdata);
- logerror("%s: cdata_w %08x @ %08x (%08x)\n", tag().c_str(), data, mem_mask, (unsigned int)space.device().safe_pc());
+ logerror("%s: cdata_w %08x @ %08x (%08x)\n", tag(), data, mem_mask, (unsigned int)space.device().safe_pc());
handle_command();
}
WRITE32_MEMBER( nextkbd_device::kmdata_w )
{
- logerror("%s: kmdata_w %08x @ %08x (%08x)\n", tag().c_str(), data, mem_mask, (unsigned int)space.device().safe_pc());
+ logerror("%s: kmdata_w %08x @ %08x (%08x)\n", tag(), data, mem_mask, (unsigned int)space.device().safe_pc());
}
INPUT_CHANGED_MEMBER( nextkbd_device::update )
@@ -289,7 +289,7 @@ INPUT_CHANGED_MEMBER( nextkbd_device::update )
void nextkbd_device::handle_fifo_command()
{
- logerror("%s: Fifo command %08x?\n", tag().c_str(), cdata);
+ logerror("%s: Fifo command %08x?\n", tag(), cdata);
fifo_ir = 0;
fifo_iw = 0;
fifo_size = 0;
@@ -303,18 +303,18 @@ void nextkbd_device::handle_kbd_command()
{
switch(cdata >> 24) {
case 0x00:
- logerror("%s: Keyboard LED control %06x?\n", tag().c_str(), cdata & 0xffffff);
+ logerror("%s: Keyboard LED control %06x?\n", tag(), cdata & 0xffffff);
ctrl_kms |= C_KBD_DATA; // Hmmmm. The rom wants it, but I'm not sure if data is actually expected
break;
case 0xef:
- logerror("%s: Set keyboard/mouse address to %d\n", tag().c_str(), (cdata >> 17) & 7);
+ logerror("%s: Set keyboard/mouse address to %d\n", tag(), (cdata >> 17) & 7);
km_address = ((cdata >> 17) & 7) << 25;
ctrl_kms |= C_KBD_DATA; // Hmmmm. The rom wants it, but I'm not sure if data is actually expected
break;
default:
- logerror("%s: Unhandled keyboard command %02x.%06x\n", tag().c_str(), cdata >> 24, cdata & 0xffffff);
+ logerror("%s: Unhandled keyboard command %02x.%06x\n", tag(), cdata >> 24, cdata & 0xffffff);
break;
}
}
@@ -331,7 +331,7 @@ void nextkbd_device::handle_command()
break;
default:
- logerror("%s: Unhandled command %02x.%08x\n", tag().c_str(), ctrl_cmd, cdata);
+ logerror("%s: Unhandled command %02x.%08x\n", tag(), ctrl_cmd, cdata);
break;
}
}