summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author David Haywood <davidhaywood@users.noreply.github.com>2017-07-20 12:44:13 +0100
committer David Haywood <davidhaywood@users.noreply.github.com>2017-07-20 12:44:13 +0100
commitd1159c6f0798901db228d7a74053b54a96fb95b7 (patch)
treea82e41a832075ee53a9f635dc100f3e1ea8ddfdc /src
parent269a6c8b1f3c47c4dc5b9a8f5d983055f29ad215 (diff)
x
Diffstat (limited to 'src')
-rw-r--r--src/devices/cpu/mcs51/mcs51.cpp4
-rw-r--r--src/mame/machine/gaelco_ds5002fp.cpp10
-rw-r--r--src/mame/machine/gaelco_ds5002fp.h19
3 files changed, 12 insertions, 21 deletions
diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp
index 917fc7a7786..1c682e06e0e 100644
--- a/src/devices/cpu/mcs51/mcs51.cpp
+++ b/src/devices/cpu/mcs51/mcs51.cpp
@@ -2476,11 +2476,11 @@ void ds5002fp_device::nvram_default()
if (!m_region.found())
{
- logerror( "ds5002fp_device(%s) region not found\n", tag() );
+ logerror( "ds5002fp_device region not found\n" );
}
else if( m_region->bytes() != expected_bytes )
{
- logerror( "ds5002fp_device(%s) region length 0x%x expected 0x%x\n", tag(), m_region->bytes(), expected_bytes );
+ logerror( "ds5002fp_device region length 0x%x expected 0x%x\n", m_region->bytes(), expected_bytes );
}
else
{
diff --git a/src/mame/machine/gaelco_ds5002fp.cpp b/src/mame/machine/gaelco_ds5002fp.cpp
index ae0ebb57399..45e90a5d258 100644
--- a/src/mame/machine/gaelco_ds5002fp.cpp
+++ b/src/mame/machine/gaelco_ds5002fp.cpp
@@ -44,12 +44,7 @@ void gaelco_ds5002fp_device_base::device_reset()
}
gaelco_ds5002fp_device::gaelco_ds5002fp_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : gaelco_ds5002fp_device(mconfig, GAELCO_DS5002FP, tag, owner, clock)
-{
-}
-
-gaelco_ds5002fp_device::gaelco_ds5002fp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
- : gaelco_ds5002fp_device_base(mconfig, type, tag, owner, clock)
+ : gaelco_ds5002fp_device_base(mconfig, GAELCO_DS5002FP, tag, owner, clock)
{
}
@@ -73,9 +68,8 @@ MACHINE_CONFIG_MEMBER(gaelco_ds5002fp_device::device_add_mconfig)
MACHINE_CONFIG_END
-
gaelco_ds5002fp_wrally_device::gaelco_ds5002fp_wrally_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : gaelco_ds5002fp_device(mconfig, GAELCO_DS5002FP_WRALLY, tag, owner, clock)
+ : gaelco_ds5002fp_device_base(mconfig, GAELCO_DS5002FP_WRALLY, tag, owner, clock)
{
}
diff --git a/src/mame/machine/gaelco_ds5002fp.h b/src/mame/machine/gaelco_ds5002fp.h
index d702a22d22c..75c2882cfb9 100644
--- a/src/mame/machine/gaelco_ds5002fp.h
+++ b/src/mame/machine/gaelco_ds5002fp.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
-#ifndef MAME_MACHINE_GAELCODS5002FP_H
-#define MAME_MACHINE_GAELCODS5002FP_H
+#ifndef MAME_MACHINE_GAELCO_DS5002FP_H
+#define MAME_MACHINE_GAELCO_DS5002FP_H
#pragma once
@@ -14,9 +14,6 @@ DECLARE_DEVICE_TYPE(GAELCO_DS5002FP_WRALLY, gaelco_ds5002fp_wrally_device)
class gaelco_ds5002fp_device_base : public device_t
{
public:
- required_shared_ptr<uint16_t> m_shareram;
- required_region_ptr<uint8_t> m_mcu_ram;
-
DECLARE_READ8_MEMBER(dallas_ram_r);
DECLARE_WRITE8_MEMBER(dallas_ram_w);
DECLARE_READ8_MEMBER(dallas_share_r);
@@ -29,7 +26,8 @@ protected:
virtual void device_reset() override;
private:
-
+ required_shared_ptr<uint16_t> m_shareram;
+ required_region_ptr<uint8_t> m_mcu_ram;
};
@@ -37,20 +35,19 @@ class gaelco_ds5002fp_device : public gaelco_ds5002fp_device_base
{
public:
gaelco_ds5002fp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual void device_add_mconfig(machine_config &config) override;
protected:
- gaelco_ds5002fp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ virtual void device_add_mconfig(machine_config &config) override;
};
-class gaelco_ds5002fp_wrally_device : public gaelco_ds5002fp_device
+class gaelco_ds5002fp_wrally_device : public gaelco_ds5002fp_device_base
{
public:
gaelco_ds5002fp_wrally_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- virtual void device_add_mconfig(machine_config &config) override;
protected:
+ virtual void device_add_mconfig(machine_config &config) override;
};
-#endif // MAME_MACHINE_GAELCODS5002FP_H
+#endif // MAME_MACHINE_GAELCO_DS5002FP_H