Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Mikko Rapeli and committed by
Takashi Iwai
ffc287c8 a82d24f8

+18 -22
+18 -22
include/uapi/sound/hdspm.h
··· 20 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 21 */ 22 22 23 - #ifdef __KERNEL__ 24 23 #include <linux/types.h> 25 - #else 26 - #include <stdint.h> 27 - #endif 28 24 29 25 /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */ 30 26 #define HDSPM_MAX_CHANNELS 64 ··· 42 46 /* -------------------- IOCTL Peak/RMS Meters -------------------- */ 43 47 44 48 struct hdspm_peak_rms { 45 - uint32_t input_peaks[64]; 46 - uint32_t playback_peaks[64]; 47 - uint32_t output_peaks[64]; 49 + __u32 input_peaks[64]; 50 + __u32 playback_peaks[64]; 51 + __u32 output_peaks[64]; 48 52 49 - uint64_t input_rms[64]; 50 - uint64_t playback_rms[64]; 51 - uint64_t output_rms[64]; 53 + __u64 input_rms[64]; 54 + __u64 playback_rms[64]; 55 + __u64 output_rms[64]; 52 56 53 - uint8_t speed; /* enum {ss, ds, qs} */ 57 + __u8 speed; /* enum {ss, ds, qs} */ 54 58 int status2; 55 59 }; 56 60 ··· 151 155 }; 152 156 153 157 struct hdspm_status { 154 - uint8_t card_type; /* enum hdspm_io_type */ 158 + __u8 card_type; /* enum hdspm_io_type */ 155 159 enum hdspm_syncsource autosync_source; 156 160 157 - uint64_t card_clock; 158 - uint32_t master_period; 161 + __u64 card_clock; 162 + __u32 master_period; 159 163 160 164 union { 161 165 struct { 162 - uint8_t sync_wc; /* enum hdspm_sync */ 163 - uint8_t sync_madi; /* enum hdspm_sync */ 164 - uint8_t sync_tco; /* enum hdspm_sync */ 165 - uint8_t sync_in; /* enum hdspm_sync */ 166 - uint8_t madi_input; /* enum hdspm_madi_input */ 167 - uint8_t channel_format; /* enum hdspm_madi_channel_format */ 168 - uint8_t frame_format; /* enum hdspm_madi_frame_format */ 166 + __u8 sync_wc; /* enum hdspm_sync */ 167 + __u8 sync_madi; /* enum hdspm_sync */ 168 + __u8 sync_tco; /* enum hdspm_sync */ 169 + __u8 sync_in; /* enum hdspm_sync */ 170 + __u8 madi_input; /* enum hdspm_madi_input */ 171 + __u8 channel_format; /* enum hdspm_madi_channel_format */ 172 + __u8 frame_format; /* enum hdspm_madi_frame_format */ 169 173 } madi; 170 174 } card_specific; 171 175 }; ··· 180 184 #define HDSPM_ADDON_TCO 1 181 185 182 186 struct hdspm_version { 183 - uint8_t card_type; /* enum hdspm_io_type */ 187 + __u8 card_type; /* enum hdspm_io_type */ 184 188 char cardname[20]; 185 189 unsigned int serial; 186 190 unsigned short firmware_rev;