summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/neogeo_ctrl/joystick.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/neogeo_ctrl/joystick.h')
-rw-r--r--src/devices/bus/neogeo_ctrl/joystick.h46
1 files changed, 27 insertions, 19 deletions
diff --git a/src/devices/bus/neogeo_ctrl/joystick.h b/src/devices/bus/neogeo_ctrl/joystick.h
index ff084dd7207..4f8ce2a91da 100644
--- a/src/devices/bus/neogeo_ctrl/joystick.h
+++ b/src/devices/bus/neogeo_ctrl/joystick.h
@@ -19,55 +19,63 @@
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> neogeo_joy_ac_device
+// ======================> neogeo_joystick_device
-class neogeo_joy_ac_device : public device_t,
- public device_neogeo_control_port_interface
+class neogeo_joystick_device : public device_t,
+ public device_neogeo_control_port_interface
{
public:
// construction/destruction
- neogeo_joy_ac_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- neogeo_joy_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+ neogeo_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
-
+
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-
+
// device_neogeo_control_port_interface overrides
virtual UINT8 read_ctrl() override;
-
+ virtual UINT8 read_start_sel() override;
+
private:
required_ioport m_joy;
+ required_ioport m_ss;
};
-// ======================> neogeo_joystick_device
-class neogeo_joystick_device : public neogeo_joy_ac_device
+// ======================> neogeo_joy_ac_device
+
+class neogeo_joy_ac_device : public device_t,
+ public device_neogeo_ctrl_edge_interface
{
public:
// construction/destruction
- neogeo_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+ neogeo_joy_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
-
+
protected:
- // device_neogeo_control_port_interface overrides
- virtual UINT8 read_start_sel() override;
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+ // device_neogeo_ctrl_edge_interface overrides
+ virtual DECLARE_READ8_MEMBER( in0_r ) override;
+ virtual DECLARE_READ8_MEMBER( in1_r ) override;
private:
- required_ioport m_ss;
+ required_ioport m_joy1;
+ required_ioport m_joy2;
};
-
// device type definition
-extern const device_type NEOGEO_JOY_AC;
extern const device_type NEOGEO_JOY;
+extern const device_type NEOGEO_JOY_AC;
#endif