topology: Include <linux/types.h> in API header file
PATCH 1/1 topology: Include <linux/types.h> in API header file
From: Mengdong Lin <[email protected]>
Include <linux/types.h> in the API header file topology.h
The struct snd_tplg_stream_caps_template has a member "formats" of type __le64. So <linux/types.h> is needed.
include/topology.h +2 -0
@@ -21,6 +21,8 @@ #ifndef __ALSA_TOPOLOGY_H #define __ALSA_TOPOLOGY_H +#include <linux/types.h> + #ifdef __cplusplus extern "C" { #endif
Signature · 1 line
1.9.1
Quoted 7 lines · On Fri, 06 Nov 2015 13:39:36 +0100, [email protected] wrote:
From: Mengdong Lin <[email protected]>
Include <
linux/types.h> in the API header filetopology.hThe struct
snd_tplg_stream_caps_templatehas a member "formats" of type__le64. So <linux/types.h> is needed.
We shouldn't use __le64 for user-space API. I couldn't find it in include/topology.h. Where is it used?
Of course, it's fine to use it for kernel ABI. But then linux/types.h is already included in local.h, so it shouldn't be a problem.
Takashi
Quoted 19 lines
Signed-off-by Mengdong Lin <[email protected]>include/topology.h +2
-0@@ -21,6 +21,8 @@ #ifndef __ALSA_TOPOLOGY_H #define __ALSA_TOPOLOGY_H +#include <linux/types.h> + #ifdef __cplusplus extern "C" { #endifSignature · 1 line
1.9.1
Quoted 7 lines · Takashi Iwai
Quoted 5 lines · On Fri, 06 Nov 2015 13:39:36 +0100, [email protected] wrote:
From: Mengdong Lin <[email protected]>
Include <
linux/types.h> in the API header filetopology.h
Quoted 8 lines
Quoted 2 lines
The struct
snd_tplg_stream_caps_templatehas a member "formats" of type__le64. So <linux/types.h> is needed.We shouldn't use
__le64for user-space API. I couldn't find it ininclude/topology.h. Where is it used?Of course, it's fine to use it for kernel ABI. But then
linux/types.his already included inlocal.h, so it shouldn't be a problem.
Our tool threw this error
./local-alsa/include/alsa/topology.h:668:2: error: â__le64â does not name a type
__le64 formats; /*!< supported formats SNDRV_PCM_FMTBIT_* */
It is coming from new ABI update
/*
* Stream Capabilities
*/
struct snd_soc_tplg_stream_caps {
__le32 size; /* in bytes of this structure */
char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; __le64 formats; /* supported formats SNDRV_PCM_FMTBIT_* */
^^^^^^^^^^^^^^^^^^^^^
__le32 rates; /* supported rates SNDRV_PCM_RATE_* */
__le32 rate_min; /* min rate */
__le32 rate_max; /* max rate */
__le32 channels_min; /* min channels */
__le32 channels_max; /* max channels */
__le32 periods_min; /* min number of periods */
__le32 periods_max; /* max number of periods */ __le32 period_size_min; /* min period size bytes */ __le32 period_size_max; /* max period size bytes */ __le32 buffer_size_min; /* min buffer size bytes */ __le32 buffer_size_max; /* max buffer size bytes */
} __attribute__((packed));
The problem is the users of alsa-lib and not the alsa-lib compile itself..
Thanks
Signature · 1 line
~Vinod
Quoted 43 lines · Vinod Koul
Quoted 7 lines · Takashi Iwai
Quoted 5 lines · On Fri, 06 Nov 2015 13:39:36 +0100, [email protected] wrote:
From: Mengdong Lin <[email protected]>
Include <
linux/types.h> in the API header filetopology.hQuoted 8 lines
Quoted 2 lines
The struct
snd_tplg_stream_caps_templatehas a member "formats" of type__le64. So <linux/types.h> is needed.We shouldn't use
__le64for user-space API. I couldn't find it ininclude/topology.h. Where is it used?Of course, it's fine to use it for kernel ABI. But then
linux/types.his already included inlocal.h, so it shouldn't be a problem.Our tool threw this error
./local-alsa/include/alsa/topology.h:668:2: error: â__le64â does not name a type
__le64formats; /*!< supported formats SNDRV_PCM_FMTBIT_* */It is coming from new ABI update
/*
* Stream Capabilities
*/
structsnd_soc_tplg_stream_caps{
__le32size; /* in bytes of this structure */
char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];__le64formats; /* supported formats SNDRV_PCM_FMTBIT_* */
^^^^^^^^^^^^^^^^^^^^^__le32 rates; /* supported rates SNDRV_PCM_RATE_* */ __le32 rate_min; /* min rate */ __le32 rate_max; /* max rate */ __le32 channels_min; /* min channels */ __le32 channels_max; /* max channels */ __le32 periods_min; /* min number of periods */ __le32 periods_max; /* max number of periods */
Quoted 7 lines
__le32period_size_min; /* min period size bytes */__le32period_size_max; /* max period size bytes */__le32buffer_size_min; /* min buffer size bytes */__le32buffer_size_max; /* max buffer size bytes */
} __attribute__((packed));The problem is the users of alsa-lib and not the alsa-lib compile itself..
The structure above shouldn't be exposed to user-space as is. If it's a part of alsa-lib API, it must be generic.
Takashi
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 20 lines · Takashi Iwai
Quoted 18 lines · Vinod Koul
Quoted 15 lines · Takashi Iwai
Quoted 7 lines · On Fri, 06 Nov 2015 13:39:36 +0100, [email protected] wrote:
From: Mengdong Lin <[email protected]>
Include <
linux/types.h> in the API header filetopology.hThe struct
snd_tplg_stream_caps_templatehas a member "formats" of type__le64. So <linux/types.h> is needed.We shouldn't use
__le64for user-space API. I couldn't find it ininclude/topology.h. Where is it used?Of course, it's fine to use it for kernel ABI. But then
linux/types.his already included inlocal.h, so it shouldn't be a problem.
Quoted 6 lines
Quoted 6 lines
Our tool threw this error
./local-alsa/include/alsa/topology.h:668:2: error: â__le64â does not name a type
__le64formats; /*!< supported formats SNDRV_PCM_FMTBIT_* */
Can you try the following patch for the userspace header.
From 568f769269122e90fceee605a98a1a526db2b3d4 Mon Sep 17 00:00:00 2001
From: Liam Girdwood <[email protected]>
Date: Fri, 6 Nov 2015 14:30:36 +0000
Subject: [PATCH] topology: remove little endian type from userspace header.
Use a generic unsigned long long for formats instead of an ABI endian specific __le64 type.
--- include/topology.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/topology.h +1 -1
@@ -665,7 +665,7 @@ struct snd_tplg_stream_template {*/ struct snd_tplg_stream_caps_template {const char *name;/*!< name of the stream caps */ -__le64 formats;/*!< supported formats SNDRV_PCM_FMTBIT_* */ +unsigned long long formats;/*!< supported formats SNDRV_PCM_FMTBIT_* */ unsigned int rates;/*!< supported rates SNDRV_PCM_RATE_* */ unsigned int rate_min;/*!< min rate */ unsigned int rate_max;/*!< max rate */
Signature · 7 lines
2.5.0 _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 31 lines · Liam Girdwood
Quoted 20 lines · Takashi Iwai
Quoted 18 lines · Vinod Koul
Quoted 15 lines · Takashi Iwai
Quoted 7 lines · On Fri, 06 Nov 2015 13:39:36 +0100, [email protected] wrote:
From: Mengdong Lin <[email protected]>
Include <
linux/types.h> in the API header filetopology.hThe struct
snd_tplg_stream_caps_templatehas a member "formats" of type__le64. So <linux/types.h> is needed.We shouldn't use
__le64for user-space API. I couldn't find it ininclude/topology.h. Where is it used?Of course, it's fine to use it for kernel ABI. But then
linux/types.his already included inlocal.h, so it shouldn't be a problem.Quoted 6 lines
Quoted 6 lines
Our tool threw this error
./local-alsa/include/alsa/topology.h:668:2: error: â__le64â does not name a type
__le64formats; /*!< supported formats SNDRV_PCM_FMTBIT_* */Can you try the following patch for the userspace header.
Quoted 7 lines
Quoted 1 line
From
568f769269122e90fceee605a98a1a526db2b3d4Mon Sep 17 00:00:00 2001From: Liam Girdwood <[email protected]>
Date: Fri, 6 Nov 2015 14:30:36 +0000
Subject: [PATCH] topology: remove little endian type from userspace header.Use a generic unsigned long long for formats instead of an ABI endian specific
__le64type.
Or use uint64_t instead. This is the standard definition of 64bit integer. I thought we already include stdint.h somewhere, but you can included it there again to be sure, too.
Takashi
Quoted 23 lines
Signed-off-by Liam Girdwood <[email protected]>--- include/topology.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/topology.h +1
-1@@ -665,7 +665,7 @@ struct snd_tplg_stream_template {*/ struct snd_tplg_stream_caps_template {const char *name;/*!< name of the stream caps */ -__le64 formats;/*!< supported formats SNDRV_PCM_FMTBIT_* */ +unsigned long long formats;/*!< supported formats SNDRV_PCM_FMTBIT_* */ unsigned int rates;/*!< supported rates SNDRV_PCM_RATE_* */ unsigned int rate_min;/*!< min rate */ unsigned int rate_max;/*!< max rate */ Signature · 1 line
2.5.0
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 9 lines · Takashi Iwai
Quoted 7 lines · Liam Girdwood
Quoted 3 lines
From
568f769269122e90fceee605a98a1a526db2b3d4Mon Sep 17 00:00:00 2001From: Liam Girdwood <[email protected]>
Date: Fri, 6 Nov 2015 14:30:36 +0000
Subject: [PATCH] topology: remove little endian type from userspace header.
Quoted 7 lines
Quoted 2 lines
Use a generic unsigned long long for formats instead of an ABI endian specific
__le64type.Or use
uint64_tinstead. This is the standard definition of 64bit integer. I thought we already includestdint.hsomewhere, but you can included it there again to be sure, too.
I didn't see stdint.h so used unsigned long long on the first patch. The patch below fixes this though :-
Quoted 1 line
From
52d3023e482ac856692bf27819d97d9a037a055bMon Sep 17 00:00:00 2001
From: Liam Girdwood <[email protected]>
Date: Fri, 6 Nov 2015 14:30:36 +0000
Subject: [PATCH] topology: remove little endian type from userspace header.
Use a generic uint64_t for formats instead of an ABI endian specific __le64 type.
--- include/topology.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/topology.h +3 -1
@@ -21,6 +21,8 @@ #ifndef __ALSA_TOPOLOGY_H #define __ALSA_TOPOLOGY_H +#include <stdint.h> + #ifdef __cplusplus extern "C" { #endif
@@ -665,7 +667,7 @@ struct snd_tplg_stream_template {*/ struct snd_tplg_stream_caps_template {const char *name;/*!< name of the stream caps */ -__le64 formats;/*!< supported formats SNDRV_PCM_FMTBIT_* */ +uint64_t formats;/*!< supported formats SNDRV_PCM_FMTBIT_* */ unsigned int rates;/*!< supported rates SNDRV_PCM_RATE_* */ unsigned int rate_min;/*!< min rate */ unsigned int rate_max;/*!< max rate */
Signature · 1 line
2.5.0
Quoted 21 lines · Liam Girdwood
Quoted 9 lines · Takashi Iwai
Quoted 7 lines · Liam Girdwood
Quoted 3 lines
From
568f769269122e90fceee605a98a1a526db2b3d4Mon Sep 17 00:00:00 2001From: Liam Girdwood <[email protected]>
Date: Fri, 6 Nov 2015 14:30:36 +0000
Subject: [PATCH] topology: remove little endian type from userspace header.Quoted 7 lines
Quoted 2 lines
Use a generic unsigned long long for formats instead of an ABI endian specific
__le64type.Or use
uint64_tinstead. This is the standard definition of 64bit integer. I thought we already includestdint.hsomewhere, but you can included it there again to be sure, too.I didn't see
stdint.hso used unsigned long long on the first patch. The patch below fixes this though :-
Quoted 7 lines
From
52d3023e482ac856692bf27819d97d9a037a055bMon Sep 17 00:00:00 2001
From: Liam Girdwood <[email protected]>
Date: Fri, 6 Nov 2015 14:30:36 +0000
Subject: [PATCH] topology: remove little endian type from userspace header.Use a generic
uint64_tfor formats instead of an ABI endian specific__le64type.
Tested and it works fine.
Quoted 32 lines
Signed-off-by Liam Girdwood <[email protected]>--- include/topology.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)include/topology.h +3
-1@@ -21,6 +21,8 @@ #ifndef __ALSA_TOPOLOGY_H #define __ALSA_TOPOLOGY_H +#include <stdint.h> + #ifdef __cplusplus extern "C" { #endif@@ -665,7 +667,7 @@ struct snd_tplg_stream_template {*/ struct snd_tplg_stream_caps_template {const char *name;/*!< name of the stream caps */ -__le64 formats;/*!< supported formats SNDRV_PCM_FMTBIT_* */ +uint64_t formats;/*!< supported formats SNDRV_PCM_FMTBIT_* */ unsigned int rates;/*!< supported rates SNDRV_PCM_RATE_* */ unsigned int rate_min;/*!< min rate */ unsigned int rate_max;/*!< max rate */ Signature · 1 line
2.5.0
Quoted 27 lines · Subhransu S. Prusty
Quoted 26 lines · Liam Girdwood
Quoted 9 lines · Takashi Iwai
Quoted 7 lines · Liam Girdwood
Quoted 3 lines
From
568f769269122e90fceee605a98a1a526db2b3d4Mon Sep 17 00:00:00 2001From: Liam Girdwood <[email protected]>
Date: Fri, 6 Nov 2015 14:30:36 +0000
Subject: [PATCH] topology: remove little endian type from userspace header.Quoted 7 lines
Quoted 2 lines
Use a generic unsigned long long for formats instead of an ABI endian specific
__le64type.Or use
uint64_tinstead. This is the standard definition of 64bit integer. I thought we already includestdint.hsomewhere, but you can included it there again to be sure, too.I didn't see
stdint.hso used unsigned long long on the first patch. The patch below fixes this though :-From
52d3023e482ac856692bf27819d97d9a037a055bMon Sep 17 00:00:00 2001
From: Liam Girdwood <[email protected]>
Date: Fri, 6 Nov 2015 14:30:36 +0000
Subject: [PATCH] topology: remove little endian type from userspace header.
Quoted 4 lines
Quoted 2 lines
Use a generic
uint64_tfor formats instead of an ABI endian specific__le64type.Tested and it works fine.
Hi Takashi,
Is this fix okay, was this applied ?
Signature · 1 line
~Vinod
Dne 10.11.2015 v 13:29 Vinod Koul napsal(a):
Quoted 28 lines · Subhransu S. Prusty
Quoted 27 lines · Liam Girdwood
Quoted 26 lines · Takashi Iwai
Quoted 9 lines
Quoted 7 lines · Liam Girdwood
Quoted 3 lines
From
568f769269122e90fceee605a98a1a526db2b3d4Mon Sep 17 00:00:00 2001From: Liam Girdwood <[email protected]>
Date: Fri, 6 Nov 2015 14:30:36 +0000
Subject: [PATCH] topology: remove little endian type from userspace header.Quoted 7 lines
Quoted 2 lines
Use a generic unsigned long long for formats instead of an ABI endian specific
__le64type.Or use
uint64_tinstead. This is the standard definition of 64bit integer. I thought we already includestdint.hsomewhere, but you can included it there again to be sure, too.I didn't see
stdint.hso used unsigned long long on the first patch. The patch below fixes this though :-From
52d3023e482ac856692bf27819d97d9a037a055bMon Sep 17 00:00:00 2001
From: Liam Girdwood <[email protected]>
Date: Fri, 6 Nov 2015 14:30:36 +0000
Subject: [PATCH] topology: remove little endian type from userspace header.
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines
Use a generic
uint64_tfor formats instead of an ABI endian specific__le64type.Tested and it works fine.
Hi Takashi,
Is this fix okay, was this applied ?
Yes, it's in alsa-lib-1.1.0, too:
http://git.alsa-project.org/?p=alsa-lib.git;a=summary
Jaroslav
Signature · 2 lines
Jaroslav Kysela <[email protected]> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.