summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/audio/exidy440.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/audio/exidy440.h')
-rw-r--r--src/mame/audio/exidy440.h44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/audio/exidy440.h b/src/mame/audio/exidy440.h
index 0dafc17adf6..be325c5c177 100644
--- a/src/mame/audio/exidy440.h
+++ b/src/mame/audio/exidy440.h
@@ -6,7 +6,7 @@ struct m6844_channel_data
int active;
int address;
int counter;
- UINT8 control;
+ uint8_t control;
int start_address;
int start_counter;
};
@@ -15,7 +15,7 @@ struct m6844_channel_data
/* channel_data structure holds info about each active sound channel */
struct sound_channel_data
{
- INT16 *base;
+ int16_t *base;
int offset;
int remaining;
};
@@ -29,14 +29,14 @@ struct sound_cache_entry
int length;
int bits;
int frequency;
- INT16 data[1];
+ int16_t data[1];
};
class exidy440_sound_device : public device_t,
public device_sound_interface
{
public:
- exidy440_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ exidy440_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
~exidy440_sound_device() {}
DECLARE_READ8_MEMBER( sound_command_r );
@@ -47,8 +47,8 @@ public:
DECLARE_WRITE8_MEMBER( m6844_w );
DECLARE_WRITE8_MEMBER( sound_banks_w );
- void exidy440_sound_command(UINT8 param);
- UINT8 exidy440_sound_command_ack();
+ void exidy440_sound_command(uint8_t param);
+ uint8_t exidy440_sound_command_ack();
protected:
// device-level overrides
@@ -61,23 +61,23 @@ protected:
private:
// internal state
- UINT8 m_sound_command;
- UINT8 m_sound_command_ack;
-
- UINT8 m_sound_banks[4];
- //UINT8 m_m6844_data[0x20];
- UINT8 m_sound_volume[0x10];
- std::unique_ptr<INT32[]> m_mixer_buffer_left;
- std::unique_ptr<INT32[]> m_mixer_buffer_right;
+ uint8_t m_sound_command;
+ uint8_t m_sound_command_ack;
+
+ uint8_t m_sound_banks[4];
+ //uint8_t m_m6844_data[0x20];
+ uint8_t m_sound_volume[0x10];
+ std::unique_ptr<int32_t[]> m_mixer_buffer_left;
+ std::unique_ptr<int32_t[]> m_mixer_buffer_right;
sound_cache_entry *m_sound_cache;
sound_cache_entry *m_sound_cache_end;
sound_cache_entry *m_sound_cache_max;
/* 6844 description */
m6844_channel_data m_m6844_channel[4];
- UINT8 m_m6844_priority;
- UINT8 m_m6844_interrupt;
- UINT8 m_m6844_chain;
+ uint8_t m_m6844_priority;
+ uint8_t m_m6844_interrupt;
+ uint8_t m_m6844_chain;
/* sound interface parameters */
sound_stream *m_stream;
@@ -95,13 +95,13 @@ private:
void stop_cvsd(int ch);
void reset_sound_cache();
- INT16 *add_to_sound_cache(UINT8 *input, int address, int length, int bits, int frequency);
- INT16 *find_or_add_to_sound_cache(int address, int length, int bits, int frequency);
+ int16_t *add_to_sound_cache(uint8_t *input, int address, int length, int bits, int frequency);
+ int16_t *find_or_add_to_sound_cache(int address, int length, int bits, int frequency);
- void decode_and_filter_cvsd(UINT8 *data, int bytes, int maskbits, int frequency, INT16 *dest);
- void fir_filter(INT32 *input, INT16 *output, int count);
+ void decode_and_filter_cvsd(uint8_t *data, int bytes, int maskbits, int frequency, int16_t *dest);
+ void fir_filter(int32_t *input, int16_t *output, int count);
- void add_and_scale_samples(int ch, INT32 *dest, int samples, int volume);
+ void add_and_scale_samples(int ch, int32_t *dest, int samples, int volume);
void mix_to_16(int length, stream_sample_t *dest_left, stream_sample_t *dest_right);
};