summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-06-14 12:38:22 +1000
committer Vas Crabb <vas@vastheman.com>2018-06-14 12:38:22 +1000
commit269e799b267c35b219566d1e673c8a2cca87dfa0 (patch)
treed7256396e3aea5a7010c469833a806dc115e719a /src/devices
parent7b9af3c20187e73940ff4b3f34e10b34e8fb75c6 (diff)
get rid of some overloaded names - a lot of these will become unnecessary after new memory and devcb are ready (nw)
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/a2bus/mouse.cpp2
-rw-r--r--src/devices/bus/a2bus/timemasterho.cpp2
-rw-r--r--src/devices/bus/econet/econet.cpp4
-rw-r--r--src/devices/bus/econet/econet.h4
-rw-r--r--src/devices/machine/6821pia.cpp10
-rw-r--r--src/devices/machine/6821pia.h8
-rw-r--r--src/devices/machine/74259.h10
-rw-r--r--src/devices/machine/output_latch.h2
8 files changed, 21 insertions, 21 deletions
diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp
index 23f3951f128..48e0e9b9c31 100644
--- a/src/devices/bus/a2bus/mouse.cpp
+++ b/src/devices/bus/a2bus/mouse.cpp
@@ -293,7 +293,7 @@ WRITE8_MEMBER(a2bus_mouse_device::mcu_port_b_w)
WRITE8_MEMBER(a2bus_mouse_device::mcu_port_c_w)
{
- m_pia->portb_w(data << 4);
+ m_pia->write_portb(data << 4);
}
template <unsigned AXIS, u8 DIR, u8 CLK> void a2bus_mouse_device::update_axis()
diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp
index 860403d60e5..4d0e2d62889 100644
--- a/src/devices/bus/a2bus/timemasterho.cpp
+++ b/src/devices/bus/a2bus/timemasterho.cpp
@@ -224,7 +224,7 @@ WRITE8_MEMBER(a2bus_timemasterho_device::pia_out_b)
// if it's a read, poke it into the PIA
if ((data>>5) & 1)
{
- m_pia->porta_w(m_msm5832->data_r(space, 0));
+ m_pia->write_porta(m_msm5832->data_r(space, 0));
}
}
diff --git a/src/devices/bus/econet/econet.cpp b/src/devices/bus/econet/econet.cpp
index 3cc15bc224b..63d30931823 100644
--- a/src/devices/bus/econet/econet.cpp
+++ b/src/devices/bus/econet/econet.cpp
@@ -255,7 +255,7 @@ econet_device::daisy_entry::daisy_entry(device_t *device) :
// clk_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( econet_device::clk_w )
+WRITE_LINE_MEMBER( econet_device::host_clk_w )
{
set_signal(this, CLK, state);
}
@@ -265,7 +265,7 @@ WRITE_LINE_MEMBER( econet_device::clk_w )
// data_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( econet_device::data_w )
+WRITE_LINE_MEMBER( econet_device::host_data_w )
{
set_signal(this, DATA, state);
}
diff --git a/src/devices/bus/econet/econet.h b/src/devices/bus/econet/econet.h
index 9b731d27b67..01040acd84c 100644
--- a/src/devices/bus/econet/econet.h
+++ b/src/devices/bus/econet/econet.h
@@ -63,8 +63,8 @@ public:
void add_device(device_t *target, int address);
// writes for host (driver_device)
- DECLARE_WRITE_LINE_MEMBER( clk_w );
- DECLARE_WRITE_LINE_MEMBER( data_w );
+ DECLARE_WRITE_LINE_MEMBER( host_clk_w );
+ DECLARE_WRITE_LINE_MEMBER( host_data_w );
// writes for peripherals (device_t)
void clk_w(device_t *device, int state);
diff --git a/src/devices/machine/6821pia.cpp b/src/devices/machine/6821pia.cpp
index 9d3167506d3..3bf21c9483b 100644
--- a/src/devices/machine/6821pia.cpp
+++ b/src/devices/machine/6821pia.cpp
@@ -890,7 +890,7 @@ void pia6821_device::reg_w(uint8_t offset, uint8_t data)
void pia6821_device::set_a_input(uint8_t data, uint8_t z_mask)
{
- assert_always(m_in_a_handler.isnull(), "pia6821_porta_w() called when in_a_func implemented");
+ assert_always(m_in_a_handler.isnull(), "pia6821_device::set_a_input() called when m_in_a_handler set");
LOG("Set PIA input port A = %02X\n", data);
@@ -901,10 +901,10 @@ void pia6821_device::set_a_input(uint8_t data, uint8_t z_mask)
//-------------------------------------------------
-// pia6821_porta_w
+// write_porta
//-------------------------------------------------
-void pia6821_device::porta_w(uint8_t data)
+void pia6821_device::write_porta(uint8_t data)
{
set_a_input(data, 0);
}
@@ -1008,10 +1008,10 @@ bool pia6821_device::ca2_output_z()
//-------------------------------------------------
-// portb_w
+// write_portb
//-------------------------------------------------
-void pia6821_device::portb_w(uint8_t data)
+void pia6821_device::write_portb(uint8_t data)
{
assert_always(m_in_b_handler.isnull(), "pia_set_input_b() called when in_b_func implemented");
diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h
index 084ae4c1402..236aae0f301 100644
--- a/src/devices/machine/6821pia.h
+++ b/src/devices/machine/6821pia.h
@@ -107,8 +107,8 @@ public:
uint8_t port_b_z_mask() const { return ~m_ddr_b; } // see first note in .c
void set_port_a_z_mask(uint8_t data) { m_port_a_z_mask = data; }// see second note in .c
- DECLARE_WRITE8_MEMBER( porta_w ) { porta_w(data); }
- void porta_w(uint8_t data);
+ DECLARE_WRITE8_MEMBER( porta_w ) { write_porta(data); }
+ void write_porta(uint8_t data);
void set_a_input(uint8_t data, uint8_t z_mask);
uint8_t a_output();
@@ -118,8 +118,8 @@ public:
bool ca2_output();
bool ca2_output_z();
- DECLARE_WRITE8_MEMBER( portb_w ) { portb_w(data); }
- void portb_w(uint8_t data);
+ DECLARE_WRITE8_MEMBER( portb_w ) { write_portb(data); }
+ void write_portb(uint8_t data);
uint8_t b_output();
DECLARE_WRITE_LINE_MEMBER( cb1_w );
diff --git a/src/devices/machine/74259.h b/src/devices/machine/74259.h
index 7b2b853bdb2..60a43a2a55d 100644
--- a/src/devices/machine/74259.h
+++ b/src/devices/machine/74259.h
@@ -129,7 +129,7 @@ private:
class ls259_device : public addressable_latch_device
{
public:
- ls259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ ls259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
};
// ======================> hc259_device
@@ -137,7 +137,7 @@ public:
class hc259_device : public addressable_latch_device
{
public:
- hc259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ hc259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
};
// ======================> hct259_device
@@ -145,7 +145,7 @@ public:
class hct259_device : public addressable_latch_device
{
public:
- hct259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ hct259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
};
// ======================> f9334_device
@@ -153,7 +153,7 @@ public:
class f9334_device : public addressable_latch_device
{
public:
- f9334_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ f9334_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
};
// ======================> cd4099_device
@@ -161,7 +161,7 @@ public:
class cd4099_device : public addressable_latch_device
{
public:
- cd4099_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ cd4099_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
};
// device type definition
diff --git a/src/devices/machine/output_latch.h b/src/devices/machine/output_latch.h
index 7bd63414cad..bdadd772ade 100644
--- a/src/devices/machine/output_latch.h
+++ b/src/devices/machine/output_latch.h
@@ -33,7 +33,7 @@
class output_latch_device : public device_t
{
public:
- output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
template <unsigned Bit, class Object> devcb_base &set_bit_handler(Object &&cb) { return m_bit_handlers[Bit].set_callback(std::forward<Object>(cb)); }