rpms/bluez-utils/devel bluez-utils-3.7-pcmcia.patch, NONE, 1.1 bluez-utils.spec, 1.51, 1.52

Sat Sep 30 22:55:46 UTC 2006

Author: dwmw2

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15476

Modified Files:
	bluez-utils.spec 
Added Files:
	bluez-utils-3.7-pcmcia.patch 
Log Message:
fix udev + pcmcia handling

bluez-utils-3.7-pcmcia.patch:
 bluetooth.rules  |   27 +++++++++++++++------------
 bluetooth_serial |   12 +++---------
 2 files changed, 18 insertions(+), 21 deletions(-)

--- NEW FILE bluez-utils-3.7-pcmcia.patch ---
--- bluez-utils-3.7/scripts/bluetooth.rules~	2006-08-10 11:09:05.000000000 +0100
+++ bluez-utils-3.7/scripts/bluetooth.rules	2006-09-30 23:35:08.000000000 +0100
@@ -3,34 +3,37 @@ SUBSYSTEM=="tty", BUS=="pcmcia", ENV{MAN
 
 
 # Brain Boxes BL-620 Bluetooth Adapter
-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Brain Boxes", SYSFS{prod_id2}=="Bluetooth PC Card", RUN+="bluetooth_serial"
+SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Brain Boxes", SYSFS{prod_id2}=="Bluetooth PC Card", ENV{HCIOPTS}="bboxes", RUN+="bluetooth_serial"
 
 # Xircom CreditCard Bluetooth Adapter
-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Xircom", SYSFS{prod_id3}=="CBT", RUN+="bluetooth_serial"
+SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Xircom", SYSFS{prod_id3}=="CBT", ENV{HCIOPTS}="xircom", RUN+="bluetooth_serial"
 
 # Xircom RealPort2 Bluetooth Adapter
-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Xircom", SYSFS{prod_id3}=="CBT", RUN+="bluetooth_serial"
+SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Xircom", SYSFS{prod_id3}=="CBT", ENV{HCIOPTS}="xircom", RUN+="bluetooth_serial"
 
 # IBM Bluetooth PC Card II
-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="IBM", SYSFS{prod_id2}=="Bluetooth PC Card II", RUN+="bluetooth_serial"
+SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="IBM", SYSFS{prod_id2}=="Bluetooth PC Card II", ENV{HCIOPTS}="tdk", RUN+="bluetooth_serial"
 
 # TDK Bluetooth PC Card
-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="TDK", SYSFS{prod_id2}=="Bluetooth PC Card II", RUN+="bluetooth_serial"
+SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="TDK", SYSFS{prod_id2}=="Bluetooth PC Card II", ENV{HCIOPTS}="tdk", RUN+="bluetooth_serial"
 
 # AmbiCom BT2000C Bluetooth PC/CF Card
-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="AmbiCom BT2000C", SYSFS{prod_id2}=="Bluetooth PC/CF Card", RUN+="bluetooth_serial"
+SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="AmbiCom BT2000C", SYSFS{prod_id2}=="Bluetooth PC/CF Card", ENV{HCIOPTS}="bt2000c", RUN+="bluetooth_serial"
 
 # COM One Platinium Bluetooth PC Card
-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="COM1 SA", SYSFS{prod_id2}=="MC310 CARD", RUN+="bluetooth_serial"
+SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="COM1 SA", SYSFS{prod_id2}=="MC310 CARD", ENV{HCIOPTS}="comone", RUN+="bluetooth_serial"
 
 # Sphinx PICO Card
-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="SPHINX", SYSFS{prod_id2}=="BT-CARD", RUN+="bluetooth_serial"
+SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="SPHINX", SYSFS{prod_id2}=="BT-CARD", ENV{HCIOPTS}="picocard", RUN+="bluetooth_serial"
 
 # H-Soft blue+Card
-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="H-Soft", SYSFS{prod_id2}=="Blue+CARD", RUN+="bluetooth_serial"
+SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="H-Soft", SYSFS{prod_id2}=="Blue+CARD", ENV{HCIOPTS}="$sysfs{manf_id},$sysfs{card_id}", RUN+="bluetooth_serial"
 
-# Compaq iPAQ Bluetooth Sleeve
-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="CF CARD", SYSFS{prod_id2}=="GENERIC", RUN+="bluetooth_serial"
+# Compaq iPAQ Bluetooth Sleeve, Belkin F8T020, any other muppet who used an OXCF950 and didn't bother to program it appropriately.
+SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="CF CARD", SYSFS{prod_id2}=="GENERIC", ENV{HCIOPTS}="$sysfs{manf_id},$sysfs{card_id}", RUN+="bluetooth_serial"
 
 # Zoom Bluetooth Card and Sitecom CN-504 Card
-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="PCMCIA", SYSFS{prod_id2}=="Bluetooth Card", RUN+="bluetooth_serial"
+SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="PCMCIA", SYSFS{prod_id2}=="Bluetooth Card", ENV{HCIOPTS}="zoom", RUN+="bluetooth_serial"
+
+# CC&C BT0100M
+SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Bluetooth BT0100M", ENV{HCIOPTS}="bcsp 115200", RUN+="bluetooth_serial"
--- bluez-utils-3.7/scripts/bluetooth_serial~	2006-08-10 11:30:06.000000000 +0100
+++ bluez-utils-3.7/scripts/bluetooth_serial	2006-09-30 23:15:36.000000000 +0100
@@ -12,16 +12,10 @@ start_serial()
 		return 1
 	fi
 
-	IRQ=`/bin/setserial $DEVNAME | sed -e 's/.*IRQ: //'`
-	/bin/setserial $DEVNAME irq 0 ; /bin/setserial $DEVNAME irq $IRQ
-
-	MANF_CARD_ID="${MANF_ID},${CARD_ID}"
-	# I don't have a generic solution, sorry
-	if [ $MANF_CARD_ID = "0x0160,0x0002" ]; then
-		/usr/sbin/hciattach $DEVNAME $MANF_CARD_ID 115200
-	else
-		/usr/sbin/hciattach $DEVNAME $MANF_CARD_ID
+	if [ "$BAUDBASE" != "" ]; then
+	    /bin/setserial $DEVNAME baud_base $BAUDBASE
 	fi
+	/usr/sbin/hciattach $DEVNAME $HCIOPTS 2>&1 | logger -t hciattach
 }
 
 stop_serial()


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- bluez-utils.spec	30 Sep 2006 14:45:08 -0000	1.51
+++ bluez-utils.spec	30 Sep 2006 22:55:44 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 3.7
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@
 Source9: bluetooth.conf
 Patch0: bluez-utils-2.3-conf.patch
 Patch1: bluez-utils-3.7-newconn-name.patch
+Patch2: bluez-utils-3.7-serial.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -56,6 +57,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \
@@ -65,7 +67,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT rulesdir=%{_sysconfdir}/udev/rules.d
+make install DESTDIR=$RPM_BUILD_ROOT rulesdir=%{_sysconfdir}/udev/rules.d udevdir=/lib/udev
 rm -f $RPM_BUILD_ROOT/etc/default/bluetooth $RPM_BUILD_ROOT/etc/init.d/bluetooth
 for a in bluetooth dund hidd pand ; do 
 	install -D -m0755 $RPM_SOURCE_DIR/$a.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/$a
@@ -113,7 +115,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/*
 %config %{_sysconfdir}/dbus-1/system.d/*
 %config %{_sysconfdir}/udev/rules.d/bluetooth.rules
-%{_libexecdir}/udev/bluetooth_serial
+/lib/udev/bluetooth_serial
 %dir /var/lib/bluetooth
 
 %files cups
@@ -121,6 +123,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Sat Sep 30 2006 David Woodhouse <dwmw2 at infradead.org> 3.7-2
+- Fix udev handling of PCMCIA serial+bluetooth devices
+
 * Sat Sep 30 2006 David Woodhouse <dwmw2 at infradead.org> 3.7-1
 - Update to bluez-utils 3.7
 


