diff options
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-lib/0001-uapi-Move-typedefs-from-uapi-to-sound.patch')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/0001-uapi-Move-typedefs-from-uapi-to-sound.patch | 137 |
1 files changed, 137 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-uapi-Move-typedefs-from-uapi-to-sound.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-uapi-Move-typedefs-from-uapi-to-sound.patch new file mode 100644 index 0000000000..c35a2c9d7c --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-uapi-Move-typedefs-from-uapi-to-sound.patch | |||
@@ -0,0 +1,137 @@ | |||
1 | From 59792f467b38d6a4c4dffdb30528f7fb03d23d96 Mon Sep 17 00:00:00 2001 | ||
2 | From: Takashi Iwai <tiwai@suse.de> | ||
3 | Date: Fri, 20 Dec 2019 17:12:37 +0100 | ||
4 | Subject: [PATCH] uapi: Move typedefs from uapi to sound/* | ||
5 | |||
6 | For keeping uapi/*.h cleaner. | ||
7 | |||
8 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | |||
12 | Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> | ||
13 | --- | ||
14 | include/sound/emu10k1.h | 9 +++++++++ | ||
15 | include/sound/hdsp.h | 10 ++++++++++ | ||
16 | include/sound/hdspm.h | 8 ++++++++ | ||
17 | include/sound/sb16_csp.h | 4 ++++ | ||
18 | include/sound/uapi/emu10k1.h | 10 ---------- | ||
19 | include/sound/uapi/hdsp.h | 9 --------- | ||
20 | include/sound/uapi/hdspm.h | 8 -------- | ||
21 | 7 files changed, 31 insertions(+), 27 deletions(-) | ||
22 | |||
23 | diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h | ||
24 | index f06ecee5..0832f95b 100644 | ||
25 | --- a/include/sound/emu10k1.h | ||
26 | +++ b/include/sound/emu10k1.h | ||
27 | @@ -1,2 +1,11 @@ | ||
28 | #include <alsa/sound/type_compat.h> | ||
29 | #include <alsa/sound/uapi/emu10k1.h> | ||
30 | +#ifndef __emu10k1_type_defined | ||
31 | +#define __emu10k1_type_defined | ||
32 | +typedef struct snd_emu10k1_fx8010_info emu10k1_fx8010_info_t; | ||
33 | +typedef struct snd_emu10k1_fx8010_control_gpr emu10k1_fx8010_control_gpr_t; | ||
34 | +typedef struct snd_emu10k1_fx8010_code emu10k1_fx8010_code_t; | ||
35 | +typedef struct snd_emu10k1_fx8010_tram emu10k1_fx8010_tram_t; | ||
36 | +typedef struct snd_emu10k1_fx8010_pcm_rec emu10k1_fx8010_pcm_t; | ||
37 | +typedef struct emu10k1_ctl_elem_id emu10k1_ctl_elem_id_t; | ||
38 | +#endif | ||
39 | diff --git a/include/sound/hdsp.h b/include/sound/hdsp.h | ||
40 | index 78fb745b..e8f93156 100644 | ||
41 | --- a/include/sound/hdsp.h | ||
42 | +++ b/include/sound/hdsp.h | ||
43 | @@ -1,2 +1,12 @@ | ||
44 | #include <alsa/sound/type_compat.h> | ||
45 | #include <alsa/sound/uapi/hdsp.h> | ||
46 | +#ifndef __hdsp_type_defined | ||
47 | +#define __hdsp_type_defined | ||
48 | +typedef enum HDSP_IO_Type HDSP_IO_Type; | ||
49 | +typedef struct hdsp_peak_rms hdsp_peak_rms_t; | ||
50 | +typedef struct hdsp_config_info hdsp_config_info_t; | ||
51 | +typedef struct hdsp_firmware hdsp_firmware_t; | ||
52 | +typedef struct hdsp_version hdsp_version_t; | ||
53 | +typedef struct hdsp_mixer hdsp_mixer_t; | ||
54 | +typedef struct hdsp_9632_aeb hdsp_9632_aeb_t; | ||
55 | +#endif | ||
56 | diff --git a/include/sound/hdspm.h b/include/sound/hdspm.h | ||
57 | index af6d19ed..d9095d9f 100644 | ||
58 | --- a/include/sound/hdspm.h | ||
59 | +++ b/include/sound/hdspm.h | ||
60 | @@ -1,2 +1,10 @@ | ||
61 | #include <alsa/sound/type_compat.h> | ||
62 | #include <alsa/sound/uapi/hdspm.h> | ||
63 | +#ifndef __hdspm_type_defined | ||
64 | +#define __hdspm_type_defined | ||
65 | +typedef struct hdspm_peak_rms hdspm_peak_rms_t; | ||
66 | +typedef struct hdspm_config_info hdspm_config_info_t; | ||
67 | +typedef struct hdspm_version hdspm_version_t; | ||
68 | +typedef struct hdspm_channelfader snd_hdspm_channelfader_t; | ||
69 | +typedef struct hdspm_mixer hdspm_mixer_t; | ||
70 | +#endif | ||
71 | diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h | ||
72 | index 24121fcb..fd02bc56 100644 | ||
73 | --- a/include/sound/sb16_csp.h | ||
74 | +++ b/include/sound/sb16_csp.h | ||
75 | @@ -1 +1,5 @@ | ||
76 | #include <alsa/sound/uapi/sb16_csp.h> | ||
77 | +#ifndef __sb16_csp_type_defined | ||
78 | +#define __sb16_csp_type_defined | ||
79 | +typedef struct snd_sb_csp_microcode snd_sb_csp_microcode_t; | ||
80 | +#endif | ||
81 | diff --git a/include/sound/uapi/emu10k1.h b/include/sound/uapi/emu10k1.h | ||
82 | index c1150e4d..6bcd76f6 100644 | ||
83 | --- a/include/sound/uapi/emu10k1.h | ||
84 | +++ b/include/sound/uapi/emu10k1.h | ||
85 | @@ -382,14 +382,4 @@ struct snd_emu10k1_fx8010_pcm_rec { | ||
86 | #define SNDRV_EMU10K1_IOCTL_SINGLE_STEP _IOW ('H', 0x83, int) | ||
87 | #define SNDRV_EMU10K1_IOCTL_DBG_READ _IOR ('H', 0x84, int) | ||
88 | |||
89 | -#ifndef __KERNEL__ | ||
90 | -/* typedefs for compatibility to user-space */ | ||
91 | -typedef struct snd_emu10k1_fx8010_info emu10k1_fx8010_info_t; | ||
92 | -typedef struct snd_emu10k1_fx8010_control_gpr emu10k1_fx8010_control_gpr_t; | ||
93 | -typedef struct snd_emu10k1_fx8010_code emu10k1_fx8010_code_t; | ||
94 | -typedef struct snd_emu10k1_fx8010_tram emu10k1_fx8010_tram_t; | ||
95 | -typedef struct snd_emu10k1_fx8010_pcm_rec emu10k1_fx8010_pcm_t; | ||
96 | -typedef struct emu10k1_ctl_elem_id emu10k1_ctl_elem_id_t; | ||
97 | -#endif | ||
98 | - | ||
99 | #endif /* _UAPI__SOUND_EMU10K1_H */ | ||
100 | diff --git a/include/sound/uapi/hdsp.h b/include/sound/uapi/hdsp.h | ||
101 | index 88c92a3f..7ac2d3f2 100644 | ||
102 | --- a/include/sound/uapi/hdsp.h | ||
103 | +++ b/include/sound/uapi/hdsp.h | ||
104 | @@ -97,13 +97,4 @@ struct hdsp_9632_aeb { | ||
105 | |||
106 | #define SNDRV_HDSP_IOCTL_GET_9632_AEB _IOR('H', 0x45, struct hdsp_9632_aeb) | ||
107 | |||
108 | -/* typedefs for compatibility to user-space */ | ||
109 | -typedef enum HDSP_IO_Type HDSP_IO_Type; | ||
110 | -typedef struct hdsp_peak_rms hdsp_peak_rms_t; | ||
111 | -typedef struct hdsp_config_info hdsp_config_info_t; | ||
112 | -typedef struct hdsp_firmware hdsp_firmware_t; | ||
113 | -typedef struct hdsp_version hdsp_version_t; | ||
114 | -typedef struct hdsp_mixer hdsp_mixer_t; | ||
115 | -typedef struct hdsp_9632_aeb hdsp_9632_aeb_t; | ||
116 | - | ||
117 | #endif /* __SOUND_HDSP_H */ | ||
118 | diff --git a/include/sound/uapi/hdspm.h b/include/sound/uapi/hdspm.h | ||
119 | index 2d91f90e..3fbfd9dc 100644 | ||
120 | --- a/include/sound/uapi/hdspm.h | ||
121 | +++ b/include/sound/uapi/hdspm.h | ||
122 | @@ -219,12 +219,4 @@ struct hdspm_mixer_ioctl { | ||
123 | /* use indirect access due to the limit of ioctl bit size */ | ||
124 | #define SNDRV_HDSPM_IOCTL_GET_MIXER _IOR('H', 0x44, struct hdspm_mixer_ioctl) | ||
125 | |||
126 | -/* typedefs for compatibility to user-space */ | ||
127 | -typedef struct hdspm_peak_rms hdspm_peak_rms_t; | ||
128 | -typedef struct hdspm_config_info hdspm_config_info_t; | ||
129 | -typedef struct hdspm_version hdspm_version_t; | ||
130 | -typedef struct hdspm_channelfader snd_hdspm_channelfader_t; | ||
131 | -typedef struct hdspm_mixer hdspm_mixer_t; | ||
132 | - | ||
133 | - | ||
134 | #endif | ||
135 | -- | ||
136 | 2.20.1 | ||
137 | |||