summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/pcf8584.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/pcf8584.cpp')
-rw-r--r--src/devices/machine/pcf8584.cpp20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/devices/machine/pcf8584.cpp b/src/devices/machine/pcf8584.cpp
index ad2d54f676d..79d8a013c6a 100644
--- a/src/devices/machine/pcf8584.cpp
+++ b/src/devices/machine/pcf8584.cpp
@@ -54,7 +54,7 @@ const char *const pcf8584_device::s_bus_function[4] = { "NOP", "stop", "start",
pcf8584_device::pcf8584_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: device_t(mconfig, PCF8584, tag, owner, clock)
- , m_sda_callback(*this)
+ , m_sda_callback(*this, 1)
, m_sda_out_callback(*this)
, m_scl_callback(*this)
, m_int_callback(*this)
@@ -71,21 +71,6 @@ pcf8584_device::pcf8584_device(const machine_config &mconfig, const char *tag, d
//-------------------------------------------------
-// device_resolve_objects - resolve objects that
-// may be needed for other devices to set
-// initial conditions at start time
-//-------------------------------------------------
-
-void pcf8584_device::device_resolve_objects()
-{
- m_sda_callback.resolve_safe(1);
- m_sda_out_callback.resolve_safe();
- m_scl_callback.resolve_safe();
- m_int_callback.resolve_safe();
-}
-
-
-//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
@@ -179,7 +164,7 @@ void pcf8584_device::set_control(u8 data)
void pcf8584_device::set_clock_frequency(u8 data)
{
LOG("%s: SCL frequency = %.2f kHz (fCLK is nominally %s MHz)\n", machine().describe_context(),
- (clocks_to_attotime(s_divider[(data & 0x1c) >> 2] * s_prescaler[data & 0x03]) / 3).as_hz() / 1000.0,
+ (clocks_to_attotime(s_divider[(data & 0x1c) >> 2] * s_prescaler[data & 0x03]) / 3).as_khz(),
s_nominal_clock[(data & 0x1c) >> 2]);
m_s2_clock = data & 0x1f;
}
@@ -231,7 +216,6 @@ void pcf8584_device::write(offs_t offset, u8 data)
set_clock_frequency(data);
else
set_own_address(data);
-
}