[PATCH] ALSA: compress: Fix 64bit ABI incompatibility

[PATCH] ALSA: compress: Fix 64bit ABI incompatibility

[Takashi Iwai]

snd_pcm_uframes_t is defined as unsigned long so it would take
different sizes depending on 32 or 64bit architectures.  As we don't
want this ABI incompatibility, and there is no real 64bit user yet,
let's make it the fixed size with __u32.

Also bump the protocol version number to 0.1.2.

Acked-by: Vinod Koul <vinod.koul@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 include/uapi/sound/compress_offload.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h
index d630163b9a2e..5759810e1c1b 100644
--- a/include/uapi/sound/compress_offload.h
+++ b/include/uapi/sound/compress_offload.h
@@ -30,7 +30,7 @@
 #include <sound/compress_params.h>
 
 
-#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 1)
+#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 2)
 /**
  * struct snd_compressed_buffer: compressed buffer
  * @fragment_size: size of buffer fragment in bytes
@@ -67,8 +67,8 @@ struct snd_compr_params {
 struct snd_compr_tstamp {
 	__u32 byte_offset;
 	__u32 copied_total;
-	snd_pcm_uframes_t pcm_frames;
-	snd_pcm_uframes_t pcm_io_frames;
+	__u32 pcm_frames;
+	__u32 pcm_io_frames;
 	__u32 sampling_rate;
 };
 
-- 
1.8.5

Re: [PATCH] ALSA: compress: Fix 64bit ABI incompatibility

[Vinod Koul]

On Tue, Dec 10, 2013 at 03:33:17PM +0100, Takashi Iwai wrote:
> snd_pcm_uframes_t is defined as unsigned long so it would take
> different sizes depending on 32 or 64bit architectures.  As we don't
> want this ABI incompatibility, and there is no real 64bit user yet,
> let's make it the fixed size with __u32.
> 
> Also bump the protocol version number to 0.1.2.

Was this applied?

> 
> Acked-by: Vinod Koul <vinod.koul@intel.com>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>  include/uapi/sound/compress_offload.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h
> index d630163b9a2e..5759810e1c1b 100644
> --- a/include/uapi/sound/compress_offload.h
> +++ b/include/uapi/sound/compress_offload.h
> @@ -30,7 +30,7 @@
>  #include <sound/compress_params.h>
>  
>  
> -#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 1)
> +#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 2)
>  /**
>   * struct snd_compressed_buffer: compressed buffer
>   * @fragment_size: size of buffer fragment in bytes
> @@ -67,8 +67,8 @@ struct snd_compr_params {
>  struct snd_compr_tstamp {
>  	__u32 byte_offset;
>  	__u32 copied_total;
> -	snd_pcm_uframes_t pcm_frames;
> -	snd_pcm_uframes_t pcm_io_frames;
> +	__u32 pcm_frames;
> +	__u32 pcm_io_frames;
>  	__u32 sampling_rate;
>  };
>  
> -- 
> 1.8.5
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

-- 

Re: [PATCH] ALSA: compress: Fix 64bit ABI incompatibility

[Takashi Iwai]

At Sun, 15 Dec 2013 19:27:40 +0530,
Vinod Koul wrote:
> 
> On Tue, Dec 10, 2013 at 03:33:17PM +0100, Takashi Iwai wrote:
> > snd_pcm_uframes_t is defined as unsigned long so it would take
> > different sizes depending on 32 or 64bit architectures.  As we don't
> > want this ABI incompatibility, and there is no real 64bit user yet,
> > let's make it the fixed size with __u32.
> > 
> > Also bump the protocol version number to 0.1.2.
> 
> Was this applied?

Yes.


Takashi

> 
> > 
> > Acked-by: Vinod Koul <vinod.koul@intel.com>
> > Cc: <stable@vger.kernel.org>
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > ---
> >  include/uapi/sound/compress_offload.h | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h
> > index d630163b9a2e..5759810e1c1b 100644
> > --- a/include/uapi/sound/compress_offload.h
> > +++ b/include/uapi/sound/compress_offload.h
> > @@ -30,7 +30,7 @@
> >  #include <sound/compress_params.h>
> >  
> >  
> > -#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 1)
> > +#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 2)
> >  /**
> >   * struct snd_compressed_buffer: compressed buffer
> >   * @fragment_size: size of buffer fragment in bytes
> > @@ -67,8 +67,8 @@ struct snd_compr_params {
> >  struct snd_compr_tstamp {
> >  	__u32 byte_offset;
> >  	__u32 copied_total;
> > -	snd_pcm_uframes_t pcm_frames;
> > -	snd_pcm_uframes_t pcm_io_frames;
> > +	__u32 pcm_frames;
> > +	__u32 pcm_io_frames;
> >  	__u32 sampling_rate;
> >  };
> >  
> > -- 
> > 1.8.5
> > 
> > _______________________________________________
> > Alsa-devel mailing list
> > Alsa-devel@alsa-project.org
> > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 
> -- 
>