summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/electron/cart/ap5.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/electron/cart/ap5.cpp')
-rw-r--r--src/devices/bus/electron/cart/ap5.cpp33
1 files changed, 18 insertions, 15 deletions
diff --git a/src/devices/bus/electron/cart/ap5.cpp b/src/devices/bus/electron/cart/ap5.cpp
index e72e9ac4e25..82d83bfe611 100644
--- a/src/devices/bus/electron/cart/ap5.cpp
+++ b/src/devices/bus/electron/cart/ap5.cpp
@@ -24,17 +24,21 @@ DEFINE_DEVICE_TYPE(ELECTRON_AP5, electron_ap5_device, "electron_ap5", "P.R.E.S.
void electron_ap5_device::device_add_mconfig(machine_config &config)
{
+ INPUT_MERGER_ANY_HIGH(config, m_irqs).output_handler().set(DEVICE_SELF_OWNER, FUNC(electron_cartslot_device::irq_w));
+
/* rom sockets */
GENERIC_SOCKET(config, m_romslot[0], generic_plain_slot, "electron_rom", "bin,rom"); // ROM SLOT 14
- m_romslot[0]->set_device_load(FUNC(electron_ap5_device::rom1_load), this);
+ m_romslot[0]->set_device_load(FUNC(electron_ap5_device::rom1_load));
GENERIC_SOCKET(config, m_romslot[1], generic_plain_slot, "electron_rom", "bin,rom"); // ROM SLOT 15
- m_romslot[1]->set_device_load(FUNC(electron_ap5_device::rom2_load), this);
+ m_romslot[1]->set_device_load(FUNC(electron_ap5_device::rom2_load));
/* via */
- VIA6522(config, m_via, DERIVED_CLOCK(1, 16));
+ MOS6522(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->irq_handler().set(DEVICE_SELF_OWNER, FUNC(electron_cartslot_device::irq_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 */
BBC_USERPORT_SLOT(config, m_userport, bbc_userport_devices, nullptr);
@@ -43,12 +47,12 @@ void electron_ap5_device::device_add_mconfig(machine_config &config)
/* 1mhz bus port */
BBC_1MHZBUS_SLOT(config, m_1mhzbus, DERIVED_CLOCK(1, 16), bbc_1mhzbus_devices, nullptr);
- m_1mhzbus->irq_handler().set(DEVICE_SELF_OWNER, FUNC(electron_cartslot_device::irq_w));
+ m_1mhzbus->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<1>));
m_1mhzbus->nmi_handler().set(DEVICE_SELF_OWNER, FUNC(electron_cartslot_device::nmi_w));
/* tube port */
BBC_TUBE_SLOT(config, m_tube, electron_tube_devices, nullptr);
- m_tube->irq_handler().set(DEVICE_SELF_OWNER, FUNC(electron_cartslot_device::irq_w));
+ m_tube->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<2>));
}
//**************************************************************************
@@ -62,6 +66,7 @@ void electron_ap5_device::device_add_mconfig(machine_config &config)
electron_ap5_device::electron_ap5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ELECTRON_AP5, tag, owner, clock)
, device_electron_cart_interface(mconfig, *this)
+ , m_irqs(*this, "irqs")
, m_via(*this, "via6522")
, m_tube(*this, "tube")
, m_1mhzbus(*this, "1mhzbus")
@@ -149,23 +154,21 @@ void electron_ap5_device::write(offs_t offset, uint8_t data, int infc, int infd,
// IMPLEMENTATION
//**************************************************************************
-image_init_result electron_ap5_device::load_rom(device_image_interface &image, generic_slot_device *slot)
+std::pair<std::error_condition, std::string> electron_ap5_device::load_rom(device_image_interface &image, generic_slot_device *slot)
{
- uint32_t size = slot->common_get_size("rom");
+ uint32_t const size = slot->common_get_size("rom");
// socket accepts 8K and 16K ROM only
if (size != 0x2000 && size != 0x4000)
- {
- image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid size: Only 8K/16K is supported");
- return image_init_result::FAIL;
- }
+ return std::make_pair(image_error::INVALIDLENGTH, "Invalid size: Only 8K/16K is supported");
slot->rom_alloc(0x4000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
slot->common_load_rom(slot->get_rom_base(), size, "rom");
// mirror 8K ROMs
- uint8_t *crt = slot->get_rom_base();
- if (size <= 0x2000) memcpy(crt + 0x2000, crt, 0x2000);
+ uint8_t *const crt = slot->get_rom_base();
+ if (size <= 0x2000)
+ memcpy(crt + 0x2000, crt, 0x2000);
- return image_init_result::PASS;
+ return std::make_pair(std::error_condition(), std::string());
}