summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/electron/plus1.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/electron/plus1.h')
-rw-r--r--src/devices/bus/electron/plus1.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/devices/bus/electron/plus1.h b/src/devices/bus/electron/plus1.h
index 36a403b960c..1ec722d066d 100644
--- a/src/devices/bus/electron/plus1.h
+++ b/src/devices/bus/electron/plus1.h
@@ -13,6 +13,7 @@
#include "exp.h"
#include "machine/adc0844.h"
#include "machine/input_merger.h"
+#include "bus/bbc/analogue/analogue.h"
#include "bus/centronics/ctronics.h"
#include "bus/electron/cart/slot.h"
#include "bus/generic/slot.h"
@@ -33,13 +34,12 @@ public:
protected:
electron_plus1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
+ // device_t implementation
virtual void device_start() override;
// optional information overrides
virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
- virtual ioport_constructor device_input_ports() const override;
virtual uint8_t expbus_r(offs_t offset) override;
virtual void expbus_w(offs_t offset, uint8_t data) override;
@@ -50,9 +50,8 @@ protected:
required_device<electron_cartslot_device> m_cart_sk2;
required_device<centronics_device> m_centronics;
required_device<output_latch_device> m_cent_data_out;
+ required_device<bbc_analogue_slot_device> m_analogue;
required_device<adc0844_device> m_adc;
- required_ioport_array<4> m_joy;
- required_ioport m_buttons;
uint8_t m_romsel;
int m_centronics_busy;
@@ -63,7 +62,7 @@ protected:
class electron_ap1_device : public electron_plus1_device
{
public:
- electron_ap1_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock);
+ electron_ap1_device(const machine_config &mconfig, const char* tag, device_t* owner, uint32_t clock);
protected:
// optional information overrides
@@ -74,14 +73,14 @@ protected:
class electron_ap6_device : public electron_plus1_device
{
public:
- electron_ap6_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock);
+ electron_ap6_device(const machine_config &mconfig, const char* tag, device_t* owner, uint32_t clock);
protected:
- // device-level overrides
+ // device_t implementation
virtual void device_start() override;
// optional information overrides
- virtual void device_add_mconfig(machine_config& config) override;
+ virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry* device_rom_region() const override;
virtual ioport_constructor device_input_ports() const override;
@@ -89,7 +88,7 @@ protected:
virtual void expbus_w(offs_t offset, uint8_t data) override;
private:
- image_init_result load_rom(device_image_interface &image, generic_slot_device *slot);
+ std::pair<std::error_condition, std::string> load_rom(device_image_interface &image, generic_slot_device *slot);
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(rom1_load) { return load_rom(image, m_rom[0]); }
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(rom2_load) { return load_rom(image, m_rom[1]); }
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(rom3_load) { return load_rom(image, m_rom[2]); }