Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/30 14:00:48+02:00 mn-solutions.de!schurig
MNCI "Ramses": newest bluez for the kernel

2005/03/30 13:59:44+02:00 mn-solutions.de!schurig
bluez-utils install the binaries into /{s}bin, not /usr/{s}bin, this patch fixes the scripts


2005/03/30 13:54:17+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/30 13:53:47+02:00 utwente.nl!koen
preferred-gpe-versions.inc:
  add working minimo CVSDATE

BKrev: 424aa748Ew_6rzmEpNqOmQsr4KaxYw

9 files changed, 8112 insertions, 99 deletions

diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index afd60d07a0..337a0a2560 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -4,6 +4,7 @@
 
 #work around some breakages
 CVSDATE_xserver-kdrive=20050207
+CVSDATE_minimo=20050316
 
 #specify versions, as the header says :)
 PREFERRED_VERSION_libmatchbox ?= "1.6"
diff --git a/packages/bluez-utils/bluez-utils-common_2.14.inc b/packages/bluez-utils/bluez-utils-common_2.14.inc
index bc92e28755..08489c7427 100644
--- a/packages/bluez-utils/bluez-utils-common_2.14.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.14.inc
@@ -11,6 +11,7 @@ FILES_${PN}-ciptool = "/bin/ciptool"
 FILES_${PN}-bluepin = "/bin/bluepin"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+	file://base.patch;patch=1 \
 	file://hcid.conf \
 	file://bluetooth.default"
 
diff --git a/packages/bluez-utils/files/base.patch b/packages/bluez-utils/files/base.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bluez-utils/files/base.patch
diff --git a/packages/bluez-utils/files/hcid.conf b/packages/bluez-utils/files/hcid.conf
index 6a1e06f131..547602d4a9 100644
--- a/packages/bluez-utils/files/hcid.conf
+++ b/packages/bluez-utils/files/hcid.conf
@@ -23,7 +23,7 @@ options {
 	pairing multi;
 
 	# PIN helper
-	pin_helper /usr/bin/bluepin;
+	pin_helper /bin/bluepin;
 
 	# D-Bus PIN helper
 	# dbus_pin_helper;
diff --git a/packages/bluez-utils/files/openslug/hcid.conf b/packages/bluez-utils/files/openslug/hcid.conf
index e69de29bb2..21cf44a699 100644
--- a/packages/bluez-utils/files/openslug/hcid.conf
+++ b/packages/bluez-utils/files/openslug/hcid.conf
@@ -0,0 +1,70 @@
+#
+# HCI daemon configuration file.
+#
+# $Id$
+#
+
+# HCId options
+options {
+	# Automatically initialize new devices
+	autoinit yes;
+
+	# Security Manager mode
+	#   none - Security manager disabled
+	#   auto - Use local PIN for incoming connections
+	#   user - Always ask user for a PIN
+	#
+	security auto;
+
+	# Pairing mode
+	#   none  - Pairing disabled
+	#   multi - Allow pairing with already paired devices
+	#   once  - Pair once and deny successive attempts
+	pairing multi;
+
+	# PIN helper
+	# pin_helper /bin/bluepin;
+
+	# D-Bus PIN helper
+	# dbus_pin_helper;
+}
+
+# Default settings for HCI devices
+device {
+	# Local device name
+	#   %d - device id
+	#   %h - host name
+	name "%h";
+
+	# Local device class
+	class 0x820100;
+
+	# Default packet type
+	#pkt_type DH1,DM1,HV1;
+
+	# Inquiry and Page scan
+	iscan enable; pscan enable;
+
+	# Default link mode
+	#   none   - no specific policy 
+	#   accept - always accept incoming connections
+	#   master - become master on incoming connections,
+	#            deny role switch on outgoing connections
+	#
+	lm accept,master;
+
+	# Default link policy
+	#   none    - no specific policy
+	#   rswitch - allow role switch
+	#   hold    - allow hold mode
+	#   sniff   - allow sniff mode
+	#   park    - allow park mode
+	#
+	#lp hold,sniff;
+	#
+	lp rswitch,hold,sniff,park;
+
+	# Authentication and Encryption
+	auth enable;
+	encrypt enable;
+}
diff --git a/packages/bluez-utils/files/ramses/bluetooth.default b/packages/bluez-utils/files/ramses/bluetooth.default
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bluez-utils/files/ramses/bluetooth.default
diff --git a/packages/bluez-utils/files/ramses/hcid.conf b/packages/bluez-utils/files/ramses/hcid.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bluez-utils/files/ramses/hcid.conf
diff --git a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch b/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch
index 2f80d090a2..d617ac80ce 100644
--- a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch
+++ b/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch
@@ -28,6 +28,7 @@
 #   vmalloc.patch
 #   usb-sl811.patch
 #   orinoco013e.patch
+#   bluetooth.patch
 #   ramses.patch
 #   ramses-ac97.patch
 #   ramses-keyb.patch
@@ -49,6 +50,201 @@
 # Patch managed by http://www.holgerschurig.de/patcher.html
 #
 
+--- linux-2.4.21/CREDITS~bluetooth
++++ linux-2.4.21/CREDITS
+@@ -1348,7 +1348,11 @@
+ N: Marcel Holtmann
+ E: marcel@holtmann.org
+ W: http://www.holtmann.org
+-D: Author of the Linux Bluetooth Subsystem PC Card drivers
++D: Maintainer of the Linux Bluetooth Subsystem
++D: Author and maintainer of the various Bluetooth HCI drivers
++D: Author and maintainer of the CAPI message transport protocol driver
++D: Author and maintainer of the Bluetooth HID protocol driver
++D: Various other Bluetooth related patches, cleanups and fixes
+ S: Germany
+ 
+ N: Rob W. W. Hooft
+@@ -2624,6 +2628,7 @@
+ N: Aristeu Sergio Rozanski Filho
+ E: aris@conectiva.com.br
+ D: Support for EtherExpress 10 ISA (i82595) in eepro driver
++D: User level driver support for input
+ S: Conectiva S.A.
+ S: R. Tocantins, 89 - Cristo Rei
+ S: 80050-430 - Curitiba - Paraná
+--- linux-2.4.21/Documentation/Configure.help~bluetooth
++++ linux-2.4.21/Documentation/Configure.help
+@@ -14071,6 +14071,15 @@
+   accessible under char device 13:64+ - /dev/input/eventX in a generic
+   way.  This is the future ...
+ 
++CONFIG_INPUT_UINPUT
++  Say Y here if you want to support user level drivers for input
++  subsystem accessible under char device 10:223 - /dev/input/uinput.
++
++  This driver is also available as a module ( = code which can be
++  inserted in and removed from the running kernel whenever you want).
++  The module will be called uinput.o.  If you want to compile it as a
++  module, say M here and read <file:Documentation/modules.txt>.	    
++
+ USB Scanner support
+ CONFIG_USB_SCANNER
+   Say Y here if you want to connect a USB scanner to your computer's
+@@ -21670,21 +21679,21 @@
+ 
+   Linux Bluetooth subsystem consist of several layers:
+                BlueZ Core (HCI device and connection manager, scheduler)
+-               HCI Device drivers (interface to the hardware)
+-               L2CAP Module (L2CAP protocol)
+-               SCO Module (SCO links)
+-               RFCOMM Module (RFCOMM protocol)
+-               BNEP Module (BNEP protocol)
++               HCI Device drivers (Interface to the hardware)
++               SCO Module (SCO audio links)
++               L2CAP Module (Logical Link Control and Adaptation Protocol)
++               RFCOMM Module (RFCOMM Protocol)
++               BNEP Module (Bluetooth Network Encapsulation Protocol)
++               CMTP Module (CAPI Message Transport Protocol)
++               HIDP Module (Human Interface Device Protocol)
+ 
+-  Say Y here to enable Linux Bluetooth support and to build BlueZ Core
+-  layer.
++  Say Y here to compile Bluetooth support into the kernel or say M to
++  compile it as module (bluez.o).
+ 
+   To use Linux Bluetooth subsystem, you will need several user-space
+   utilities like hciconfig and hcid.  These utilities and updates to
+   Bluetooth kernel modules are provided in the BlueZ package.
+-  For more information, see <http://bluez.sourceforge.net/>.
+-
+-  If you want to compile BlueZ Core as module (bluez.o) say M here.
++  For more information, see <http://www.bluez.org/>.
+ 
+ L2CAP protocol support
+ CONFIG_BLUEZ_L2CAP
+@@ -21697,7 +21706,7 @@
+ 
+ SCO links support
+ CONFIG_BLUEZ_SCO
+-  SCO link provides voice transport over Bluetooth. SCO support is
++  SCO link provides voice transport over Bluetooth.  SCO support is
+   required for voice applications like Headset and Audio.
+ 
+   Say Y here to compile SCO support into the kernel or say M to
+@@ -21705,7 +21714,7 @@
+ 
+ RFCOMM protocol support
+ CONFIG_BLUEZ_RFCOMM
+-  RFCOMM provides connection oriented stream transport. RFCOMM
++  RFCOMM provides connection oriented stream transport.  RFCOMM
+   support is required for Dialup Networking, OBEX and other Bluetooth
+   applications.
+ 
+@@ -21719,12 +21728,8 @@
+ BNEP protocol support
+ CONFIG_BLUEZ_BNEP
+   BNEP (Bluetooth Network Encapsulation Protocol) is Ethernet
+-  emulation layer on top of Bluetooth. BNEP is required for Bluetooth
+-  PAN (Personal Area Network).
+-
+-  To use BNEP, you will need user-space utilities provided in the 
+-  BlueZ-PAN package.
+-  For more information, see <http://bluez.sourceforge.net>.
++  emulation layer on top of Bluetooth.  BNEP is required for
++  Bluetooth PAN (Personal Area Network).
+ 
+   Say Y here to compile BNEP support into the kernel or say M to
+   compile it as module (bnep.o).
+@@ -21737,6 +21742,24 @@
+ CONFIG_BLUEZ_BNEP_PROTO_FILTER
+   This option enables the protocol filter support for BNEP.
+ 
++CMTP protocol support
++CONFIG_BLUEZ_CMTP
++  CMTP (CAPI Message Transport Protocol) is a transport layer
++  for CAPI messages.  CMTP is required for the Bluetooth Common
++  ISDN Access Profile.
++
++  Say Y here to compile CMTP support into the kernel or say M to
++  compile it as module (cmtp.o).
++
++HIDP protocol support
++CONFIG_BLUEZ_HIDP
++  HIDP (Human Interface Device Protocol) is a transport layer
++  for HID reports.  HIDP is required for the Bluetooth Human
++  Interface Device Profile.
++
++  Say Y here to compile HIDP support into the kernel or say M to
++  compile it as module (hidp.o).
++
+ HCI UART driver
+ CONFIG_BLUEZ_HCIUART
+   Bluetooth HCI UART driver.
+@@ -21781,7 +21804,7 @@
+   kernel or say M to compile it as module (hci_usb.o).
+ 
+ HCI USB SCO (voice) support
+-CONFIG_BLUEZ_USB_SCO
++CONFIG_BLUEZ_HCIUSB_SCO
+   This option enables the SCO support in the HCI USB driver. You need this
+   to transmit voice data with your Bluetooth USB device. And your device
+   must also support sending SCO data over the HCI layer, because some of
+@@ -21789,14 +21812,6 @@
+  
+   Say Y here to compile support for HCI SCO data.
+  
+-HCI USB zero packet support
+-CONFIG_BLUEZ_USB_ZERO_PACKET
+-  This option is provided only as a work around for buggy Bluetooth USB 
+-  devices. Do NOT enable it unless you know for sure that your device 
+-  requires zero packets.
+- 
+-  Most people should say N here.
+-
+ HCI VHCI Virtual HCI device driver
+ CONFIG_BLUEZ_HCIVHCI
+   Bluetooth Virtual HCI device driver.
+@@ -21805,6 +21820,16 @@
+   Say Y here to compile support for virtual HCI devices into the
+   kernel or say M to compile it as module (hci_vhci.o).
+ 
++HCI BFUSB device driver
++CONFIG_BLUEZ_HCIBFUSB
++  Bluetooth HCI BlueFRITZ! USB driver.
++  This driver provides support for Bluetooth USB devices with AVM
++  interface:
++     AVM BlueFRITZ! USB
++
++  Say Y here to compile support for HCI BFUSB devices into the
++  kernel or say M to compile it as module (bfusb.o).
++
+ HCI DTL1 (PC Card) device driver
+ CONFIG_BLUEZ_HCIDTL1
+   Bluetooth HCI DTL1 (PC Card) driver.
+@@ -21824,9 +21849,6 @@
+      3Com Bluetooth Card (3CRWB6096)
+      HP Bluetooth Card
+ 
+-  The HCI BT3C driver uses external firmware loader program provided in
+-  the BlueFW package. For more information, see <http://bluez.sf.net>.
+-
+   Say Y here to compile support for HCI BT3C devices into the
+   kernel or say M to compile it as module (bt3c_cs.o).
+ 
+@@ -26815,6 +26837,12 @@
+ 
+   If unsure, say N.
+ 
++Hotplug firmware loading support (EXPERIMENTAL)
++CONFIG_FW_LOADER
++  This option is provided for the case where no in-kernel-tree modules require
++  hotplug firmware loading support, but a module built outside the kernel tree
++  does.
++
+ NatSemi SCx200 support
+ CONFIG_SCx200
+   This provides basic support for the National Semiconductor SCx200
 --- /dev/null
 +++ linux-2.4.21/Documentation/DocBook/librs.tmpl
 @@ -0,0 +1,287 @@
@@ -1660,6 +1856,314 @@
 +	</para>
 +  </chapter>
 +</book>
+--- linux-2.4.21/Documentation/devices.txt~bluetooth
++++ linux-2.4.21/Documentation/devices.txt
+@@ -419,6 +419,7 @@
+ 		220 = /dev/mptctl	Message passing technology (MPT) control
+ 		221 = /dev/mvista/hssdsi	Montavista PICMG hot swap system driver
+ 		222 = /dev/mvista/hasi		Montavista PICMG high availability
++		223 = /dev/input/uinput		User level driver support for input
+ 		240-255			Reserved for local use
+ 
+  11 char	Raw keyboard device
+--- /dev/null
++++ linux-2.4.21/Documentation/firmware_class/README
+@@ -0,0 +1,58 @@
++
++ request_firmware() hotplug interface:
++ ------------------------------------
++	Copyright (C) 2003 Manuel Estrada Sainz <ranty@debian.org>
++
++ Why:
++ ---
++
++ Today, the most extended way to use firmware in the Linux kernel is linking
++ it statically in a header file. Which has political and technical issues:
++
++  1) Some firmware is not legal to redistribute.
++  2) The firmware occupies memory permanently, even though it often is just
++     used once.
++  3) Some people, like the Debian crowd, don't consider some firmware free
++     enough and remove entire drivers (e.g.: keyspan).
++
++ about in-kernel persistence:
++ ---------------------------
++ Under some circumstances, as explained below, it would be interesting to keep
++ firmware images in non-swappable kernel memory or even in the kernel image
++ (probably within initramfs).
++
++ Note that this functionality has not been implemented.
++
++ - Why OPTIONAL in-kernel persistence may be a good idea sometimes:
++ 
++	- If the device that needs the firmware is needed to access the
++	  filesystem. When upon some error the device has to be reset and the
++	  firmware reloaded, it won't be possible to get it from userspace.
++	  e.g.:
++		- A diskless client with a network card that needs firmware.
++		- The filesystem is stored in a disk behind an scsi device
++		  that needs firmware.
++	- Replacing buggy DSDT/SSDT ACPI tables on boot.
++	  Note: this would require the persistent objects to be included
++	  within the kernel image, probably within initramfs.
++	  
++   And the same device can be needed to access the filesystem or not depending
++   on the setup, so I think that the choice on what firmware to make
++   persistent should be left to userspace.
++
++ - Why register_firmware()+__init can be useful:
++ 	- For boot devices needing firmware.
++	- To make the transition easier:
++		The firmware can be declared __init and register_firmware()
++		called on module_init. Then the firmware is warranted to be
++		there even if "firmware hotplug userspace" is not there yet or
++		it doesn't yet provide the needed firmware.
++		Once the firmware is widely available in userspace, it can be
++		removed from the kernel. Or made optional (CONFIG_.*_FIRMWARE).
++
++	In either case, if firmware hotplug support is there, it can move the
++	firmware out of kernel memory into the real filesystem for later
++	usage.
++
++	Note: If persistence is implemented on top of initramfs,
++	register_firmware() may not be appropriate.
+--- /dev/null
++++ linux-2.4.21/Documentation/firmware_class/firmware_sample_driver.c
+@@ -0,0 +1,121 @@
++/*
++ * firmware_sample_driver.c -
++ *
++ * Copyright (c) 2003 Manuel Estrada Sainz <ranty@debian.org>
++ *
++ * Sample code on how to use request_firmware() from drivers.
++ *
++ * Note that register_firmware() is currently useless.
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/string.h>
++
++#include "linux/firmware.h"
++
++#define WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
++#ifdef WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
++char __init inkernel_firmware[] = "let's say that this is firmware\n";
++#endif
++
++static char ghost_device[] = "ghost0";
++
++static void sample_firmware_load(char *firmware, int size)
++{
++	u8 buf[size+1];
++	memcpy(buf, firmware, size);
++	buf[size] = '\0';
++	printk("firmware_sample_driver: firmware: %s\n", buf);
++}
++
++static void sample_probe_default(void)
++{
++	/* uses the default method to get the firmware */
++        const struct firmware *fw_entry;
++	printk("firmware_sample_driver: a ghost device got inserted :)\n");
++
++        if(request_firmware(&fw_entry, "sample_driver_fw", ghost_device)!=0)
++	{
++		printk(KERN_ERR
++		       "firmware_sample_driver: Firmware not available\n");
++		return;
++	}
++	
++	sample_firmware_load(fw_entry->data, fw_entry->size);
++
++	release_firmware(fw_entry);
++
++	/* finish setting up the device */
++}
++static void sample_probe_specific(void)
++{
++	/* Uses some specific hotplug support to get the firmware from
++	 * userspace  directly into the hardware, or via some sysfs file */
++
++	/* NOTE: This currently doesn't work */
++
++	printk("firmware_sample_driver: a ghost device got inserted :)\n");
++
++        if(request_firmware(NULL, "sample_driver_fw", ghost_device)!=0)
++	{
++		printk(KERN_ERR
++		       "firmware_sample_driver: Firmware load failed\n");
++		return;
++	}
++	
++	/* request_firmware blocks until userspace finished, so at
++	 * this point the firmware should be already in the device */
++
++	/* finish setting up the device */
++}
++static void sample_probe_async_cont(const struct firmware *fw, void *context)
++{
++	if(!fw){
++		printk(KERN_ERR
++		       "firmware_sample_driver: firmware load failed\n");
++		return;
++	}
++
++	printk("firmware_sample_driver: device pointer \"%s\"\n",
++	       (char *)context);
++	sample_firmware_load(fw->data, fw->size);
++}
++static void sample_probe_async(void)
++{
++	/* Let's say that I can't sleep */
++	int error;
++	error = request_firmware_nowait (THIS_MODULE,
++					 "sample_driver_fw", ghost_device,
++					 "my device pointer",
++					 sample_probe_async_cont);
++	if(error){
++		printk(KERN_ERR 
++		       "firmware_sample_driver:"
++		       " request_firmware_nowait failed\n");
++	}
++}
++
++static int sample_init(void)
++{
++#ifdef WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
++	register_firmware("sample_driver_fw", inkernel_firmware,
++			  sizeof(inkernel_firmware));
++#endif
++	/* since there is no real hardware insertion I just call the
++	 * sample probe functions here */
++	sample_probe_specific();
++	sample_probe_default();
++	sample_probe_async();
++	return 0;
++}
++static void __exit sample_exit(void)
++{
++}
++
++module_init (sample_init);
++module_exit (sample_exit);
++
++MODULE_LICENSE("GPL");
+--- /dev/null
++++ linux-2.4.21/Documentation/firmware_class/hotplug-script
+@@ -0,0 +1,16 @@
++#!/bin/sh
++
++# Simple hotplug script sample:
++# 
++# Both $DEVPATH and $FIRMWARE are already provided in the environment.
++
++HOTPLUG_FW_DIR=/usr/lib/hotplug/firmware/
++
++echo 1 > /sysfs/$DEVPATH/loading
++cat $HOTPLUG_FW_DIR/$FIRMWARE > /sysfs/$DEVPATH/data
++echo 0 > /sysfs/$DEVPATH/loading
++
++# To cancel the load in case of error:
++#
++#	echo -1 > /sysfs/$DEVPATH/loading
++#
+--- linux-2.4.21/MAINTAINERS~bluetooth
++++ linux-2.4.21/MAINTAINERS
+@@ -302,16 +302,88 @@
+ L:	linux-kernel@vger.kernel.org
+ S:	Maintained
+ 
+-BLUETOOTH SUBSYSTEM (BlueZ)
++BLUETOOTH SUBSYSTEM
++P:	Marcel Holtmann
++M:	marcel@holtmann.org
+ P:	Maxim Krasnyansky
+ M:	maxk@qualcomm.com
++L:	bluez-devel@lists.sf.net
+ W:	http://bluez.sf.net
++W:	http://www.bluez.org
++W:	http://www.holtmann.org/linux/bluetooth/
+ S:	Maintained
+ 
+-BLUETOOTH SUBSYSTEM (PC Card Drivers)
++BLUETOOTH RFCOMM LAYER
+ P:	Marcel Holtmann
+ M:	marcel@holtmann.org
+-W:	http://www.holtmann.org/linux/bluetooth/
++P:	Maxim Krasnyansky
++M:	maxk@qualcomm.com
++S:	Maintained
++
++BLUETOOTH BNEP LAYER
++P:	Marcel Holtmann
++M:	marcel@holtmann.org
++P:	Maxim Krasnyansky
++M:	maxk@qualcomm.com
++S:	Maintained
++
++BLUETOOTH CMTP LAYER
++P:	Marcel Holtmann
++M:	marcel@holtmann.org
++S:	Maintained
++
++BLUETOOTH HIDP LAYER
++P:	Marcel Holtmann
++M:	marcel@holtmann.org
++S:	Maintained
++
++BLUETOOTH HCI UART DRIVER
++P:	Marcel Holtmann
++M:	marcel@holtmann.org
++P:	Maxim Krasnyansky
++M:	maxk@qualcomm.com
++S:	Maintained
++
++BLUETOOTH HCI USB DRIVER
++P:	Marcel Holtmann
++M:	marcel@holtmann.org
++P:	Maxim Krasnyansky
++M:	maxk@qualcomm.com
++S:	Maintained
++
++BLUETOOTH HCI BCM203X DRIVER
++P:	Marcel Holtmann
++M:	marcel@holtmann.org
++S:	Maintained
++
++BLUETOOTH HCI BFUSB DRIVER
++P:	Marcel Holtmann
++M:	marcel@holtmann.org
++S:	Maintained
++
++BLUETOOTH HCI DTL1 DRIVER
++P:	Marcel Holtmann
++M:	marcel@holtmann.org
++S:	Maintained
++
++BLUETOOTH HCI BLUECARD DRIVER
++P:	Marcel Holtmann
++M:	marcel@holtmann.org
++S:	Maintained
++
++BLUETOOTH HCI BT3C DRIVER
++P:	Marcel Holtmann
++M:	marcel@holtmann.org
++S:	Maintained
++
++BLUETOOTH HCI BTUART DRIVER
++P:	Marcel Holtmann
++M:	marcel@holtmann.org
++S:	Maintained
++
++BLUETOOTH HCI VHCI DRIVER
++P:	Maxim Krasnyansky
++M:	maxk@qualcomm.com
+ S:	Maintained
+ 
+ BONDING DRIVER
 --- linux-2.4.21/Makefile~linux-mkdep
 +++ linux-2.4.21/Makefile
 @@ -14,10 +14,11 @@
@@ -1783,7 +2287,7 @@
  
 --- /dev/null
 +++ linux-2.4.21/arch/arm/def-configs/ramses
-@@ -0,0 +1,1174 @@
+@@ -0,0 +1,1177 @@
 +#
 +# Automatically generated by make menuconfig: don't edit
 +#
@@ -2422,6 +2926,7 @@
 +# CONFIG_INPUT_MOUSEDEV is not set
 +# CONFIG_INPUT_JOYDEV is not set
 +CONFIG_INPUT_EVDEV=y
++CONFIG_INPUT_UINPUT=m
 +# CONFIG_INPUT_MX1TS is not set
 +
 +#
@@ -2913,26 +3418,27 @@
 +CONFIG_BLUEZ_L2CAP=m
 +CONFIG_BLUEZ_SCO=m
 +CONFIG_BLUEZ_RFCOMM=m
-+# CONFIG_BLUEZ_RFCOMM_TTY is not set
++CONFIG_BLUEZ_RFCOMM_TTY=y
 +CONFIG_BLUEZ_BNEP=m
 +CONFIG_BLUEZ_BNEP_MC_FILTER=y
-+# CONFIG_BLUEZ_BNEP_PROTO_FILTER is not set
++CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
++CONFIG_BLUEZ_HIDP=m
 +
 +#
 +# Bluetooth device drivers
 +#
 +CONFIG_BLUEZ_HCIUSB=m
-+CONFIG_BLUEZ_USB_SCO=y
-+CONFIG_BLUEZ_USB_ZERO_PACKET=y
++CONFIG_BLUEZ_HCIUSB_SCO=y
 +CONFIG_BLUEZ_HCIUART=m
 +CONFIG_BLUEZ_HCIUART_H4=y
 +CONFIG_BLUEZ_HCIUART_BCSP=y
-+CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
++# CONFIG_BLUEZ_HCIUART_BCSP_TXCRC is not set
++CONFIG_BLUEZ_HCIBFUSB=m
 +CONFIG_BLUEZ_HCIDTL1=m
 +CONFIG_BLUEZ_HCIBT3C=m
 +CONFIG_BLUEZ_HCIBLUECARD=m
 +CONFIG_BLUEZ_HCIBTUART=m
-+# CONFIG_BLUEZ_HCIVHCI is not set
++CONFIG_BLUEZ_HCIVHCI=m
 +
 +#
 +# Kernel hacking
@@ -2958,6 +3464,7 @@
 +CONFIG_ZLIB_INFLATE=y
 +CONFIG_ZLIB_DEFLATE=y
 +# CONFIG_REED_SOLOMON is not set
++CONFIG_FW_LOADER=m
 --- linux-2.4.21/arch/arm/mach-pxa/Makefile~pm
 +++ linux-2.4.21/arch/arm/mach-pxa/Makefile
 @@ -14,8 +14,11 @@
@@ -4075,7 +4582,7 @@
 +#endif
 +#define USE_UCB
 +//#define PFI_LED
-+//#define PFI_TURNOFF
++#define PFI_TURNOFF
 +
 +#include <asm/types.h>
 +#include <asm/setup.h>
@@ -4927,6 +5434,1410 @@
  		 pstr = pxa_usb_kmalloc_string_descriptor( "PXA USB NIC" );
  		 if ( pstr ) {
  			  pxa_usb_set_string_descriptor( 1, pstr );
+--- linux-2.4.21/drivers/bluetooth/Config.in~bluetooth
++++ linux-2.4.21/drivers/bluetooth/Config.in
+@@ -7,8 +7,7 @@
+ 
+ dep_tristate 'HCI USB driver' CONFIG_BLUEZ_HCIUSB $CONFIG_BLUEZ $CONFIG_USB
+ if [ "$CONFIG_BLUEZ_HCIUSB" != "n" ]; then
+-   bool '  SCO (voice) support'  CONFIG_BLUEZ_USB_SCO
+-   bool '  USB zero packet support'  CONFIG_BLUEZ_USB_ZERO_PACKET
++   bool '  SCO (voice) support'  CONFIG_BLUEZ_HCIUSB_SCO
+ fi
+ 
+ dep_tristate 'HCI UART driver' CONFIG_BLUEZ_HCIUART $CONFIG_BLUEZ
+@@ -18,6 +17,8 @@
+    dep_bool '  Transmit CRC with every BCSP packet' CONFIG_BLUEZ_HCIUART_BCSP_TXCRC $CONFIG_BLUEZ_HCIUART_BCSP
+ fi
+ 
++dep_tristate 'HCI BlueFRITZ! USB driver' CONFIG_BLUEZ_HCIBFUSB $CONFIG_BLUEZ $CONFIG_USB
++
+ dep_tristate 'HCI DTL1 (PC Card) driver' CONFIG_BLUEZ_HCIDTL1 $CONFIG_PCMCIA $CONFIG_BLUEZ
+ 
+ dep_tristate 'HCI BT3C (PC Card) driver' CONFIG_BLUEZ_HCIBT3C $CONFIG_PCMCIA $CONFIG_BLUEZ
+--- linux-2.4.21/drivers/bluetooth/Makefile~bluetooth
++++ linux-2.4.21/drivers/bluetooth/Makefile
+@@ -14,6 +14,8 @@
+ uart-$(CONFIG_BLUEZ_HCIUART_H4)		+= hci_h4.o
+ uart-$(CONFIG_BLUEZ_HCIUART_BCSP)	+= hci_bcsp.o
+ 
++obj-$(CONFIG_BLUEZ_HCIBFUSB)	+= bfusb.o
++
+ obj-$(CONFIG_BLUEZ_HCIDTL1)	+= dtl1_cs.o
+ obj-$(CONFIG_BLUEZ_HCIBT3C)	+= bt3c_cs.o
+ obj-$(CONFIG_BLUEZ_HCIBLUECARD)	+= bluecard_cs.o
+--- /dev/null
++++ linux-2.4.21/drivers/bluetooth/Makefile.lib
+@@ -0,0 +1,2 @@
++obj-$(CONFIG_BLUEZ_HCIBFUSB)	+= firmware_class.o
++obj-$(CONFIG_BLUEZ_HCIBT3C)	+= firmware_class.o
+--- /dev/null
++++ linux-2.4.21/drivers/bluetooth/bfusb.c
+@@ -0,0 +1,782 @@
++/*
++ *
++ *  AVM BlueFRITZ! USB driver
++ *
++ *  Copyright (C) 2003  Marcel Holtmann <marcel@holtmann.org>
++ *
++ *
++ *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/module.h>
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/types.h>
++#include <linux/sched.h>
++#include <linux/errno.h>
++#include <linux/skbuff.h>
++
++#include <linux/firmware.h>
++#include <linux/usb.h>
++
++#include <net/bluetooth/bluetooth.h>
++#include <net/bluetooth/hci_core.h>
++
++#ifndef CONFIG_BLUEZ_HCIBFUSB_DEBUG
++#undef  BT_DBG
++#define BT_DBG(D...)
++#endif
++
++#define VERSION "1.1"
++
++static struct usb_device_id bfusb_table[] = {
++	/* AVM BlueFRITZ! USB */
++	{ USB_DEVICE(0x057c, 0x2200) },
++
++	{ }	/* Terminating entry */
++};
++
++MODULE_DEVICE_TABLE(usb, bfusb_table);
++
++
++#define BFUSB_MAX_BLOCK_SIZE	256
++
++#define BFUSB_BLOCK_TIMEOUT	(HZ * 3)
++
++#define BFUSB_TX_PROCESS	1
++#define BFUSB_TX_WAKEUP		2
++
++#define BFUSB_MAX_BULK_TX	1
++#define BFUSB_MAX_BULK_RX	1
++
++struct bfusb {
++	struct hci_dev		hdev;
++
++	unsigned long		state;
++
++	struct usb_device	*udev;
++
++	unsigned int		bulk_in_ep;
++	unsigned int		bulk_out_ep;
++	unsigned int		bulk_pkt_size;
++
++	rwlock_t		lock;
++
++	struct sk_buff_head	transmit_q;
++
++	struct sk_buff		*reassembly;
++
++	atomic_t		pending_tx;
++	struct sk_buff_head	pending_q;
++	struct sk_buff_head	completed_q;
++};
++
++struct bfusb_scb {
++	struct urb *urb;
++};
++
++static void bfusb_tx_complete(struct urb *urb);
++static void bfusb_rx_complete(struct urb *urb);
++
++static struct urb *bfusb_get_completed(struct bfusb *bfusb)
++{
++	struct sk_buff *skb;
++	struct urb *urb = NULL;
++
++	BT_DBG("bfusb %p", bfusb);
++
++	skb = skb_dequeue(&bfusb->completed_q);
++	if (skb) {
++		urb = ((struct bfusb_scb *) skb->cb)->urb;
++		kfree_skb(skb);
++	}
++
++	return urb;
++}
++
++static inline void bfusb_unlink_urbs(struct bfusb *bfusb)
++{
++	struct sk_buff *skb;
++	struct urb *urb;
++
++	BT_DBG("bfusb %p", bfusb);
++
++	while ((skb = skb_dequeue(&bfusb->pending_q))) {
++		urb = ((struct bfusb_scb *) skb->cb)->urb;
++		usb_unlink_urb(urb);
++		skb_queue_tail(&bfusb->completed_q, skb);
++	}
++
++	while ((urb = bfusb_get_completed(bfusb)))
++		usb_free_urb(urb);
++}
++
++
++static int bfusb_send_bulk(struct bfusb *bfusb, struct sk_buff *skb)
++{
++	struct bfusb_scb *scb = (void *) skb->cb;
++	struct urb *urb = bfusb_get_completed(bfusb);
++	int err, pipe;
++
++	BT_DBG("bfusb %p skb %p len %d", bfusb, skb, skb->len);
++
++	if (!urb && !(urb = usb_alloc_urb(0)))
++		return -ENOMEM;
++
++	pipe = usb_sndbulkpipe(bfusb->udev, bfusb->bulk_out_ep);
++
++	FILL_BULK_URB(urb, bfusb->udev, pipe, skb->data, skb->len,
++			bfusb_tx_complete, skb);
++
++	urb->transfer_flags = USB_QUEUE_BULK;
++
++	scb->urb = urb;
++
++	skb_queue_tail(&bfusb->pending_q, skb);
++
++	err = usb_submit_urb(urb);
++	if (err) {
++		BT_ERR("%s bulk tx submit failed urb %p err %d", 
++					bfusb->hdev.name, urb, err);
++		skb_unlink(skb);
++		usb_free_urb(urb);
++	} else
++		atomic_inc(&bfusb->pending_tx);
++
++	return err;
++}
++
++static void bfusb_tx_wakeup(struct bfusb *bfusb)
++{
++	struct sk_buff *skb;
++
++	BT_DBG("bfusb %p", bfusb);
++
++	if (test_and_set_bit(BFUSB_TX_PROCESS, &bfusb->state)) {
++		set_bit(BFUSB_TX_WAKEUP, &bfusb->state);
++		return;
++	}
++
++	do {
++		clear_bit(BFUSB_TX_WAKEUP, &bfusb->state);
++
++		while ((atomic_read(&bfusb->pending_tx) < BFUSB_MAX_BULK_TX) &&
++				(skb = skb_dequeue(&bfusb->transmit_q))) {
++			if (bfusb_send_bulk(bfusb, skb) < 0) {
++				skb_queue_head(&bfusb->transmit_q, skb);
++				break;
++			}
++		}
++
++	} while (test_bit(BFUSB_TX_WAKEUP, &bfusb->state));
++
++	clear_bit(BFUSB_TX_PROCESS, &bfusb->state);
++}
++
++static void bfusb_tx_complete(struct urb *urb)
++{
++	struct sk_buff *skb = (struct sk_buff *) urb->context;
++	struct bfusb *bfusb = (struct bfusb *) skb->dev;
++
++	BT_DBG("bfusb %p urb %p skb %p len %d", bfusb, urb, skb, skb->len);
++
++	atomic_dec(&bfusb->pending_tx);
++
++	if (!test_bit(HCI_RUNNING, &bfusb->hdev.flags))
++		return;
++
++	if (!urb->status)
++		bfusb->hdev.stat.byte_tx += skb->len;
++	else
++		bfusb->hdev.stat.err_tx++;
++
++	read_lock(&bfusb->lock);
++
++	skb_unlink(skb);
++	skb_queue_tail(&bfusb->completed_q, skb);
++
++	bfusb_tx_wakeup(bfusb);
++
++	read_unlock(&bfusb->lock);
++}
++
++
++static int bfusb_rx_submit(struct bfusb *bfusb, struct urb *urb)
++{
++	struct bfusb_scb *scb;
++	struct sk_buff *skb;
++	int err, pipe, size = HCI_MAX_FRAME_SIZE + 32;
++
++	BT_DBG("bfusb %p urb %p", bfusb, urb);
++
++	if (!urb && !(urb = usb_alloc_urb(0)))
++		return -ENOMEM;
++
++	if (!(skb = bluez_skb_alloc(size, GFP_ATOMIC))) {
++		usb_free_urb(urb);
++		return -ENOMEM;
++	}
++
++	skb->dev = (void *) bfusb;
++
++	scb = (struct bfusb_scb *) skb->cb;
++	scb->urb = urb;
++
++	pipe = usb_rcvbulkpipe(bfusb->udev, bfusb->bulk_in_ep);
++
++	FILL_BULK_URB(urb, bfusb->udev, pipe, skb->data, size,
++			bfusb_rx_complete, skb);
++
++	urb->transfer_flags = USB_QUEUE_BULK;
++
++	skb_queue_tail(&bfusb->pending_q, skb);
++
++	err = usb_submit