summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Nigel Barnes <Pernod70@users.noreply.github.com>2020-10-22 17:04:02 +0100
committer Nigel Barnes <Pernod70@users.noreply.github.com>2020-10-22 17:12:03 +0100
commit366a4cc490361cebd9735ef0cae2abbc76980ed0 (patch)
tree5f767631cfef58bcaa5f67f58468da0f470547be
parent32e360743a153f4e2b5530ba6513d248f1df51b7 (diff)
bbc_voicebox: Callback to CB1 line is inverted.
-rw-r--r--src/devices/bus/bbc/userport/voicebox.cpp13
-rw-r--r--src/devices/bus/bbc/userport/voicebox.h3
2 files changed, 1 insertions, 15 deletions
diff --git a/src/devices/bus/bbc/userport/voicebox.cpp b/src/devices/bus/bbc/userport/voicebox.cpp
index 650fca4aa61..c42d71a2456 100644
--- a/src/devices/bus/bbc/userport/voicebox.cpp
+++ b/src/devices/bus/bbc/userport/voicebox.cpp
@@ -41,8 +41,7 @@ void bbc_voicebox_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "mono").front_center();
SP0256(config, m_nsp, 3120000); // TODO: unknown crystal
- m_nsp->data_request_callback().set(FUNC(bbc_voicebox_device::cb1_w));
- m_nsp->standby_callback().set(FUNC(bbc_voicebox_device::cb2_w));
+ m_nsp->data_request_callback().set(DEVICE_SELF_OWNER, FUNC(bbc_userport_slot_device::cb1_w)).invert();
m_nsp->add_route(ALL_OUTPUTS, "mono", 1.0);
}
@@ -79,13 +78,3 @@ void bbc_voicebox_device::pb_w(uint8_t data)
{
m_nsp->ald_w(data & 0x3f);
}
-
-WRITE_LINE_MEMBER(bbc_voicebox_device::cb1_w)
-{
- m_slot->cb1_w(state);
-}
-
-WRITE_LINE_MEMBER(bbc_voicebox_device::cb2_w)
-{
- m_slot->cb2_w(state);
-}
diff --git a/src/devices/bus/bbc/userport/voicebox.h b/src/devices/bus/bbc/userport/voicebox.h
index b48290e2a2a..0f479e27c1d 100644
--- a/src/devices/bus/bbc/userport/voicebox.h
+++ b/src/devices/bus/bbc/userport/voicebox.h
@@ -27,9 +27,6 @@ public:
// construction/destruction
bbc_voicebox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE_LINE_MEMBER(cb1_w);
- DECLARE_WRITE_LINE_MEMBER(cb2_w);
-
protected:
// device-level overrides
virtual void device_start() override;