[alsa-cvslog] alsa-driver: ALSA driver repository - compatibility code, new drivers and standalone

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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  e76f321113eb231540da54f18a5d45384699f2be (commit)
       via  873045cca46404cc007325d63069f20064ad29b6 (commit)
       via  d01a0f0b857e33e8bab112bfeb52c60caef34ee3 (commit)
       via  9aa8a8e0aeba4c176eed0cc5dd7c99a8f402b549 (commit)
       via  83486aa5221d12518be5c1c086a80a9849c4eb9c (commit)
       via  f15e038cfc81e34f582906876e60a1e32761ad99 (commit)
       via  f0cbe6926e34a43c9b3e1c79d436b4eadf729d6f (commit)
       via  5a7e353bc6c01604d2d7536d48de041de0d81a0e (commit)
      from  e0e476a1473f4f6e4ea1186b7579b383f9c22f40 (commit)

- Log -----------------------------------------------------------------
commit e76f321113eb231540da54f18a5d45384699f2be
Author:     David Henningsson <dav...@ca...>
AuthorDate: Mon Jun 11 10:45:23 2012 +0200
Commit:     Takashi Iwai <ti...@su...>
CommitDate: Mon Jun 11 12:37:13 2012 +0200

    alsa-info: Bump version to 0.4.61
    
    Signed-off-by: David Henningsson <dav...@ca...>
    Signed-off-by: Takashi Iwai <ti...@su...>

commit 873045cca46404cc007325d63069f20064ad29b6
Author:     David Henningsson <dav...@ca...>
AuthorDate: Mon Jun 11 10:45:22 2012 +0200
Commit:     Takashi Iwai <ti...@su...>
CommitDate: Mon Jun 11 12:37:13 2012 +0200

    alsa-info: Add roaraudio sound server detection
    
    Signed-off-by: David Henningsson <dav...@ca...>
    Signed-off-by: Takashi Iwai <ti...@su...>

commit d01a0f0b857e33e8bab112bfeb52c60caef34ee3
Author:     David Henningsson <dav...@ca...>
AuthorDate: Mon Jun 11 10:45:21 2012 +0200
Commit:     Takashi Iwai <ti...@su...>
CommitDate: Mon Jun 11 12:37:13 2012 +0200

    alsa-info: Cosmetic heading fixup
    
    The number of ---- should match the corresponding headers.
    
    Signed-off-by: David Henningsson <dav...@ca...>
    Signed-off-by: Takashi Iwai <ti...@su...>

commit 9aa8a8e0aeba4c176eed0cc5dd7c99a8f402b549
Author:     Chris Van Hoof <va...@ca...>
AuthorDate: Mon Jun 11 10:45:20 2012 +0200
Commit:     Takashi Iwai <ti...@su...>
CommitDate: Mon Jun 11 12:36:55 2012 +0200

    alsa-info: adding system firmware version to the defaults collected under "DMI Information"
    
    Signed-off-by: Chris Van Hoof <va...@ca...>
    Signed-off-by: David Henningsson <dav...@ca...>
    Signed-off-by: Takashi Iwai <ti...@su...>

commit 83486aa5221d12518be5c1c086a80a9849c4eb9c
Author:     Takashi Iwai <ti...@su...>
AuthorDate: Mon Jun 4 11:10:54 2012 +0200
Commit:     Takashi Iwai <ti...@su...>
CommitDate: Mon Jun 4 11:10:54 2012 +0200

    Add a workaround to build tea575-tuner.c with 3.4 kernel
    
    Signed-off-by: Takashi Iwai <ti...@su...>

commit f15e038cfc81e34f582906876e60a1e32761ad99
Author:     Takashi Iwai <ti...@su...>
AuthorDate: Fri Jun 1 08:41:52 2012 +0200
Commit:     Takashi Iwai <ti...@su...>
CommitDate: Fri Jun 1 08:41:52 2012 +0200

    Fix the leftover rcode_string() in the previous firewire/cmp.patch
    
    By some reason, the old code chunk remained in the patch process and
    resulted in an obsoleted function call...  Refreshed now.
    
    Signed-off-by: Takashi Iwai <ti...@su...>

commit f0cbe6926e34a43c9b3e1c79d436b4eadf729d6f
Author:     Takashi Iwai <ti...@su...>
AuthorDate: Fri Jun 1 08:18:38 2012 +0200
Commit:     Takashi Iwai <ti...@su...>
CommitDate: Fri Jun 1 08:18:38 2012 +0200

    Fix fw_rcode_string() in firewire/cmp.c for old kernels
    
    Signed-off-by: Takashi Iwai <ti...@su...>

commit 5a7e353bc6c01604d2d7536d48de041de0d81a0e
Author:     Takashi Iwai <ti...@su...>
AuthorDate: Fri Jun 1 07:34:55 2012 +0200
Commit:     Takashi Iwai <ti...@su...>
CommitDate: Fri Jun 1 07:34:55 2012 +0200

    Add missing fw_rcode_string() for older kernels
    
    The function was moved to firewire core in 3.5 kernel.
    
    Signed-off-by: Takashi Iwai <ti...@su...>

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

Diffstat:
 firewire/cmp.patch        |   11 +++++++----
 firewire/lib.c            |   26 ++++++++++++++++++++++++++
 i2c/other/tea575x-tuner.c |    3 +++
 utils/alsa-info.sh        |   29 ++++++++++++++++++++---------
 4 files changed, 56 insertions(+), 13 deletions(-)


Patch -------------- (max 1500 lines)

diff --git a/firewire/cmp.patch b/firewire/cmp.patch
index 4a37534..e2970dd 100644
--- a/firewire/cmp.patch
+++ b/firewire/cmp.patch
@@ -1,15 +1,18 @@
---- ../alsa-kernel/firewire/cmp.c	2011-06-02 19:52:48.422892370 +0200
-+++ cmp.c	2011-06-03 16:46:28.299118061 +0200
-@@ -1,3 +1,8 @@
+--- ../alsa-kernel/firewire/cmp.c	2012-05-31 21:22:53.000000000 +0200
++++ cmp.c	2012-06-01 08:39:42.000000000 +0200
+@@ -1,3 +1,11 @@
 +#define __NO_VERSION__
 +#include "adriver.h"
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0)
++const char *fw_rcode_string(int rcode);
++#endif
 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)
 +#include "iso-resources-old.h"
 +#endif
  /*
   * Connection Management Procedures (IEC 61883-1) helper functions
   *
-@@ -51,7 +56,12 @@
+@@ -51,7 +59,12 @@
  	struct fw_device *device = fw_parent_device(c->resources.unit);
  	int generation = c->resources.generation;
  	int rcode, errors = 0;
diff --git a/firewire/lib.c b/firewire/lib.c
index f490651..e337fea 100644
--- a/firewire/lib.c
+++ b/firewire/lib.c
@@ -1,2 +1,28 @@
 #include "adriver.h"
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0)
+const char *fw_rcode_string(int rcode);
+#endif
 #include "../alsa-kernel/firewire/lib.c"
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0)
+const char *fw_rcode_string(int rcode)
+{
+	static const char *const names[] = {
+		[RCODE_COMPLETE]       = "no error",
+		[RCODE_CONFLICT_ERROR] = "conflict error",
+		[RCODE_DATA_ERROR]     = "data error",
+		[RCODE_TYPE_ERROR]     = "type error",
+		[RCODE_ADDRESS_ERROR]  = "address error",
+		[RCODE_SEND_ERROR]     = "send error",
+		[RCODE_CANCELLED]      = "timeout",
+		[RCODE_BUSY]           = "busy",
+		[RCODE_GENERATION]     = "bus reset",
+		[RCODE_NO_ACK]         = "no ack",
+	};
+
+	if ((unsigned int)rcode < ARRAY_SIZE(names) && names[rcode])
+		return names[rcode];
+	else
+		return "unknown";
+}
+#endif /* < 3.5.0 */
diff --git a/i2c/other/tea575x-tuner.c b/i2c/other/tea575x-tuner.c
index 7c41f90..5a4e533 100644
--- a/i2c/other/tea575x-tuner.c
+++ b/i2c/other/tea575x-tuner.c
@@ -3,5 +3,8 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
 #include "tea575x-tuner-3.3.c"
 #else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0)
+#define v4l2_disable_ioctl(x, y) /* NOP */
+#endif
 #include "../../alsa-kernel/i2c/other/tea575x-tuner.c"
 #endif
diff --git a/utils/alsa-info.sh b/utils/alsa-info.sh
index fd7df96..721ab41 100755
--- a/utils/alsa-info.sh
+++ b/utils/alsa-info.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION=0.4.60
+SCRIPT_VERSION=0.4.61
 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
 
 #################################################################################
@@ -111,7 +111,7 @@ cleanup() {
 
 withaplay() {
         echo "!!Aplay/Arecord output" >> $FILE
-        echo "!!------------" >> $FILE
+        echo "!!--------------------" >> $FILE
         echo "" >> $FILE
        	echo "APLAY" >> $FILE
 	echo "" >> $FILE 
@@ -149,7 +149,7 @@ withamixer() {
 
 withalsactl() {
 	echo "!!Alsactl output" >> $FILE
-        echo "!!-------------" >> $FILE
+        echo "!!--------------" >> $FILE
         echo "" >> $FILE
         exe=""
         if [ -x /usr/sbin/alsactl ]; then
@@ -244,7 +244,7 @@ withsysfs() {
 
 withdmesg() {
 	echo "!!ALSA/HDA dmesg" >> $FILE
-	echo "!!------------------" >> $FILE
+	echo "!!--------------" >> $FILE
 	echo "" >> $FILE
 	dmesg | grep -C1 -E 'ALSA|HDA|HDMI|sound|hda.codec|hda.intel' >> $FILE
 	echo "" >> $FILE
@@ -416,6 +416,7 @@ ESDINST=$(which esd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
 PAINST=$(which pulseaudio 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
 ARTSINST=$(which artsd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
 JACKINST=$(which jackd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
+ROARINST=$(which roard 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
 DMIDECODE=$(which dmidecode 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
 
 #Check for DMI data
@@ -424,10 +425,12 @@ if [ -d /sys/class/dmi/id ]; then
     DMI_SYSTEM_MANUFACTURER=$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)
     DMI_SYSTEM_PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null)
     DMI_SYSTEM_PRODUCT_VERSION=$(cat /sys/class/dmi/id/product_version 2>/dev/null)
+    DMI_SYSTEM_FIRMWARE_VERSION=$(cat /sys/class/dmi/id/bios_version 2>/dev/null)
 elif [ -x $DMIDECODE ]; then
     DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null)
     DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null)
     DMI_SYSTEM_PRODUCT_VERSION=$($DMIDECODE -s system-version 2>/dev/null)
+    DMI_SYSTEM_FIRMWARE_VERSION=$($DMIDECODE -s bios-version 2>/dev/null)
 fi
 
 cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp
@@ -469,6 +472,7 @@ echo "" >> $FILE
 echo "Manufacturer:      $DMI_SYSTEM_MANUFACTURER" >> $FILE
 echo "Product Name:      $DMI_SYSTEM_PRODUCT_NAME" >> $FILE
 echo "Product Version:   $DMI_SYSTEM_PRODUCT_VERSION" >> $FILE
+echo "Firmware Version:  $DMI_SYSTEM_FIRMWARE_VERSION" >> $FILE
 echo "" >> $FILE
 echo "" >> $FILE
 echo "!!Kernel Information" >> $FILE
@@ -526,7 +530,14 @@ echo "      Installed - Yes ($JACKINST)" >> $FILE
 echo "      Running - $JACKRUNNING" >> $FILE
 echo "" >> $FILE
 fi
-if [[ -z "$PAINST" && -z "$ESDINST" && -z "$ARTSINST" && -z "$JACKINST" ]];then
+if [[ -n $ROARINST ]];then
+[[ `pgrep '^(.*/)?roard$'` ]] && ROARRUNNING="Yes" || ROARRUNNING="No"
+echo "RoarAudio:" >> $FILE
+echo "      Installed - Yes ($ROARINST)" >> $FILE
+echo "      Running - $ROARRUNNING" >> $FILE
+echo "" >> $FILE
+fi
+if [[ -z "$PAINST" && -z "$ESDINST" && -z "$ARTSINST" && -z "$JACKINST" && -z "$ROARINST" ]];then
 echo "No sound servers found." >> $FILE
 echo "" >> $FILE
 fi
@@ -544,7 +555,7 @@ cat $TEMPDIR/lspci.tmp >> $FILE
 echo "" >> $FILE
 echo "" >> $FILE
 echo "!!Advanced information - PCI Vendor/Device/Subsystem ID's" >> $FILE
-echo "!!--------------------------------------------------------" >> $FILE
+echo "!!-------------------------------------------------------" >> $FILE
 echo "" >> $FILE
 lspci -vvn |grep -A1 040[1-3] >> $FILE
 echo "" >> $FILE
@@ -563,7 +574,7 @@ fi
 if [ -d "$SYSFS" ]
 then
 echo "!!Loaded sound module options" >> $FILE
-echo "!!--------------------------" >> $FILE
+echo "!!---------------------------" >> $FILE
 echo "" >> $FILE
 for mod in `cat /proc/asound/modules|awk {'print $2'}`;do
 echo "!!Module: $mod" >> $FILE
@@ -591,7 +602,7 @@ fi
 if [ -s "$TEMPDIR/alsa-ac97.tmp" ]
 then
         echo "!!AC97 Codec information" >> $FILE
-        echo "!!---------------------------" >> $FILE
+        echo "!!----------------------" >> $FILE
         echo "--startcollapse--" >> $FILE
         echo "" >> $FILE
         cat $TEMPDIR/alsa-ac97.tmp >> $FILE
@@ -605,7 +616,7 @@ fi
 if [ -s "$TEMPDIR/alsa-usbmixer.tmp" ]
 then
         echo "!!USB Mixer information" >> $FILE
-        echo "!!---------------------------" >> $FILE
+        echo "!!---------------------" >> $FILE
         echo "--startcollapse--" >> $FILE
         echo "" >> $FILE
         cat $TEMPDIR/alsa-usbmixer.tmp >> $FILE
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  e0e476a1473f4f6e4ea1186b7579b383f9c22f40 \
  e76f321113eb231540da54f18a5d45384699f2be




[alsa-cvslog] alsa-driver: ALSA driver repository - compatibility code, new drivers and standalone

[alsa-cvslog] alsa-driver: ALSA driver repository - compatibility code, new drivers and standalone building branch, master now at v1.0.25-34-ge76f321