From 331ea4b4af4b8e147aacdd6c8fcf7352198f2151 Mon Sep 17 00:00:00 2001
From: Max Krasnyansky <maxk@qualcomm.com>
Date: Fri, 23 Aug 2002 20:22:54 +0000
Subject: Improved PCMCIA support.

---
 pcmcia/bluetooth      | 14 ++++++--------
 pcmcia/bluetooth.conf | 17 ++++++++---------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/pcmcia/bluetooth b/pcmcia/bluetooth
index b21ff04d..220adc72 100755
--- a/pcmcia/bluetooth
+++ b/pcmcia/bluetooth
@@ -5,8 +5,7 @@
 # PCMCIA Bluetooth device initialization
 # Written by Maxim Krasnyanskiy <maxk@qualcomm.com>
 #
-# This script requires new cardmgr and expects following
-# environment variables FUNCTION, VENDORID, CARDNAME
+# This script requires cardmgr 3.2.1 or later
 #
 
 #
@@ -22,7 +21,10 @@ get_info $DEVICE
 # Serial devices
 #
 start_serial() {
-    /sbin/hciattach $DEVICE $VENDORID
+    IRQ=`setserial /dev/$DEVICE | sed -e 's/.*IRQ: //'`
+    setserial /dev/$DEVICE irq 0 ; setserial /dev/$DEVICE irq $IRQ
+ 
+    /sbin/hciattach $DEVICE $MANFID
 }
 stop_serial() {
     return
@@ -41,12 +43,8 @@ resume=
 check=
 cksum=
 
-case "$FUNCTION" in
+case "$FUNCID" in
 2)  # Serial
-    if ! echo $CARDNAME | grep -i 'bluetooth' > /dev/null 2>&1; then
-       exit
-    fi
-
     start=start_serial
     stop=stop_serial
     suspend=suspend_serial
diff --git a/pcmcia/bluetooth.conf b/pcmcia/bluetooth.conf
index 29414bfa..e451a6a2 100644
--- a/pcmcia/bluetooth.conf
+++ b/pcmcia/bluetooth.conf
@@ -7,38 +7,37 @@ device "bluecard_cs"
 device "bt3c_cs"
   module "bt3c_cs"
 
-
 card "Xircom CreditCard Bluetooth Adapter"
   version "Xircom", "*", "CBT"
-  bind "serial_cs"
+  bind "serial_cs" class "bluetooth"
 
 card "Xircom RealPort2 Bluetooth Adapter"
   version "Xircom", "*", "R2BT"
-  bind "serial_cs"
+  bind "serial_cs" class "bluetooth"
 
 card "Brain Boxes BL-620 Bluetooth Adapter"
   version "Brain Boxes", "Bluetooth PC Card"
-  bind "serial_cs"
+  bind "serial_cs" class "bluetooth"
 
 card "COM One Platinium Bluetooth PC Card"
   version "COM1 SA", "MC310 CARD"
-  bind "serial_cs"
+  bind "serial_cs" class "bluetooth"
 
 card "AmbiCom BT2000E Bluetooth PC/CF Card"
   version "AmbiCom,Inc", "BT2000E"
-  bind "serial_cs"
+  bind "serial_cs" class "bluetooth"
 
 card "Sphinx PICO Card"
   version "SPHINX", "BT-CARD"
-  bind "serial_cs"
+  bind "serial_cs" class "bluetooth"
 
 card "H-Soft blue+Card"
   version "H-Soft", "Blue+CARD"
-  bind "serial_cs"
+  bind "serial_cs" class "bluetooth"
 
 card "Compaq iPAQ Bluetooth Sleeve"
   version "CF CARD", "GENERIC"
-  bind "serial_cs"
+  bind "serial_cs" class "bluetooth"
 
 
 card "Nokia Bluetooth Card"
-- 
cgit