History

ALSA: hdspm: use __u8, __u32 and __u64 from linux/types.h instead of stdint.h

Kernel headers should use linux/types.h based definitions.

Mikko Rapeli committed 11 years ago

Commit ffc287c1 parent a82d24f1 file · +18 −22Browse files

Showing the changes to include/uapi (1 of 1 file). Show all

Unified · Split

include/uapi/sound/hdspm.h+18−22
@@ -20,11 +20,7 @@ · 19 unmodified lines
2020 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
2121 */
2222
23−#ifdef __KERNEL__
2423 #include <linux/types.h>
25−#else
26−#include <stdint.h>
27−#endif
2824
2925 /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */
3026 #define HDSPM_MAX_CHANNELS 64
@@ -46,15 +42,15 @@ enum hdspm_speed { · 15 unmodified lines
4642 /* -------------------- IOCTL Peak/RMS Meters -------------------- */
4743
4844 struct hdspm_peak_rms {
49− uint32_t input_peaks[64];
50− uint32_t playback_peaks[64];
51− uint32_t output_peaks[64];
45+ __u32 input_peaks[64];
46+ __u32 playback_peaks[64];
47+ __u32 output_peaks[64];
5248
53− uint64_t input_rms[64];
54− uint64_t playback_rms[64];
55− uint64_t output_rms[64];
49+ __u64 input_rms[64];
50+ __u64 playback_rms[64];
51+ __u64 output_rms[64];
5652
57− uint8_t speed; /* enum {ss, ds, qs} */
53+ __u8 speed; /* enum {ss, ds, qs} */
5854 int status2;
5955 };
6056
@@ -155,21 +151,21 @@ enum hdspm_syncsource { · 94 unmodified lines
155151 };
156152
157153 struct hdspm_status {
158− uint8_t card_type; /* enum hdspm_io_type */
154+ __u8 card_type; /* enum hdspm_io_type */
159155 enum hdspm_syncsource autosync_source;
160156
161− uint64_t card_clock;
162− uint32_t master_period;
157+ __u64 card_clock;
158+ __u32 master_period;
163159
164160 union {
165161 struct {
166− uint8_t sync_wc; /* enum hdspm_sync */
167− uint8_t sync_madi; /* enum hdspm_sync */
168− uint8_t sync_tco; /* enum hdspm_sync */
169− uint8_t sync_in; /* enum hdspm_sync */
170− uint8_t madi_input; /* enum hdspm_madi_input */
171− uint8_t channel_format; /* enum hdspm_madi_channel_format */
172− uint8_t frame_format; /* enum hdspm_madi_frame_format */
162+ __u8 sync_wc; /* enum hdspm_sync */
163+ __u8 sync_madi; /* enum hdspm_sync */
164+ __u8 sync_tco; /* enum hdspm_sync */
165+ __u8 sync_in; /* enum hdspm_sync */
166+ __u8 madi_input; /* enum hdspm_madi_input */
167+ __u8 channel_format; /* enum hdspm_madi_channel_format */
168+ __u8 frame_format; /* enum hdspm_madi_frame_format */
173169 } madi;
174170 } card_specific;
175171 };
@@ -184,7 +180,7 @@ struct hdspm_status { · 8 unmodified lines
184180 #define HDSPM_ADDON_TCO 1
185181
186182 struct hdspm_version {
187− uint8_t card_type; /* enum hdspm_io_type */
183+ __u8 card_type; /* enum hdspm_io_type */
188184 char cardname[20];
189185 unsigned int serial;
190186 unsigned short firmware_rev;