diff options
Diffstat (limited to 'src/mame/machine/6883sam.h')
-rw-r--r-- | src/mame/machine/6883sam.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/mame/machine/6883sam.h b/src/mame/machine/6883sam.h index c973bb22f65..d1c48e5af12 100644 --- a/src/mame/machine/6883sam.h +++ b/src/mame/machine/6883sam.h @@ -52,7 +52,7 @@ protected: // base clock divider (/4 for MC6883, /8 for GIME) int m_divider; - ATTR_FORCE_INLINE uint16_t display_offset(void) + ATTR_FORCE_INLINE uint16_t display_offset() { return ((m_sam_state & (SAM_STATE_F0|SAM_STATE_F1|SAM_STATE_F2|SAM_STATE_F3|SAM_STATE_F4|SAM_STATE_F5|SAM_STATE_F6)) / SAM_STATE_F0) << 9; } @@ -75,7 +75,7 @@ protected: return xorval; } - void update_cpu_clock(void); + void update_cpu_clock(); }; class sam6883_device : public device_t, public sam6883_friend_device_interface @@ -122,7 +122,7 @@ public: DECLARE_WRITE_LINE_MEMBER( hs_w ); // typically called by machine - address_space *mpu_address_space(void) const { return m_cpu_space; } + address_space *mpu_address_space() const { return m_cpu_space; } void set_bank_offset(int bank, offs_t offset); protected: @@ -136,6 +136,8 @@ private: // points to with the S2/S1/S0 output struct sam_bank { + sam_bank(device_t &owner) : m_rhandler(owner), m_whandler(owner) { } + uint8_t * m_memory; uint32_t m_memory_size; offs_t m_memory_offset; @@ -192,7 +194,7 @@ private: DECLARE_WRITE8_MEMBER( write ); // called when there is a carry out of bit 3 on the counter - ATTR_FORCE_INLINE void counter_carry_bit3(void) + ATTR_FORCE_INLINE void counter_carry_bit3() { uint8_t x_division; switch((m_sam_state & (SAM_STATE_V2|SAM_STATE_V1|SAM_STATE_V0)) / SAM_STATE_V0) @@ -220,7 +222,7 @@ private: } // called when there is a carry out of bit 4 on the counter - ATTR_FORCE_INLINE void counter_carry_bit4(void) + ATTR_FORCE_INLINE void counter_carry_bit4() { uint8_t y_division; switch((m_sam_state & (SAM_STATE_V2|SAM_STATE_V1|SAM_STATE_V0)) / SAM_STATE_V0) @@ -247,9 +249,9 @@ private: // other members void configure_bank(int bank, uint8_t *memory, uint32_t memory_size, bool is_read_only, read8_delegate rhandler, write8_delegate whandler); - void horizontal_sync(void); - void update_state(void); - void update_memory(void); + void horizontal_sync(); + void update_state(); + void update_memory(); }; DECLARE_DEVICE_TYPE(SAM6883, sam6883_device) |