summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/devices/bus/bbc/userport/userport.cpp37
-rw-r--r--src/devices/bus/bbc/userport/userport.h6
-rw-r--r--src/devices/bus/bbc/userport/usersplit.cpp11
-rw-r--r--src/devices/bus/bbc/userport/usersplit.h2
-rw-r--r--src/devices/bus/electron/cart/ap5.cpp2
-rw-r--r--src/devices/bus/electron/plus2.cpp2
-rw-r--r--src/mame/drivers/bbc.cpp6
-rw-r--r--src/mame/drivers/electron.cpp2
8 files changed, 60 insertions, 8 deletions
diff --git a/src/devices/bus/bbc/userport/userport.cpp b/src/devices/bus/bbc/userport/userport.cpp
index d312cc10d50..5be7b7bd725 100644
--- a/src/devices/bus/bbc/userport/userport.cpp
+++ b/src/devices/bus/bbc/userport/userport.cpp
@@ -51,12 +51,12 @@ device_bbc_userport_interface::~device_bbc_userport_interface()
// bbc_userport_slot_device - constructor
//-------------------------------------------------
-bbc_userport_slot_device::bbc_userport_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, BBC_USERPORT_SLOT, tag, owner, clock),
- device_single_card_slot_interface<device_bbc_userport_interface>(mconfig, *this),
- m_device(nullptr),
- m_cb1_handler(*this),
- m_cb2_handler(*this)
+bbc_userport_slot_device::bbc_userport_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, BBC_USERPORT_SLOT, tag, owner, clock)
+ , device_single_card_slot_interface<device_bbc_userport_interface>(mconfig, *this)
+ , m_device(nullptr)
+ , m_cb1_handler(*this)
+ , m_cb2_handler(*this)
{
}
@@ -101,6 +101,28 @@ void bbc_userport_slot_device::pb_w(uint8_t data)
//-------------------------------------------------
+// write_cb1
+//-------------------------------------------------
+
+void bbc_userport_slot_device::write_cb1(int state)
+{
+ if (m_device)
+ m_device->write_cb1(state);
+}
+
+
+//-------------------------------------------------
+// write_cb2
+//-------------------------------------------------
+
+void bbc_userport_slot_device::write_cb2(int state)
+{
+ if (m_device)
+ m_device->write_cb2(state);
+}
+
+
+//-------------------------------------------------
// SLOT_INTERFACE( bbc_userport_devices )
//-------------------------------------------------
@@ -110,6 +132,7 @@ void bbc_userport_slot_device::pb_w(uint8_t data)
//#include "digitiser.h"
//#include "ev1.h"
#include "lcd.h"
+//#include "m4000.h"
#include "palext.h"
#include "pointer.h"
#include "usersplit.h"
@@ -129,11 +152,11 @@ void bbc_userport_devices(device_slot_interface &device)
//device.option_add("ev1", BBC_EV1); /* Micro-Robotics EV1 */
//device.option_add("hobbit", BBC_HOBBIT); /* Hobbit Floppy Tape System (Ikon) */
device.option_add("lcd", BBC_LCD); /* Sprow LCD Display */
+ //device.option_add("m4000", BBC_M4000); /* Hybrid Music 4000 Keyboard */
device.option_add("m512mouse", BBC_M512MOUSE); /* Acorn Mouse (provided with Master 512) */
device.option_add("tracker", BBC_TRACKER); /* Marconi RB2 Tracker Ball / Acorn Tracker Ball */
device.option_add("usersplit", BBC_USERSPLIT); /*User Port Splitter (Watford Electronics) */
//device.option_add("vci", BBC_VCI); /* Video Camera Interface (Data Harvest) */
device.option_add("voicebox", BBC_VOICEBOX); /* Robin Voice Box */
- //device.option_add("music4000", BBC_MUSIC4000); /* Hybrid Music 4000 Keyboard */
device.option_add_internal("cfa3000kbd", CFA3000_KBD);/* Henson CFA 3000 Keyboard */
}
diff --git a/src/devices/bus/bbc/userport/userport.h b/src/devices/bus/bbc/userport/userport.h
index c0a0b560eac..dfaa8032ad8 100644
--- a/src/devices/bus/bbc/userport/userport.h
+++ b/src/devices/bus/bbc/userport/userport.h
@@ -61,11 +61,15 @@ public:
auto cb1_handler() { return m_cb1_handler.bind(); }
auto cb2_handler() { return m_cb2_handler.bind(); }
+ // from slot
DECLARE_WRITE_LINE_MEMBER(cb1_w) { m_cb1_handler(state); }
DECLARE_WRITE_LINE_MEMBER(cb2_w) { m_cb2_handler(state); }
+ // from host
uint8_t pb_r();
void pb_w(uint8_t data);
+ void write_cb1(int state);
+ void write_cb2(int state);
protected:
// device-level overrides
@@ -89,6 +93,8 @@ public:
virtual uint8_t pb_r() { return 0xff; }
virtual void pb_w(uint8_t data) { }
+ virtual void write_cb1(int state) { };
+ virtual void write_cb2(int state) { };
protected:
device_bbc_userport_interface(const machine_config &mconfig, device_t &device);
diff --git a/src/devices/bus/bbc/userport/usersplit.cpp b/src/devices/bus/bbc/userport/usersplit.cpp
index abe6ec155bf..520abaebdb9 100644
--- a/src/devices/bus/bbc/userport/usersplit.cpp
+++ b/src/devices/bus/bbc/userport/usersplit.cpp
@@ -98,6 +98,17 @@ void bbc_usersplit_device::pb_w(uint8_t data)
m_userport[m_selected]->pb_w(data);
}
+void bbc_usersplit_device::write_cb1(int state)
+{
+ m_userport[m_selected]->write_cb1(state);
+}
+
+void bbc_usersplit_device::write_cb2(int state)
+{
+ m_userport[m_selected]->write_cb2(state);
+}
+
+
WRITE_LINE_MEMBER(bbc_usersplit_device::cb1a_w)
{
if (m_selected == 0x00)
diff --git a/src/devices/bus/bbc/userport/usersplit.h b/src/devices/bus/bbc/userport/usersplit.h
index d10a31a3eb2..27ce11a9fde 100644
--- a/src/devices/bus/bbc/userport/usersplit.h
+++ b/src/devices/bus/bbc/userport/usersplit.h
@@ -40,6 +40,8 @@ protected:
virtual uint8_t pb_r() override;
virtual void pb_w(uint8_t data) override;
+ virtual void write_cb1(int state) override;
+ virtual void write_cb2(int state) override;
private:
DECLARE_WRITE_LINE_MEMBER(cb1a_w);
diff --git a/src/devices/bus/electron/cart/ap5.cpp b/src/devices/bus/electron/cart/ap5.cpp
index c65daf911d4..3deacaa655b 100644
--- a/src/devices/bus/electron/cart/ap5.cpp
+++ b/src/devices/bus/electron/cart/ap5.cpp
@@ -36,6 +36,8 @@ void electron_ap5_device::device_add_mconfig(machine_config &config)
VIA6522(config, m_via, DERIVED_CLOCK(1, 16));
m_via->readpb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_r));
m_via->writepb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_w));
+ m_via->cb1_handler().set(m_userport, FUNC(bbc_userport_slot_device::write_cb1));
+ m_via->cb2_handler().set(m_userport, FUNC(bbc_userport_slot_device::write_cb2));
m_via->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<0>));
/* user port */
diff --git a/src/devices/bus/electron/plus2.cpp b/src/devices/bus/electron/plus2.cpp
index f0e28d73150..1e9d9d6591b 100644
--- a/src/devices/bus/electron/plus2.cpp
+++ b/src/devices/bus/electron/plus2.cpp
@@ -53,6 +53,8 @@ void electron_plus2_device::device_add_mconfig(machine_config &config)
VIA6522(config, m_via, DERIVED_CLOCK(1, 16));
m_via->readpb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_r));
m_via->writepb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_w));
+ m_via->cb1_handler().set(m_userport, FUNC(bbc_userport_slot_device::write_cb1));
+ m_via->cb2_handler().set(m_userport, FUNC(bbc_userport_slot_device::write_cb2));
m_via->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<2>));
/* user port */
diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp
index ce3ab361072..6c37dd97c69 100644
--- a/src/mame/drivers/bbc.cpp
+++ b/src/mame/drivers/bbc.cpp
@@ -1181,6 +1181,8 @@ void bbc_state::bbcb(machine_config &config)
m_via6522_1->writepb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_w));
m_via6522_1->writepb_handler().append(m_internal, FUNC(bbc_internal_slot_device::latch_fe60_w));
m_via6522_1->ca2_handler().set("printer", FUNC(centronics_device::write_strobe));
+ m_via6522_1->cb1_handler().set(m_userport, FUNC(bbc_userport_slot_device::write_cb1));
+ m_via6522_1->cb2_handler().set(m_userport, FUNC(bbc_userport_slot_device::write_cb2));
m_via6522_1->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<2>));
/* adc */
@@ -1651,6 +1653,8 @@ void bbcm_state::bbcm(machine_config &config)
m_via6522_1->readpb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_r));
m_via6522_1->writepb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_w));
m_via6522_1->ca2_handler().set("printer", FUNC(centronics_device::write_strobe));
+ m_via6522_1->cb1_handler().set(m_userport, FUNC(bbc_userport_slot_device::write_cb1));
+ m_via6522_1->cb2_handler().set(m_userport, FUNC(bbc_userport_slot_device::write_cb2));
m_via6522_1->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<2>));
/* fdc */
@@ -2930,7 +2934,7 @@ COMP ( 1987, daisy, bbcm, 0, daisy, bbcm, bbcm_state, init_bbc,
COMP ( 1986, bbcmc, 0, bbcm, bbcmc, bbcm, bbcm_state, init_bbc, "Acorn Computers", "BBC Master Compact", MACHINE_IMPERFECT_GRAPHICS)
COMP ( 1986, bbcmc_ar, bbcmc, 0, bbcmc, bbcm, bbcm_state, init_bbc, "Acorn Computers", "BBC Master Compact (Arabic)", MACHINE_IMPERFECT_GRAPHICS)
COMP ( 1987, pro128s, bbcmc, 0, pro128s, bbcm, bbcm_state, init_bbc, "Olivetti", "Prodest PC 128S", MACHINE_IMPERFECT_GRAPHICS)
-COMP ( 1988, autoc15, bbcmc, 0, autoc15, autoc, bbcm_state, init_bbc, "Autocue Ltd.", "Autocue 1500 Telepromter", MACHINE_NOT_WORKING)
+COMP ( 1988, autoc15, bbcmc, 0, autoc15, autoc, bbcm_state, init_bbc, "Autocue Ltd.", "Autocue 1500 Teleprompter", MACHINE_NOT_WORKING)
COMP ( 1988, discmon, bbcm, 0, discmon, bbcm, bbcm_state, init_bbc, "Arbiter Leisure", "Arbiter Discmonitor A-01", MACHINE_NOT_WORKING)
COMP ( 1988, discmate, bbcm, 0, discmate, bbcm, bbcm_state, init_bbc, "Arbiter Leisure", "Arbiter Discmate A-02", MACHINE_NOT_WORKING)
//COMP ( 1988, discmast, bbcm, 0, discmast, bbcm, bbcm_state, init_bbc, "Arbiter Leisure", "Arbiter Discmaster A-03", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/electron.cpp b/src/mame/drivers/electron.cpp
index 83764b30a6d..f60a6936a19 100644
--- a/src/mame/drivers/electron.cpp
+++ b/src/mame/drivers/electron.cpp
@@ -333,6 +333,8 @@ void electronsp_state::electronsp(machine_config &config)
VIA6522(config, m_via, 16_MHz_XTAL / 16);
m_via->readpb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_r));
m_via->writepb_handler().set(m_userport, FUNC(bbc_userport_slot_device::pb_w));
+ m_via->cb1_handler().set(m_userport, FUNC(bbc_userport_slot_device::write_cb1));
+ m_via->cb2_handler().set(m_userport, FUNC(bbc_userport_slot_device::write_cb2));
m_via->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<2>));
/* user port */