[alsa-cvslog] alsa-driver: ALSA driver repository - compatibility code, new drivers and standalone building branch, master now at v1.0.23-35-g8bc805c

[<nor...@al...>]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  8bc805c2ea78245e975ed78a7461f41142692ad9 (commit)
      from  be60557f0c5ae6c3a1a29e1e523d3803305241d4 (commit)

- Log -----------------------------------------------------------------
commit 8bc805c2ea78245e975ed78a7461f41142692ad9
Author:     Jaroslav Kysela <pe...@pe...>
AuthorDate: Mon Jun 28 10:27:13 2010 +0200
Commit:     Jaroslav Kysela <pe...@pe...>
CommitDate: Mon Jun 28 10:27:13 2010 +0200

    Fix pcm.patch - change type for snd_pcm->twake variable
    
    Signed-off-by: Jaroslav Kysela <pe...@pe...>

-----------------------------------------------------------------------

Diffstat:
 include/sound/pcm.patch |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)


Patch -------------- (max 1500 lines)
diff --git a/include/sound/pcm.patch b/include/sound/pcm.patch
index f357049..87918a7 100644
--- a/include/sound/pcm.patch
+++ b/include/sound/pcm.patch
@@ -1,6 +1,6 @@
---- ../../alsa-kernel/include/pcm.h	2010-05-21 16:36:59.381638299 +0200
-+++ pcm.h	2010-05-21 16:59:33.937768437 +0200
-@@ -273,9 +273,12 @@
+--- ../../alsa-kernel/include/pcm.h	2010-06-28 09:42:39.000000000 +0200
++++ pcm.h	2010-06-28 10:00:49.000000000 +0200
+@@ -277,9 +277,12 @@ struct snd_pcm_runtime {
  	snd_pcm_uframes_t avail_max;
  	snd_pcm_uframes_t hw_ptr_base;	/* Position at buffer restart */
  	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */
@@ -14,7 +14,7 @@
  	/* -- HW params -- */
  	snd_pcm_access_t access;	/* access mode */
  	snd_pcm_format_t format;	/* SNDRV_PCM_FORMAT_* */
-@@ -285,6 +288,9 @@
+@@ -289,6 +292,9 @@ struct snd_pcm_runtime {
  	snd_pcm_uframes_t period_size;	/* period size */
  	unsigned int periods;		/* periods */
  	snd_pcm_uframes_t buffer_size;	/* buffer size */
@@ -24,7 +24,7 @@
  	snd_pcm_uframes_t min_align;	/* Min alignment for the format */
  	size_t byte_align;
  	unsigned int frame_bits;
-@@ -296,6 +302,10 @@
+@@ -300,6 +306,10 @@ struct snd_pcm_runtime {
  	/* -- SW params -- */
  	int tstamp_mode;		/* mmap timestamp is updated */
    	unsigned int period_step;
@@ -35,29 +35,26 @@
  	snd_pcm_uframes_t start_threshold;
  	snd_pcm_uframes_t stop_threshold;
  	snd_pcm_uframes_t silence_threshold; /* Silence filling happens when
-@@ -313,11 +323,18 @@
+@@ -317,9 +327,18 @@ struct snd_pcm_runtime {
  	struct snd_pcm_mmap_control *control;
  
  	/* -- locking / scheduling -- */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
- 	unsigned int twake: 1;		/* do transfer (!poll) wakeup */
--	wait_queue_head_t sleep;	/* poll sleep */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
+ 	snd_pcm_uframes_t twake; 	/* do transfer (!poll) wakeup if non-zero */
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
++	unsigned int old_twake: 1;	/* for ABI compatibility */
 +#endif
-+  	wait_queue_head_t sleep;
+ 	wait_queue_head_t sleep;	/* poll sleep */
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
  	wait_queue_head_t tsleep;	/* transfer sleep */
--	struct fasync_struct *fasync;
--
 +#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) 
 +	struct timer_list old_tick_timer;	/* for ABI compatibility */
 +#endif
-+  	struct fasync_struct *fasync;
-+  
+ 	struct fasync_struct *fasync;
+ 
  	/* -- private section -- */
- 	void *private_data;
- 	void (*private_free)(struct snd_pcm_runtime *runtime);
-@@ -332,8 +349,9 @@
+@@ -336,8 +355,9 @@ struct snd_pcm_runtime {
  
  	/* -- timer -- */
  	unsigned int timer_resolution;	/* timer resolution */
@@ -68,7 +65,7 @@
  	/* -- DMA -- */           
  	unsigned char *dma_area;	/* DMA area */
  	dma_addr_t dma_addr;		/* physical bus address (not accessible from main CPU) */
-@@ -349,6 +367,21 @@
+@@ -353,6 +373,24 @@ struct snd_pcm_runtime {
  #ifdef CONFIG_SND_PCM_XRUN_DEBUG
  	struct snd_pcm_hwptr_log *hwptr_log;
  #endif
@@ -84,13 +81,16 @@
 +	int tstamp_type;		/* timestamp type */
 +#endif
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
-+	unsigned int twake: 1;		/* transfer (!poll) wakeup */
++	unsigned int old_twake: 1;	/* transfer (!poll) wakeup */
 +	wait_queue_head_t tsleep;	/* transfer sleep */	
 +#endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
++	snd_pcm_uframes_t twake; 	/* do transfer (!poll) wakeup if non-zero */
++#endif
  };
  
  struct snd_pcm_group {		/* keep linked substreams */
-@@ -366,7 +399,11 @@
+@@ -370,7 +408,11 @@ struct snd_pcm_substream {
  	int number;
  	char name[32];			/* substream name */
  	int stream;			/* stream (direction) */
@@ -102,7 +102,7 @@
  	size_t buffer_bytes_max;	/* limit ring buffer size */
  	struct snd_dma_buffer dma_buffer;
  	unsigned int dma_buf_id;
-@@ -378,6 +415,9 @@
+@@ -382,6 +424,9 @@ struct snd_pcm_substream {
          /* -- timer section -- */
  	struct snd_timer *timer;		/* timer */
  	unsigned timer_running: 1;	/* time is running */
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  be60557f0c5ae6c3a1a29e1e523d3803305241d4 \
  8bc805c2ea78245e975ed78a7461f41142692ad9