diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:34:36 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:18:25 -0500 |
commit | 029d64b0cfa30abc10f722e2f67d282abe09c9da (patch) | |
tree | d9a1e72e9792b33e57db2695f6c1a1a4843df0bf /include/sound/sb16_csp.h | |
parent | d3a7e476740dc23588ea65fa0df1aacdf8e70003 (diff) |
[ALSA] Remove xxx_t typedefs: ISA SB8/SB16/SBAWE
Remove xxx_t typedefs from the ISA SB8/SB16/SBAWE drivers.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/sb16_csp.h')
-rw-r--r-- | include/sound/sb16_csp.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h index eb8368b56b16..3b44d4b370f5 100644 --- a/include/sound/sb16_csp.h +++ b/include/sound/sb16_csp.h | |||
@@ -63,25 +63,25 @@ | |||
63 | #define SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE 0x3000 | 63 | #define SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE 0x3000 |
64 | 64 | ||
65 | /* microcode header */ | 65 | /* microcode header */ |
66 | typedef struct snd_sb_csp_mc_header { | 66 | struct snd_sb_csp_mc_header { |
67 | char codec_name[16]; /* id name of codec */ | 67 | char codec_name[16]; /* id name of codec */ |
68 | unsigned short func_req; /* requested function */ | 68 | unsigned short func_req; /* requested function */ |
69 | } snd_sb_csp_mc_header_t; | 69 | }; |
70 | 70 | ||
71 | /* microcode to be loaded */ | 71 | /* microcode to be loaded */ |
72 | typedef struct snd_sb_csp_microcode { | 72 | struct snd_sb_csp_microcode { |
73 | snd_sb_csp_mc_header_t info; | 73 | struct snd_sb_csp_mc_header info; |
74 | unsigned char data[SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE]; | 74 | unsigned char data[SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE]; |
75 | } snd_sb_csp_microcode_t; | 75 | }; |
76 | 76 | ||
77 | /* start CSP with sample_width in mono/stereo */ | 77 | /* start CSP with sample_width in mono/stereo */ |
78 | typedef struct snd_sb_csp_start { | 78 | struct snd_sb_csp_start { |
79 | int sample_width; /* sample width, look above */ | 79 | int sample_width; /* sample width, look above */ |
80 | int channels; /* channels, look above */ | 80 | int channels; /* channels, look above */ |
81 | } snd_sb_csp_start_t; | 81 | }; |
82 | 82 | ||
83 | /* CSP information */ | 83 | /* CSP information */ |
84 | typedef struct snd_sb_csp_info { | 84 | struct snd_sb_csp_info { |
85 | char codec_name[16]; /* id name of codec */ | 85 | char codec_name[16]; /* id name of codec */ |
86 | unsigned short func_nr; /* function number */ | 86 | unsigned short func_nr; /* function number */ |
87 | unsigned int acc_format; /* accepted PCM formats */ | 87 | unsigned int acc_format; /* accepted PCM formats */ |
@@ -93,17 +93,17 @@ typedef struct snd_sb_csp_info { | |||
93 | unsigned short run_width; /* current sample width */ | 93 | unsigned short run_width; /* current sample width */ |
94 | unsigned short version; /* version id: 0x10 - 0x1f */ | 94 | unsigned short version; /* version id: 0x10 - 0x1f */ |
95 | unsigned short state; /* state bits */ | 95 | unsigned short state; /* state bits */ |
96 | } snd_sb_csp_info_t; | 96 | }; |
97 | 97 | ||
98 | /* HWDEP controls */ | 98 | /* HWDEP controls */ |
99 | /* get CSP information */ | 99 | /* get CSP information */ |
100 | #define SNDRV_SB_CSP_IOCTL_INFO _IOR('H', 0x10, snd_sb_csp_info_t) | 100 | #define SNDRV_SB_CSP_IOCTL_INFO _IOR('H', 0x10, struct snd_sb_csp_info) |
101 | /* load microcode to CSP */ | 101 | /* load microcode to CSP */ |
102 | #define SNDRV_SB_CSP_IOCTL_LOAD_CODE _IOW('H', 0x11, snd_sb_csp_microcode_t) | 102 | #define SNDRV_SB_CSP_IOCTL_LOAD_CODE _IOW('H', 0x11, struct snd_sb_csp_microcode) |
103 | /* unload microcode from CSP */ | 103 | /* unload microcode from CSP */ |
104 | #define SNDRV_SB_CSP_IOCTL_UNLOAD_CODE _IO('H', 0x12) | 104 | #define SNDRV_SB_CSP_IOCTL_UNLOAD_CODE _IO('H', 0x12) |
105 | /* start CSP */ | 105 | /* start CSP */ |
106 | #define SNDRV_SB_CSP_IOCTL_START _IOW('H', 0x13, snd_sb_csp_start_t) | 106 | #define SNDRV_SB_CSP_IOCTL_START _IOW('H', 0x13, struct snd_sb_csp_start) |
107 | /* stop CSP */ | 107 | /* stop CSP */ |
108 | #define SNDRV_SB_CSP_IOCTL_STOP _IO('H', 0x14) | 108 | #define SNDRV_SB_CSP_IOCTL_STOP _IO('H', 0x14) |
109 | /* pause CSP and DMA transfer */ | 109 | /* pause CSP and DMA transfer */ |
@@ -115,25 +115,25 @@ typedef struct snd_sb_csp_info { | |||
115 | #include "sb.h" | 115 | #include "sb.h" |
116 | #include "hwdep.h" | 116 | #include "hwdep.h" |
117 | 117 | ||
118 | typedef struct snd_sb_csp snd_sb_csp_t; | 118 | struct snd_sb_csp; |
119 | 119 | ||
120 | /* | 120 | /* |
121 | * CSP operators | 121 | * CSP operators |
122 | */ | 122 | */ |
123 | typedef struct { | 123 | struct snd_sb_csp_ops { |
124 | int (*csp_use) (snd_sb_csp_t * p); | 124 | int (*csp_use) (struct snd_sb_csp * p); |
125 | int (*csp_unuse) (snd_sb_csp_t * p); | 125 | int (*csp_unuse) (struct snd_sb_csp * p); |
126 | int (*csp_autoload) (snd_sb_csp_t * p, int pcm_sfmt, int play_rec_mode); | 126 | int (*csp_autoload) (struct snd_sb_csp * p, int pcm_sfmt, int play_rec_mode); |
127 | int (*csp_start) (snd_sb_csp_t * p, int sample_width, int channels); | 127 | int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels); |
128 | int (*csp_stop) (snd_sb_csp_t * p); | 128 | int (*csp_stop) (struct snd_sb_csp * p); |
129 | int (*csp_qsound_transfer) (snd_sb_csp_t * p); | 129 | int (*csp_qsound_transfer) (struct snd_sb_csp * p); |
130 | } snd_sb_csp_ops_t; | 130 | }; |
131 | 131 | ||
132 | /* | 132 | /* |
133 | * CSP private data | 133 | * CSP private data |
134 | */ | 134 | */ |
135 | struct snd_sb_csp { | 135 | struct snd_sb_csp { |
136 | sb_t *chip; /* SB16 DSP */ | 136 | struct snd_sb *chip; /* SB16 DSP */ |
137 | int used; /* usage flag - exclusive */ | 137 | int used; /* usage flag - exclusive */ |
138 | char codec_name[16]; /* name of codec */ | 138 | char codec_name[16]; /* name of codec */ |
139 | unsigned short func_nr; /* function number */ | 139 | unsigned short func_nr; /* function number */ |
@@ -147,7 +147,7 @@ struct snd_sb_csp { | |||
147 | int version; /* CSP version (0x10 - 0x1f) */ | 147 | int version; /* CSP version (0x10 - 0x1f) */ |
148 | int running; /* running state */ | 148 | int running; /* running state */ |
149 | 149 | ||
150 | snd_sb_csp_ops_t ops; /* operators */ | 150 | struct snd_sb_csp_ops ops; /* operators */ |
151 | 151 | ||
152 | spinlock_t q_lock; /* locking */ | 152 | spinlock_t q_lock; /* locking */ |
153 | int q_enabled; /* enabled flag */ | 153 | int q_enabled; /* enabled flag */ |
@@ -155,13 +155,13 @@ struct snd_sb_csp { | |||
155 | int qpos_right; /* right position */ | 155 | int qpos_right; /* right position */ |
156 | int qpos_changed; /* position changed flag */ | 156 | int qpos_changed; /* position changed flag */ |
157 | 157 | ||
158 | snd_kcontrol_t *qsound_switch; | 158 | struct snd_kcontrol *qsound_switch; |
159 | snd_kcontrol_t *qsound_space; | 159 | struct snd_kcontrol *qsound_space; |
160 | 160 | ||
161 | struct semaphore access_mutex; /* locking */ | 161 | struct semaphore access_mutex; /* locking */ |
162 | }; | 162 | }; |
163 | 163 | ||
164 | int snd_sb_csp_new(sb_t *chip, int device, snd_hwdep_t ** rhwdep); | 164 | int snd_sb_csp_new(struct snd_sb *chip, int device, struct snd_hwdep ** rhwdep); |
165 | #endif | 165 | #endif |
166 | 166 | ||
167 | #endif /* __SOUND_SB16_CSP */ | 167 | #endif /* __SOUND_SB16_CSP */ |