summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/coleco.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/coleco.h')
-rw-r--r--src/mame/includes/coleco.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/mame/includes/coleco.h b/src/mame/includes/coleco.h
index b5f47d5180a..01c3bb55e56 100644
--- a/src/mame/includes/coleco.h
+++ b/src/mame/includes/coleco.h
@@ -43,11 +43,11 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER( cart_r );
- DECLARE_READ8_MEMBER( paddle_1_r );
- DECLARE_READ8_MEMBER( paddle_2_r );
- DECLARE_WRITE8_MEMBER( paddle_off_w );
- DECLARE_WRITE8_MEMBER( paddle_on_w );
+ uint8_t cart_r(offs_t offset);
+ uint8_t paddle_1_r();
+ uint8_t paddle_2_r();
+ void paddle_off_w(uint8_t data);
+ void paddle_on_w(uint8_t data);
TIMER_CALLBACK_MEMBER(paddle_d7reset_callback);
TIMER_CALLBACK_MEMBER(paddle_irqreset_callback);
@@ -117,13 +117,11 @@ public:
void bit90(machine_config &config);
- DECLARE_READ8_MEMBER( bankswitch_u4_r );
- DECLARE_READ8_MEMBER( bankswitch_u3_r );
- DECLARE_READ8_MEMBER( keyboard_r );
- DECLARE_WRITE8_MEMBER( u32_w );
+ uint8_t bankswitch_u4_r(address_space &space);
+ uint8_t bankswitch_u3_r(address_space &space);
+ uint8_t keyboard_r(address_space &space);
+ void u32_w(uint8_t data);
- uint8_t m_keyselect;
- uint8_t m_unknown;
protected:
required_memory_bank m_bank;
required_ioport_array<8> m_io_keyboard;
@@ -131,6 +129,9 @@ protected:
private:
void bit90_map(address_map &map);
void bit90_io_map(address_map &map);
+
+ uint8_t m_keyselect;
+ uint8_t m_unknown;
};
#endif