summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-01-20 21:35:30 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-01-20 21:35:30 +0100
commit3a8ccb89b426509be06089a19c51ecf55567ed1b (patch)
tree235e38d0308a79ca812156ebc1f2493e134c6c50 /src/devices
parent7c9cd3feea638281df93381c5a7a871d79a7ba17 (diff)
Revert "Fixes (nw)"
This reverts commit 5f19489cd2d0cd0b65ac250ac4b76d666a50509c.
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/isa/cga.cpp2
-rw-r--r--src/devices/bus/kc/d002.cpp2
-rw-r--r--src/devices/bus/lpci/pci.cpp3
-rw-r--r--src/devices/bus/nes/nes_pcb.inc6
-rw-r--r--src/devices/machine/ram.h2
5 files changed, 9 insertions, 6 deletions
diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp
index ef2ca006d86..0adbdee5758 100644
--- a/src/devices/bus/isa/cga.cpp
+++ b/src/devices/bus/isa/cga.cpp
@@ -258,7 +258,7 @@ static MACHINE_CONFIG_FRAGMENT( cga )
MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(isa8_cga_device, hsync_changed))
MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(isa8_cga_device, vsync_changed))
MCFG_MC6845_RECONFIGURE_CB(isa8_cga_device, reconfigure)
- MCFG_VIDEO_SET_SCREEN("")
+ MCFG_VIDEO_SET_SCREEN(nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/kc/d002.cpp b/src/devices/bus/kc/d002.cpp
index ba5611f79b6..fcebf8be39e 100644
--- a/src/devices/bus/kc/d002.cpp
+++ b/src/devices/bus/kc/d002.cpp
@@ -88,7 +88,7 @@ static MACHINE_CONFIG_FRAGMENT( kc_d002 )
// expansion interface
MCFG_DEVICE_ADD("exp", KCCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(kc85_exp, nullptr, false)
- MCFG_KCEXP_SLOT_NEXT_SLOT("")
+ MCFG_KCEXP_SLOT_NEXT_SLOT(nullptr)
MCFG_KCEXP_SLOT_OUT_IRQ_CB(WRITELINE(kc_d002_device, out_irq_w))
MCFG_KCEXP_SLOT_OUT_NMI_CB(WRITELINE(kc_d002_device, out_nmi_w))
MCFG_KCEXP_SLOT_OUT_HALT_CB(WRITELINE(kc_d002_device, out_halt_w))
diff --git a/src/devices/bus/lpci/pci.cpp b/src/devices/bus/lpci/pci.cpp
index 7f211ad7415..848234d2241 100644
--- a/src/devices/bus/lpci/pci.cpp
+++ b/src/devices/bus/lpci/pci.cpp
@@ -93,6 +93,9 @@ pci_bus_device::pci_bus_device(const machine_config &mconfig, std::string tag, d
device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock, "pci_bus", __FILE__), m_busnum(0),
m_father(nullptr), m_address(0), m_devicenum(0), m_busnumber(0), m_busnumaddr(nullptr)
{
+ for (auto & elem : m_devtag) {
+ elem= nullptr;
+ }
m_siblings_count = 0;
}
diff --git a/src/devices/bus/nes/nes_pcb.inc b/src/devices/bus/nes/nes_pcb.inc
index d8049f95a45..32fabbcbbf3 100644
--- a/src/devices/bus/nes/nes_pcb.inc
+++ b/src/devices/bus/nes/nes_pcb.inc
@@ -381,7 +381,7 @@ const char * nes_cart_slot_device::nes_get_slot( int pcb_id )
struct nes_cart_lines
{
- const char* tag;
+ std::string tag;
int line;
};
@@ -414,9 +414,9 @@ static int nes_cart_get_line( const char *feature )
if (feature == nullptr)
return 128;
- while (nes_line->tag!=nullptr)
+ while (!nes_line->tag.empty())
{
- if (strcmp(nes_line->tag, feature) == 0)
+ if (strcmp(nes_line->tag.c_str(), feature) == 0)
break;
nes_line++;
diff --git a/src/devices/machine/ram.h b/src/devices/machine/ram.h
index a407a775304..e815242a8be 100644
--- a/src/devices/machine/ram.h
+++ b/src/devices/machine/ram.h
@@ -56,7 +56,7 @@ public:
// accessors
UINT32 size(void) const { return m_size; }
UINT32 mask(void) const { return m_size - 1; }
- UINT8 *pointer(void) { if (m_pointer.empty()) return nullptr; else return &m_pointer[0]; }
+ UINT8 *pointer(void) { return &m_pointer[0]; }
static UINT32 parse_string(const char *s);
UINT32 default_size(void) const;
const char *extra_options(void) const { return m_extra_options; }