--- /local/scratch/osc22/dwl/linux-gpib-3.2.16/usb/ni_usb_gpib/ni_usb_gpib	2006-12-21 20:42:15.000000000 +0000
+++ ni_usb_gpib	2011-12-22 18:36:30.395789251 +0000
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 GPIB_CONFIG_OPTIONS="--minor 0"
-DATADIR=/usr/share
+DATADIR=/lib/firmware
 FXLOAD=fxload
-FXLOAD_OPTIONS="-t fx"
 
 PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin
 FIRMWARE=
@@ -11,19 +10,25 @@
 
 # pre-renumeration device IDs
 case $PRODUCT in
-# ni-usb-b with firmware already loaded
+# ni-usb-a with firmware already loaded
 3923/702a/*)
+    if [ -x /usr/bin/logger ]; then
+        /usr/bin/logger -t $0 "Running gpib_config for $PRODUCT"
+    fi
 	gpib_config $GPIB_CONFIG_OPTIONS
 	;;
 
 # ni-usb-b without firmware
 3923/702b/*)
-	FIRMWARE=$DATADIR/usb/ni_usb_gpib/niusbb_firmware.hex
-	SS_LOADER=$DATADIR/usb/ni_usb_gpib/niusbb_loader.hex
+	FIRMWARE=$DATADIR/ni_usb_gpib/niusbb_firmware.hex
+	SS_LOADER=$DATADIR/ni_usb_gpib/niusbb_loader.hex
 	;;
 
 # ni-usb-hs
 3923/709b/*)
+    if [ -x /usr/bin/logger ]; then
+        /usr/bin/logger -t $0 "Running gpib_config for $PRODUCT"
+    fi
 	gpib_config $GPIB_CONFIG_OPTIONS
 	;;
 
@@ -40,7 +45,7 @@
 # missing firmware?
 if [ ! -r $FIRMWARE ]; then
     if [ -x /usr/bin/logger ]; then
-	/usr/bin/logger -t $0 "missing $FIRMWARE for $PRODUCT ??"
+        /usr/bin/logger -t $0 "missing $FIRMWARE for $PRODUCT ??"
     fi
     exit 1
 fi
@@ -48,7 +53,7 @@
 # missing second stage loader?
 if [ ! -r $SS_LOADER ]; then
     if [ -x /usr/bin/logger ]; then
-	/usr/bin/logger -t $0 "missing $SS_LOADER for $PRODUCT ??"
+        /usr/bin/logger -t $0 "missing $SS_LOADER for $PRODUCT ??"
     fi
     exit 1
 fi
@@ -56,7 +61,7 @@
 # missing fxload?
 if ! which $FXLOAD; then
     if [ -x /usr/bin/logger ]; then
-	/usr/bin/logger -t $0 "missing $FXLOAD ??"
+        /usr/bin/logger -t $0 "missing $FXLOAD ??"
     fi
     exit 1
 fi
@@ -65,5 +70,5 @@
     /usr/bin/logger -t $0 "load $FIRMWARE for $PRODUCT to $DEVICE"
 fi
 
-$FXLOAD $FXLOAD_OPTIONS -I $FIRMWARE -s $SS_LOADER
+$FXLOAD -D ${DEVNAME} -I $FIRMWARE -s $SS_LOADER