3 files changed, 54 insertions, 19 deletions

diff --git a/scripts/bcm5974-diagnostics b/scripts/bcm5974-diagnostics
index 0322158..acd0bf4 100755
--- a/scripts/bcm5974-diagnostics
+++ b/scripts/bcm5974-diagnostics
@@ -131,22 +131,13 @@ if [ -f $DEVPATH ]; then
         echo \* $DEVPATH: module is registered
     else
         echo \* $DEVPATH: module is NOT registered
-        echo No help on this one...
+        echo "Please double-check the quirks settings in $DRIVMOD"
         exit 1
     fi
 else
     echo \* $DEVPATH: does not exist, ignore
 fi
 
-# Was the $DRIVER properly initialized?
-WELLSPRING=`dmesg|grep $DRIVER|grep Wellspring`
-if [ "$WELLSPRING" != "" ]; then
-    echo \* $DRIVER: Wellspring was initialized
-else
-    echo \* $DRIVER: Wellspring was NOT initialized
-    exit 1
-fi
-
 # Do we have synaptics working properly?
 typeset -i SYNLINES=`synclient -l|wc -l`
 if [ $SYNLINES -gt 10 ]; then
diff --git a/scripts/bcm5974-post-install b/scripts/bcm5974-post-install
index 21e989e..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_MBB=$PAT_HEAD$PAT_MBB
+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 [ $has_mbb -gt 0 ]; 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
diff --git a/scripts/bcm5974-pre-install b/scripts/bcm5974-pre-install
new file mode 100755
index 0000000..1e2b864
--- /dev/null
+++ b/scripts/bcm5974-pre-install
@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# bcm5943-pre-install - check system before installing the bcm5974
+#
+# Copyright (C) 2008       Henrik Rydberg (rydberg@euromail.se)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+DRIVER=bcm5974
+LSUSB=/usr/sbin/lsusb
+
+PAT[0]="05ac:022"
+PAT[1]="05ac:023"
+
+if [ -x $LSUSB ]; then
+    if [ "`$LSUSB|grep ${PAT[0]}`" != "" ]; then
+        exit 0
+    elif [ "`$LSUSB|grep ${PAT[1]}`" != "" ]; then
+        exit 0
+    else
+        echo bcm5974: no suitable device found
+        exit -1
+    fi
+else
+    echo bcm5974: cannot determine device type
+    exit -1
+fi
+
+exit 0