From: David Howells <dhowells@redhat.com> To: linux-api@vger.kernel.org, linux-kbuild@vger.kernel.org Cc: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, moderated for non-subscribers <alsa-devel@alsa-project.org>, linux-kernel@vger.kernel.org, dhowells@redhat.com Subject: [PATCH 08/11] UAPI: sound: Fix use of u32 and co. in UAPI headers Date: Wed, 05 Sep 2018 16:55:30 +0100 [thread overview] Message-ID: <153616293089.23468.13515059526628668970.stgit@warthog.procyon.org.uk> (raw) In-Reply-To: <153616286704.23468.584491117180383924.stgit@warthog.procyon.org.uk> Fix the use of u32 and co. in UAPI headers as these are not defined. Switch to using the __u32-style equivalents instead. Signed-off-by: David Howells <dhowells@redhat.com> cc: Jaroslav Kysela <perex@perex.cz> cc: Takashi Iwai <tiwai@suse.com> cc: alsa-devel@alsa-project.org (moderated for non-subscribers) --- include/uapi/sound/skl-tplg-interface.h | 106 ++++++++++++++++--------------- 1 file changed, 54 insertions(+), 52 deletions(-) diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h index f58cafa42f18..f39352cef382 100644 --- a/include/uapi/sound/skl-tplg-interface.h +++ b/include/uapi/sound/skl-tplg-interface.h @@ -10,6 +10,8 @@ #ifndef __HDA_TPLG_INTERFACE_H__ #define __HDA_TPLG_INTERFACE_H__ +#include <linux/types.h> + /* * Default types range from 0~12. type can range from 0 to 0xff * SST types start at higher to avoid any overlapping in future @@ -143,10 +145,10 @@ enum skl_module_param_type { }; struct skl_dfw_algo_data { - u32 set_params:2; - u32 rsvd:30; - u32 param_id; - u32 max; + __u32 set_params:2; + __u32 rsvd:30; + __u32 param_id; + __u32 max; char params[0]; } __packed; @@ -163,68 +165,68 @@ enum skl_tuple_type { /* v4 configuration data */ struct skl_dfw_v4_module_pin { - u16 module_id; - u16 instance_id; + __u16 module_id; + __u16 instance_id; } __packed; struct skl_dfw_v4_module_fmt { - u32 channels; - u32 freq; - u32 bit_depth; - u32 valid_bit_depth; - u32 ch_cfg; - u32 interleaving_style; - u32 sample_type; - u32 ch_map; + __u32 channels; + __u32 freq; + __u32 bit_depth; + __u32 valid_bit_depth; + __u32 ch_cfg; + __u32 interleaving_style; + __u32 sample_type; + __u32 ch_map; } __packed; struct skl_dfw_v4_module_caps { - u32 set_params:2; - u32 rsvd:30; - u32 param_id; - u32 caps_size; - u32 caps[HDA_SST_CFG_MAX]; + __u32 set_params:2; + __u32 rsvd:30; + __u32 param_id; + __u32 caps_size; + __u32 caps[HDA_SST_CFG_MAX]; } __packed; struct skl_dfw_v4_pipe { - u8 pipe_id; - u8 pipe_priority; - u16 conn_type:4; - u16 rsvd:4; - u16 memory_pages:8; + __u8 pipe_id; + __u8 pipe_priority; + __u16 conn_type:4; + __u16 rsvd:4; + __u16 memory_pages:8; } __packed; struct skl_dfw_v4_module { char uuid[SKL_UUID_STR_SZ]; - u16 module_id; - u16 instance_id; - u32 max_mcps; - u32 mem_pages; - u32 obs; - u32 ibs; - u32 vbus_id; - - u32 max_in_queue:8; - u32 max_out_queue:8; - u32 time_slot:8; - u32 core_id:4; - u32 rsvd1:4; - - u32 module_type:8; - u32 conn_type:4; - u32 dev_type:4; - u32 hw_conn_type:4; - u32 rsvd2:12; - - u32 params_fixup:8; - u32 converter:8; - u32 input_pin_type:1; - u32 output_pin_type:1; - u32 is_dynamic_in_pin:1; - u32 is_dynamic_out_pin:1; - u32 is_loadable:1; - u32 rsvd3:11; + __u16 module_id; + __u16 instance_id; + __u32 max_mcps; + __u32 mem_pages; + __u32 obs; + __u32 ibs; + __u32 vbus_id; + + __u32 max_in_queue:8; + __u32 max_out_queue:8; + __u32 time_slot:8; + __u32 core_id:4; + __u32 rsvd1:4; + + __u32 module_type:8; + __u32 conn_type:4; + __u32 dev_type:4; + __u32 hw_conn_type:4; + __u32 rsvd2:12; + + __u32 params_fixup:8; + __u32 converter:8; + __u32 input_pin_type:1; + __u32 output_pin_type:1; + __u32 is_dynamic_in_pin:1; + __u32 is_dynamic_out_pin:1; + __u32 is_loadable:1; + __u32 rsvd3:11; struct skl_dfw_v4_pipe pipe; struct skl_dfw_v4_module_fmt in_fmt[MAX_IN_QUEUE];
WARNING: multiple messages have this Message-ID (diff)
From: David Howells <dhowells@redhat.com> To: linux-api@vger.kernel.org, linux-kbuild@vger.kernel.org Cc: dhowells@redhat.com, linux-kernel@vger.kernel.org, moderated for non-subscribers <alsa-devel@alsa-project.org>, Takashi Iwai <tiwai@suse.com> Subject: [PATCH 08/11] UAPI: sound: Fix use of u32 and co. in UAPI headers Date: Wed, 05 Sep 2018 16:55:30 +0100 [thread overview] Message-ID: <153616293089.23468.13515059526628668970.stgit@warthog.procyon.org.uk> (raw) In-Reply-To: <153616286704.23468.584491117180383924.stgit@warthog.procyon.org.uk> Fix the use of u32 and co. in UAPI headers as these are not defined. Switch to using the __u32-style equivalents instead. Signed-off-by: David Howells <dhowells@redhat.com> cc: Jaroslav Kysela <perex@perex.cz> cc: Takashi Iwai <tiwai@suse.com> cc: alsa-devel@alsa-project.org (moderated for non-subscribers) --- include/uapi/sound/skl-tplg-interface.h | 106 ++++++++++++++++--------------- 1 file changed, 54 insertions(+), 52 deletions(-) diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h index f58cafa42f18..f39352cef382 100644 --- a/include/uapi/sound/skl-tplg-interface.h +++ b/include/uapi/sound/skl-tplg-interface.h @@ -10,6 +10,8 @@ #ifndef __HDA_TPLG_INTERFACE_H__ #define __HDA_TPLG_INTERFACE_H__ +#include <linux/types.h> + /* * Default types range from 0~12. type can range from 0 to 0xff * SST types start at higher to avoid any overlapping in future @@ -143,10 +145,10 @@ enum skl_module_param_type { }; struct skl_dfw_algo_data { - u32 set_params:2; - u32 rsvd:30; - u32 param_id; - u32 max; + __u32 set_params:2; + __u32 rsvd:30; + __u32 param_id; + __u32 max; char params[0]; } __packed; @@ -163,68 +165,68 @@ enum skl_tuple_type { /* v4 configuration data */ struct skl_dfw_v4_module_pin { - u16 module_id; - u16 instance_id; + __u16 module_id; + __u16 instance_id; } __packed; struct skl_dfw_v4_module_fmt { - u32 channels; - u32 freq; - u32 bit_depth; - u32 valid_bit_depth; - u32 ch_cfg; - u32 interleaving_style; - u32 sample_type; - u32 ch_map; + __u32 channels; + __u32 freq; + __u32 bit_depth; + __u32 valid_bit_depth; + __u32 ch_cfg; + __u32 interleaving_style; + __u32 sample_type; + __u32 ch_map; } __packed; struct skl_dfw_v4_module_caps { - u32 set_params:2; - u32 rsvd:30; - u32 param_id; - u32 caps_size; - u32 caps[HDA_SST_CFG_MAX]; + __u32 set_params:2; + __u32 rsvd:30; + __u32 param_id; + __u32 caps_size; + __u32 caps[HDA_SST_CFG_MAX]; } __packed; struct skl_dfw_v4_pipe { - u8 pipe_id; - u8 pipe_priority; - u16 conn_type:4; - u16 rsvd:4; - u16 memory_pages:8; + __u8 pipe_id; + __u8 pipe_priority; + __u16 conn_type:4; + __u16 rsvd:4; + __u16 memory_pages:8; } __packed; struct skl_dfw_v4_module { char uuid[SKL_UUID_STR_SZ]; - u16 module_id; - u16 instance_id; - u32 max_mcps; - u32 mem_pages; - u32 obs; - u32 ibs; - u32 vbus_id; - - u32 max_in_queue:8; - u32 max_out_queue:8; - u32 time_slot:8; - u32 core_id:4; - u32 rsvd1:4; - - u32 module_type:8; - u32 conn_type:4; - u32 dev_type:4; - u32 hw_conn_type:4; - u32 rsvd2:12; - - u32 params_fixup:8; - u32 converter:8; - u32 input_pin_type:1; - u32 output_pin_type:1; - u32 is_dynamic_in_pin:1; - u32 is_dynamic_out_pin:1; - u32 is_loadable:1; - u32 rsvd3:11; + __u16 module_id; + __u16 instance_id; + __u32 max_mcps; + __u32 mem_pages; + __u32 obs; + __u32 ibs; + __u32 vbus_id; + + __u32 max_in_queue:8; + __u32 max_out_queue:8; + __u32 time_slot:8; + __u32 core_id:4; + __u32 rsvd1:4; + + __u32 module_type:8; + __u32 conn_type:4; + __u32 dev_type:4; + __u32 hw_conn_type:4; + __u32 rsvd2:12; + + __u32 params_fixup:8; + __u32 converter:8; + __u32 input_pin_type:1; + __u32 output_pin_type:1; + __u32 is_dynamic_in_pin:1; + __u32 is_dynamic_out_pin:1; + __u32 is_loadable:1; + __u32 rsvd3:11; struct skl_dfw_v4_pipe pipe; struct skl_dfw_v4_module_fmt in_fmt[MAX_IN_QUEUE];
next prev parent reply other threads:[~2018-09-05 15:55 UTC|newest] Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-05 15:54 [RFC] UAPI: Check headers by compiling all together as C++ David Howells 2018-09-05 15:54 ` David Howells 2018-09-05 15:54 ` David Howells 2018-09-05 15:54 ` David Howells 2018-09-05 15:54 ` David Howells 2018-09-05 15:54 ` [PATCH 01/11] UAPI: drm: Fix use of C++ keywords as structural members David Howells 2018-09-05 15:54 ` David Howells 2018-09-05 15:54 ` [PATCH 02/11] UAPI: keys: " David Howells 2018-09-05 15:54 ` David Howells 2018-09-05 15:54 ` [PATCH 03/11] UAPI: virtio_net: " David Howells 2018-09-05 16:54 ` Greg KH 2018-09-05 16:54 ` Greg KH 2018-09-05 17:15 ` David Howells 2018-09-05 17:15 ` David Howells 2018-09-05 17:35 ` Michael S. Tsirkin 2018-09-05 17:35 ` Michael S. Tsirkin 2018-09-06 7:09 ` David Howells 2018-09-06 7:09 ` David Howells 2018-09-06 14:36 ` Michael S. Tsirkin 2018-09-06 14:36 ` Michael S. Tsirkin 2018-09-05 15:54 ` David Howells 2018-09-05 15:55 ` [PATCH 04/11] UAPI: bcache: Fix use of embedded flexible array David Howells 2018-10-02 14:52 ` Jan Engelhardt 2018-10-09 15:41 ` David Howells 2018-10-09 16:54 ` Jan Engelhardt 2018-09-05 15:55 ` [PATCH 05/11] UAPI: coda: Don't use internal kernel structs in UAPI David Howells 2018-09-05 16:54 ` Jan Harkes 2018-09-05 17:12 ` Yann Droneaud 2018-09-05 17:28 ` Jan Harkes 2018-09-05 17:28 ` Jan Harkes 2018-09-05 17:24 ` David Howells 2018-09-06 7:13 ` David Howells 2018-09-06 11:52 ` Yann Droneaud 2018-09-06 12:16 ` Jan Harkes 2018-09-06 12:16 ` Jan Harkes 2018-09-06 14:53 ` David Howells 2018-09-05 15:55 ` [PATCH 06/11] UAPI: netfilter: Fix symbol collision issues David Howells 2018-09-05 15:55 ` [PATCH 07/11] UAPI: nilfs2: Fix use of undefined byteswapping functions David Howells 2018-09-05 22:20 ` Al Viro 2018-09-05 15:55 ` David Howells [this message] 2018-09-05 15:55 ` [PATCH 08/11] UAPI: sound: Fix use of u32 and co. in UAPI headers David Howells 2018-09-06 5:59 ` Takashi Sakamoto 2018-09-06 5:59 ` Takashi Sakamoto 2018-09-06 8:17 ` David Howells 2018-09-05 15:55 ` [PATCH 09/11] UAPI: ndctl: Fix g++-unsupported initialisation in headers David Howells 2018-09-05 15:55 ` David Howells 2018-09-05 15:55 ` David Howells 2018-09-05 15:55 ` [PATCH 10/11] UAPI: ndctl: Remove use of PAGE_SIZE David Howells 2018-09-05 15:55 ` David Howells 2018-09-05 15:55 ` [PATCH 11/11] UAPI: Check headers build for C++ David Howells 2018-09-05 16:55 ` [RFC] UAPI: Check headers by compiling all together as C++ Greg KH 2018-09-05 16:55 ` Greg KH 2018-09-05 16:55 ` Greg KH 2018-09-05 16:55 ` Greg KH 2018-09-05 16:55 ` Greg KH 2018-09-05 16:55 ` Greg KH 2018-09-05 17:33 ` Yann Droneaud 2018-09-05 17:33 ` Yann Droneaud 2018-09-05 17:33 ` Yann Droneaud 2018-09-05 17:33 ` Yann Droneaud 2018-09-05 17:33 ` Yann Droneaud 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-05 17:42 ` Michael S. Tsirkin 2018-09-06 7:12 ` Yann Droneaud 2018-09-06 7:12 ` Yann Droneaud 2018-09-06 7:12 ` Yann Droneaud 2018-09-06 7:12 ` Yann Droneaud 2018-09-06 7:12 ` Yann Droneaud 2018-09-05 19:22 ` Jan Engelhardt 2018-09-05 19:22 ` Jan Engelhardt 2018-09-05 19:22 ` Jan Engelhardt 2018-09-05 19:22 ` Jan Engelhardt 2018-09-05 19:22 ` Jan Engelhardt 2018-09-05 17:50 ` David Howells 2018-09-05 17:50 ` David Howells 2018-09-05 17:50 ` David Howells 2018-09-06 9:18 David Howells 2018-09-06 9:18 ` David Howells 2018-09-06 9:18 ` David Howells 2018-09-06 9:18 ` David Howells 2018-09-06 9:18 ` David Howells [not found] ` <153622549721.14298.8116794954073122489.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org> 2018-09-06 9:18 ` [PATCH 01/11] UAPI: drm: Fix use of C++ keywords as structural members [ver #2] David Howells 2018-09-06 9:18 ` David Howells 2018-09-06 9:18 ` [PATCH 02/11] UAPI: keys: " David Howells 2018-09-06 9:18 ` David Howells 2018-09-06 9:18 ` [PATCH 03/11] UAPI: virtio_net: " David Howells 2018-09-06 15:02 ` Michael S. Tsirkin 2018-09-06 15:02 ` Michael S. Tsirkin 2018-09-06 9:18 ` David Howells 2018-09-06 9:18 ` [PATCH 04/11] UAPI: bcache: Fix use of embedded flexible array " David Howells 2018-09-06 9:18 ` [PATCH 05/11] UAPI: coda: Move kernel internals out of public view " David Howells 2018-09-06 9:18 ` David Howells 2018-09-06 9:19 ` [PATCH 06/11] coda: Move internal defs out of include/linux/ " David Howells 2018-09-06 9:19 ` [PATCH 07/11] UAPI: netfilter: Fix symbol collision issues " David Howells 2018-09-10 17:32 ` kbuild test robot 2018-09-10 17:32 ` kbuild test robot 2018-09-10 17:32 ` kbuild test robot 2018-09-28 13:07 ` [netfilter-core] " Pablo Neira Ayuso 2018-10-09 15:35 ` David Howells 2018-09-06 9:19 ` [PATCH 08/11] UAPI: nilfs2: Fix use of undefined byteswapping functions " David Howells 2018-09-06 9:19 ` [PATCH 09/11] UAPI: ndctl: Fix g++-unsupported initialisation in headers " David Howells 2018-09-06 9:19 ` David Howells 2018-09-06 9:19 ` David Howells 2018-09-25 20:22 ` Dan Williams 2018-09-25 20:22 ` Dan Williams 2018-09-25 20:22 ` Dan Williams 2018-09-06 9:19 ` [PATCH 10/11] UAPI: ndctl: Remove use of PAGE_SIZE " David Howells 2018-09-06 9:19 ` David Howells 2018-09-06 9:19 ` David Howells 2018-09-25 20:17 ` Dan Williams 2018-09-25 20:17 ` Dan Williams 2018-09-25 20:17 ` Dan Williams 2018-10-09 15:36 ` David Howells 2018-10-09 15:36 ` David Howells 2018-09-06 9:19 ` [PATCH 11/11] UAPI: Check headers build for C++ " David Howells 2018-09-10 16:26 ` kbuild test robot 2018-09-10 16:26 ` kbuild test robot 2018-09-10 16:26 ` kbuild test robot 2018-09-10 17:02 ` kbuild test robot 2018-09-10 17:02 ` kbuild test robot 2018-09-10 17:02 ` kbuild test robot 2018-09-14 9:10 ` Arnd Bergmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=153616293089.23468.13515059526628668970.stgit@warthog.procyon.org.uk \ --to=dhowells@redhat.com \ --cc=alsa-devel@alsa-project.org \ --cc=linux-api@vger.kernel.org \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=perex@perex.cz \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.