uapi: Move typedefs from uapi to sound/*
PATCH 1/1 uapi: Move typedefs from uapi to sound/*
For keeping uapi/*.h cleaner.
Signed-off-by Takashi Iwai <[email protected]>
--- include/sound/emu10k1.h | 9 +++++++++ include/sound/hdsp.h | 10 ++++++++++ include/sound/hdspm.h | 8 ++++++++ include/sound/sb16_csp.h | 4 ++++ include/sound/uapi/emu10k1.h | 10 ---------- include/sound/uapi/hdsp.h | 9 --------- include/sound/uapi/hdspm.h | 8 -------- 7 files changed, 31 insertions(+), 27 deletions(-)
include/sound/emu10k1.h +9 -0
@@ -1,2 +1,11 @@#include <alsa/sound/type_compat.h> #include <alsa/sound/uapi/emu10k1.h> +#ifndef __emu10k1_type_defined +#define __emu10k1_type_defined +typedef struct snd_emu10k1_fx8010_info emu10k1_fx8010_info_t ; +typedef struct snd_emu10k1_fx8010_control_gpr emu10k1_fx8010_control_gpr_t ; +typedef struct snd_emu10k1_fx8010_code emu10k1_fx8010_code_t ; +typedef struct snd_emu10k1_fx8010_tram emu10k1_fx8010_tram_t ; +typedef struct snd_emu10k1_fx8010_pcm_rec emu10k1_fx8010_pcm_t ; +typedef struct emu10k1_ctl_elem_id emu10k1_ctl_elem_id_t ; +#endif
include/sound/hdsp.h +10 -0
@@ -1,2 +1,12 @@#include <alsa/sound/type_compat.h> #include <alsa/sound/uapi/hdsp.h> +#ifndef __hdsp_type_defined +#define __hdsp_type_defined +typedef enum HDSP_IO_Type HDSP_IO_Type ; +typedef struct hdsp_peak_rms hdsp_peak_rms_t ; +typedef struct hdsp_config_info hdsp_config_info_t ; +typedef struct hdsp_firmware hdsp_firmware_t ; +typedef struct hdsp_version hdsp_version_t ; +typedef struct hdsp_mixer hdsp_mixer_t ; +typedef struct hdsp_9632_aeb hdsp_9632_aeb_t ; +#endif
include/sound/hdspm.h +8 -0
@@ -1,2 +1,10 @@#include <alsa/sound/type_compat.h> #include <alsa/sound/uapi/hdspm.h> +#ifndef __hdspm_type_defined +#define __hdspm_type_defined +typedef struct hdspm_peak_rms hdspm_peak_rms_t ; +typedef struct hdspm_config_info hdspm_config_info_t ; +typedef struct hdspm_version hdspm_version_t ; +typedef struct hdspm_channelfader snd_hdspm_channelfader_t ; +typedef struct hdspm_mixer hdspm_mixer_t ; +#endif
include/sound/sb16_csp.h +4 -0
@@ -1 +1,5 @@#include <alsa/sound/uapi/sb16_csp.h> +#ifndef __sb16_csp_type_defined +#define __sb16_csp_type_defined +typedef struct snd_sb_csp_microcode snd_sb_csp_microcode_t ; +#endif
include/sound/uapi/emu10k1.h +0 -10
@@ -382,14 +382,4 @@ struct snd_emu10k1_fx8010_pcm_rec {#define SNDRV_EMU10K1_IOCTL_SINGLE_STEP _IOW ('H', 0x83, int)#define SNDRV_EMU10K1_IOCTL_DBG_READ _IOR ('H', 0x84, int) -#ifndef __KERNEL__ -/* typedefs for compatibility to user-space */ -typedef struct snd_emu10k1_fx8010_info emu10k1_fx8010_info_t ; -typedef struct snd_emu10k1_fx8010_control_gpr emu10k1_fx8010_control_gpr_t ; -typedef struct snd_emu10k1_fx8010_code emu10k1_fx8010_code_t ; -typedef struct snd_emu10k1_fx8010_tram emu10k1_fx8010_tram_t ; -typedef struct snd_emu10k1_fx8010_pcm_rec emu10k1_fx8010_pcm_t ; -typedef struct emu10k1_ctl_elem_id emu10k1_ctl_elem_id_t ; -#endif -#endif /* _UAPI__SOUND_EMU10K1_H */
include/sound/uapi/hdsp.h +0 -9
@@ -97,13 +97,4 @@ struct hdsp_9632_aeb {#define SNDRV_HDSP_IOCTL_GET_9632_AEB _IOR('H', 0x45, struct hdsp_9632_aeb) -/* typedefs for compatibility to user-space */ -typedef enum HDSP_IO_Type HDSP_IO_Type ; -typedef struct hdsp_peak_rms hdsp_peak_rms_t ; -typedef struct hdsp_config_info hdsp_config_info_t ; -typedef struct hdsp_firmware hdsp_firmware_t ; -typedef struct hdsp_version hdsp_version_t ; -typedef struct hdsp_mixer hdsp_mixer_t ; -typedef struct hdsp_9632_aeb hdsp_9632_aeb_t ; -#endif /* __SOUND_HDSP_H */
include/sound/uapi/hdspm.h +0 -8
@@ -219,12 +219,4 @@ struct hdspm_mixer_ioctl {/* use indirect access due to the limit of ioctl bit size */ #define SNDRV_HDSPM_IOCTL_GET_MIXER _IOR('H', 0x44, struct hdspm_mixer_ioctl) -/* typedefs for compatibility to user-space */ -typedef struct hdspm_peak_rms hdspm_peak_rms_t ; -typedef struct hdspm_config_info hdspm_config_info_t ; -typedef struct hdspm_version hdspm_version_t ; -typedef struct hdspm_channelfader snd_hdspm_channelfader_t ; -typedef struct hdspm_mixer hdspm_mixer_t ; - -#endif
Signature · 6 lines
2.16.4 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel