diff options
Diffstat (limited to 'src/mame/audio/segasnd.h')
-rw-r--r-- | src/mame/audio/segasnd.h | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/mame/audio/segasnd.h b/src/mame/audio/segasnd.h index be4386d2ac7..e4cfd9a6445 100644 --- a/src/mame/audio/segasnd.h +++ b/src/mame/audio/segasnd.h @@ -12,7 +12,7 @@ class speech_sound_device : public device_t, public device_sound_interface { public: - speech_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + speech_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); ~speech_sound_device() {} DECLARE_WRITE8_MEMBER( data_w ); @@ -36,11 +36,11 @@ protected: private: // internal state - UINT8 m_drq; - UINT8 m_latch; - UINT8 m_t0; - UINT8 m_p2; - UINT8 *m_speech; + uint8_t m_drq; + uint8_t m_latch; + uint8_t m_t0; + uint8_t m_p2; + uint8_t *m_speech; TIMER_CALLBACK_MEMBER( delayed_speech_w ); }; @@ -78,17 +78,17 @@ struct timer8253_channel count(0), remain(0) {} - UINT8 holding; /* holding until counts written? */ - UINT8 latchmode; /* latching mode */ - UINT8 latchtoggle; /* latching state */ - UINT8 clockmode; /* clocking mode */ - UINT8 bcdmode; /* BCD mode? */ - UINT8 output; /* current output value */ - UINT8 lastgate; /* previous gate value */ - UINT8 gate; /* current gate value */ - UINT8 subcount; /* subcount (2MHz clocks per input clock) */ - UINT16 count; /* initial count */ - UINT16 remain; /* current down counter value */ + uint8_t holding; /* holding until counts written? */ + uint8_t latchmode; /* latching mode */ + uint8_t latchtoggle; /* latching state */ + uint8_t clockmode; /* clocking mode */ + uint8_t bcdmode; /* BCD mode? */ + uint8_t output; /* current output value */ + uint8_t lastgate; /* previous gate value */ + uint8_t gate; /* current gate value */ + uint8_t subcount; /* subcount (2MHz clocks per input clock) */ + uint16_t count; /* initial count */ + uint16_t remain; /* current down counter value */ }; @@ -107,7 +107,7 @@ struct timer8253 g80_filter_state chan_filter[2]; /* filter states for the first two channels */ g80_filter_state gate1; /* first RC filter state */ g80_filter_state gate2; /* second RC filter state */ - UINT8 config; /* configuration for this timer */ + uint8_t config; /* configuration for this timer */ }; @@ -115,8 +115,8 @@ class usb_sound_device : public device_t, public device_sound_interface { public: - usb_sound_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); - usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + usb_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source); + usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); ~usb_sound_device() {} required_device<i8035_device> m_ourcpu; /* CPU index of the 8035 */ @@ -148,27 +148,27 @@ private: // internal state sound_stream *m_stream; /* output stream */ device_t *m_maincpu; - UINT8 m_in_latch; /* input latch */ - UINT8 m_out_latch; /* output latch */ - UINT8 m_last_p2_value; /* current P2 output value */ - optional_shared_ptr<UINT8> m_program_ram; /* pointer to program RAM */ - required_shared_ptr<UINT8> m_work_ram; /* pointer to work RAM */ - UINT8 m_work_ram_bank; /* currently selected work RAM bank */ - UINT8 m_t1_clock; /* T1 clock value */ - UINT8 m_t1_clock_mask; /* T1 clock mask (configured via jumpers) */ + uint8_t m_in_latch; /* input latch */ + uint8_t m_out_latch; /* output latch */ + uint8_t m_last_p2_value; /* current P2 output value */ + optional_shared_ptr<uint8_t> m_program_ram; /* pointer to program RAM */ + required_shared_ptr<uint8_t> m_work_ram; /* pointer to work RAM */ + uint8_t m_work_ram_bank; /* currently selected work RAM bank */ + uint8_t m_t1_clock; /* T1 clock value */ + uint8_t m_t1_clock_mask; /* T1 clock mask (configured via jumpers) */ timer8253 m_timer_group[3]; /* 3 groups of timers */ - UINT8 m_timer_mode[3]; /* mode control for each group */ - UINT32 m_noise_shift; - UINT8 m_noise_state; - UINT8 m_noise_subcount; + uint8_t m_timer_mode[3]; /* mode control for each group */ + uint32_t m_noise_shift; + uint8_t m_noise_state; + uint8_t m_noise_subcount; double m_gate_rc1_exp[2]; double m_gate_rc2_exp[2]; g80_filter_state m_final_filter; g80_filter_state m_noise_filters[5]; TIMER_CALLBACK_MEMBER( delayed_usb_data_w ); - void timer_w(int which, UINT8 offset, UINT8 data); - void env_w(int which, UINT8 offset, UINT8 data); + void timer_w(int which, uint8_t offset, uint8_t data); + void env_w(int which, uint8_t offset, uint8_t data); }; extern const device_type SEGAUSB; @@ -176,7 +176,7 @@ extern const device_type SEGAUSB; class usb_rom_sound_device : public usb_sound_device { public: - usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); ~usb_rom_sound_device() {} protected: |