bcm5974 (0.54) unstable; urgency=low

  * And another one... finally got the bright idea to test it by
    emulating the different product ids.

 -- Henrik Rydberg <rydberg@euromail.se>  Tue, 08 Jul 2008 20:59:39 +0200

4 files changed, 20 insertions, 12 deletions

diff --git a/CHANGES b/CHANGES
index bcb0867..8512d87 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+08JUL2008 version 0.54
+----------------------
+
+And another one... finally got the bright idea to test it by emulating
+the different product ids.
+
 07JUL2008 version 0.53
 ----------------------
 
diff --git a/bcm5974.c b/bcm5974.c
index e1876c6..4d9dd45 100644
--- a/bcm5974.c
+++ b/bcm5974.c
@@ -192,8 +192,8 @@ static const struct atp_config atp_config_table[] = {
                 0x81, sizeof(struct tp_data),
                 { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 },
                 { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
-                { DIM_X, DIM_X / SN_COORD, -4824, 5342 },
-                { DIM_Y, DIM_Y / SN_COORD, -172, 5820 }
+                { DIM_X, DIM_X / SN_COORD, -4824, 4824 },
+                { DIM_Y, DIM_Y / SN_COORD, -172, 4290 }
         },
         {}
 };
diff --git a/dkms.conf b/dkms.conf
index 35e8af8..cb169d6 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="bcm5974"
-PACKAGE_VERSION="0.53"
+PACKAGE_VERSION="0.54"
 MAKE[0]="make -C ${kernel_source_dir}
   SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules"
 BUILT_MODULE_NAME[0]="bcm5974"
diff --git a/scripts/bcm5974-post-install b/scripts/bcm5974-post-install
index 8c71be0..5674d40 100755
--- a/scripts/bcm5974-post-install
+++ b/scripts/bcm5974-post-install
@@ -25,17 +25,19 @@ ETCPATH=/etc/modprobe.d/$DRIVER
 echo -----------------------------------------------------------------------
 
 DIR=`dirname $0`
+LSUSB=/usr/sbin/lsusb
+
 PAT_HEAD="options usbhid quirks="
-PAT_MBA="0x05ac:0x022"
-PAT_MBP="0x05ac:0x023"
-MATCH_MBA=$PAT_HEAD$PAT_MBA
-MATCH_MBP=$PAT_HEAD$PAT_MBP
+PAT[0]="05ac:022"
+PAT[1]="05ac:023"
+MATCH[0]=${PAT_HEAD}0x05ac:0x022
+MATCH[1]=${PAT_HEAD}0x05ac:0x023
 
-if [ -x /usr/sbin/lsusb ]; then
-    if [ "lsusb|grep $PAT_MBA" != "" ]; then
-        SED="s/#$MATCH_MBA/$MATCH_MBA/"
-    elif [ "lsusb|grep $PAT_MBP" != "" ]; then
-        SED="s/#$MATCH_MBP/$MATCH_MBP/"
+if [ -x $LSUSB ]; then
+    if [ "`$LSUSB|grep ${PAT[0]}`" != "" ]; then
+        SED="s/#${MATCH[0]}/${MATCH[0]}/"
+    elif [ "`$LSUSB|grep ${PAT[1]}`" != "" ]; then
+        SED="s/#${MATCH[1]}/${MATCH[1]}/"
     else
         echo No suitable device found
         exit 1